From c1c3f5a10d21429e5238f0c183b2a2c4a7a58776 Mon Sep 17 00:00:00 2001 From: esteel Date: Thu, 15 Jan 2009 10:10:46 +0000 Subject: [PATCH] move the server examples out of Docs and into a dir of its own so more people will see it, adjust the makebuilde.sh script to include it git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5538 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- misc/makebuild.sh | 10 +++++++--- {Docs/server => server}/help.cfg | 0 {Docs/server => server}/rcon.pl | 0 {Docs/server => server}/rcon2irc/rbiserver.pl | 0 {Docs/server => server}/rcon2irc/rcon2irc-example.conf | 0 {Docs/server => server}/rcon2irc/rcon2irc.pl | 0 {Docs/server => server}/rcon2irc/rcon2irc.txt | 0 {Docs/server => server}/readme.txt | 0 {Docs/server => server}/server.cfg | 0 {Docs/server => server}/server_havoc_linux.sh | 0 {Docs/server => server}/server_havoc_mac.sh | 0 {Docs/server => server}/server_havoc_windows.bat | 0 {Docs/server => server}/server_linux.sh | 0 {Docs/server => server}/server_mac.sh | 0 {Docs/server => server}/server_windows.bat | 0 15 files changed, 7 insertions(+), 3 deletions(-) rename {Docs/server => server}/help.cfg (100%) rename {Docs/server => server}/rcon.pl (100%) rename {Docs/server => server}/rcon2irc/rbiserver.pl (100%) rename {Docs/server => server}/rcon2irc/rcon2irc-example.conf (100%) rename {Docs/server => server}/rcon2irc/rcon2irc.pl (100%) rename {Docs/server => server}/rcon2irc/rcon2irc.txt (100%) rename {Docs/server => server}/readme.txt (100%) rename {Docs/server => server}/server.cfg (100%) rename {Docs/server => server}/server_havoc_linux.sh (100%) rename {Docs/server => server}/server_havoc_mac.sh (100%) rename {Docs/server => server}/server_havoc_windows.bat (100%) rename {Docs/server => server}/server_linux.sh (100%) rename {Docs/server => server}/server_mac.sh (100%) rename {Docs/server => server}/server_windows.bat (100%) diff --git a/misc/makebuild.sh b/misc/makebuild.sh index df1d436dd..51b1bb6d7 100755 --- a/misc/makebuild.sh +++ b/misc/makebuild.sh @@ -192,6 +192,10 @@ svn export . "$tmpdir/havoc" cd "$nexdir/Docs" svn export . "$tmpdir/Docs" +# prepare server +cd "$nexdir/server" +svn export . "$tmpdir/server" + # make gamesource cd "$tmpdir/data" mkdir -p "$tmpdir/sources" @@ -270,7 +274,7 @@ mv * Nexuiz/ || true find . -name .svn -exec rm -rf {} \; -prune rm -f "$zipdir/nexuiz$date$ext.zip" -zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/data$tag$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/havoc/* +zip $zipflags -9yr "$zipdir/nexuiz$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/server Nexuiz/data/data$tag$date.pk3 Nexuiz/data/common-spog.pk3 Nexuiz/havoc/* ln -snf nexuiz$date$ext.zip "$zipdir/nexuiz-$newest.zip" rm -f "$zipdir/nexuizengineonly$date$ext.zip" @@ -314,11 +318,11 @@ if unzip "Nexuiz/data/data$tag$date.pk3" gfx/brand.tga; then fi rm -f "$zipdir/nexuizpatch$date$ext.zip" -zip $zipflags -9yr "$zipdir/nexuizpatch$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/datapatch$tag$date.pk3 Nexuiz/havoc/* +zip $zipflags -9yr "$zipdir/nexuizpatch$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/server Nexuiz/data/datapatch$tag$date.pk3 Nexuiz/havoc/* ln -snf nexuizpatch$date$ext.zip "$zipdir/nexuizpatch-$newest.zip" [ -n "$hotbasepk3" ] && rm -f "$zipdir/nexuizhotfix$date$ext.zip" -[ -n "$hotbasepk3" ] && zip $zipflags -9yr "$zipdir/nexuizhotfix$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/data/datapatch$tag$date""hotfix.pk3 Nexuiz/havoc/* +[ -n "$hotbasepk3" ] && zip $zipflags -9yr "$zipdir/nexuizhotfix$date$ext.zip" Nexuiz/gpl.txt Nexuiz/nexuiz* Nexuiz/Nexuiz* Nexuiz/*.dll Nexuiz/sources Nexuiz/Docs Nexuiz/server Nexuiz/data/datapatch$tag$date""hotfix.pk3 Nexuiz/havoc/* [ -n "$hotbasepk3" ] && ln -snf nexuizhotfix$date$ext.zip "$zipdir/nexuizhotfix-$newest.zip" rm -f "$zipdir/nexuizdocs$date$ext.zip" diff --git a/Docs/server/help.cfg b/server/help.cfg similarity index 100% rename from Docs/server/help.cfg rename to server/help.cfg diff --git a/Docs/server/rcon.pl b/server/rcon.pl similarity index 100% rename from Docs/server/rcon.pl rename to server/rcon.pl diff --git a/Docs/server/rcon2irc/rbiserver.pl b/server/rcon2irc/rbiserver.pl similarity index 100% rename from Docs/server/rcon2irc/rbiserver.pl rename to server/rcon2irc/rbiserver.pl diff --git a/Docs/server/rcon2irc/rcon2irc-example.conf b/server/rcon2irc/rcon2irc-example.conf similarity index 100% rename from Docs/server/rcon2irc/rcon2irc-example.conf rename to server/rcon2irc/rcon2irc-example.conf diff --git a/Docs/server/rcon2irc/rcon2irc.pl b/server/rcon2irc/rcon2irc.pl similarity index 100% rename from Docs/server/rcon2irc/rcon2irc.pl rename to server/rcon2irc/rcon2irc.pl diff --git a/Docs/server/rcon2irc/rcon2irc.txt b/server/rcon2irc/rcon2irc.txt similarity index 100% rename from Docs/server/rcon2irc/rcon2irc.txt rename to server/rcon2irc/rcon2irc.txt diff --git a/Docs/server/readme.txt b/server/readme.txt similarity index 100% rename from Docs/server/readme.txt rename to server/readme.txt diff --git a/Docs/server/server.cfg b/server/server.cfg similarity index 100% rename from Docs/server/server.cfg rename to server/server.cfg diff --git a/Docs/server/server_havoc_linux.sh b/server/server_havoc_linux.sh similarity index 100% rename from Docs/server/server_havoc_linux.sh rename to server/server_havoc_linux.sh diff --git a/Docs/server/server_havoc_mac.sh b/server/server_havoc_mac.sh similarity index 100% rename from Docs/server/server_havoc_mac.sh rename to server/server_havoc_mac.sh diff --git a/Docs/server/server_havoc_windows.bat b/server/server_havoc_windows.bat similarity index 100% rename from Docs/server/server_havoc_windows.bat rename to server/server_havoc_windows.bat diff --git a/Docs/server/server_linux.sh b/server/server_linux.sh similarity index 100% rename from Docs/server/server_linux.sh rename to server/server_linux.sh diff --git a/Docs/server/server_mac.sh b/server/server_mac.sh similarity index 100% rename from Docs/server/server_mac.sh rename to server/server_mac.sh diff --git a/Docs/server/server_windows.bat b/server/server_windows.bat similarity index 100% rename from Docs/server/server_windows.bat rename to server/server_windows.bat -- 2.39.2