From 39ff5b09859ebecbabf9b953c763cc61cd85d905 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Tue, 21 Aug 2012 15:25:17 +0000 Subject: Fixed nightbuild script after files move. Also moved licenses and Install-related files to Install folder. The 7z archives are now built inside the Install folder, instead of the root git-svn-id: http://mc-server.googlecode.com/svn/trunk@771 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- Install/MCServer_high_detail_debug.cmd | 1 + Install/MCServer_medium_detail_debug.cmd | 1 + Install/MersenneTwister-LICENSE.txt | 43 ++++++++++++++++++++++++++++++++ Install/Zip2008.list | 15 ++++++----- Install/Zip2008_PDBs.list | 3 +-- Install/banned.example.ini | 3 +++ Install/groups.example.ini | 17 +++++++++++++ Install/settings.example.ini | 31 +++++++++++++++++++++++ Install/users.example.ini | 8 ++++++ Install/webadmin.example.ini | 6 +++++ Install/whitelist.example.ini | 6 +++++ MCServer/banned.example.ini | 3 --- MCServer/groups.example.ini | 17 ------------- MCServer/settings.example.ini | 31 ----------------------- MCServer/users.example.ini | 8 ------ MCServer/webadmin.example.ini | 6 ----- MCServer/whitelist.example.ini | 6 ----- MCServer_high_detail_debug.cmd | 1 - MCServer_medium_detail_debug.cmd | 1 - MersenneTwister-LICENSE.txt | 43 -------------------------------- Nightbuild2008.cmd | 16 +++++++++--- 21 files changed, 136 insertions(+), 130 deletions(-) create mode 100644 Install/MCServer_high_detail_debug.cmd create mode 100644 Install/MCServer_medium_detail_debug.cmd create mode 100644 Install/MersenneTwister-LICENSE.txt create mode 100644 Install/banned.example.ini create mode 100644 Install/groups.example.ini create mode 100644 Install/settings.example.ini create mode 100644 Install/users.example.ini create mode 100644 Install/webadmin.example.ini create mode 100644 Install/whitelist.example.ini delete mode 100644 MCServer/banned.example.ini delete mode 100644 MCServer/groups.example.ini delete mode 100644 MCServer/settings.example.ini delete mode 100644 MCServer/users.example.ini delete mode 100644 MCServer/webadmin.example.ini delete mode 100644 MCServer/whitelist.example.ini delete mode 100644 MCServer_high_detail_debug.cmd delete mode 100644 MCServer_medium_detail_debug.cmd delete mode 100644 MersenneTwister-LICENSE.txt diff --git a/Install/MCServer_high_detail_debug.cmd b/Install/MCServer_high_detail_debug.cmd new file mode 100644 index 000000000..384189c42 --- /dev/null +++ b/Install/MCServer_high_detail_debug.cmd @@ -0,0 +1 @@ +MCServer /cdf \ No newline at end of file diff --git a/Install/MCServer_medium_detail_debug.cmd b/Install/MCServer_medium_detail_debug.cmd new file mode 100644 index 000000000..b5bb0954c --- /dev/null +++ b/Install/MCServer_medium_detail_debug.cmd @@ -0,0 +1 @@ +MCServer /cdg \ No newline at end of file diff --git a/Install/MersenneTwister-LICENSE.txt b/Install/MersenneTwister-LICENSE.txt new file mode 100644 index 000000000..db62b36c6 --- /dev/null +++ b/Install/MersenneTwister-LICENSE.txt @@ -0,0 +1,43 @@ +// The Mersenne Twister is an algorithm for generating random numbers. It +// was designed with consideration of the flaws in various other generators. +// The period, 2^19937-1, and the order of equidistribution, 623 dimensions, +// are far greater. The generator is also fast; it avoids multiplication and +// division, and it benefits from caches and pipelines. For more information +// see the inventors' web page at +// http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html + +// Reference +// M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-Dimensionally +// Equidistributed Uniform Pseudo-Random Number Generator", ACM Transactions on +// Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30. + +// Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, +// Copyright (C) 2000 - 2009, Richard J. Wagner +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// +// 3. The names of its contributors may not be used to endorse or promote +// products derived from this software without specific prior written +// permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +// POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/Install/Zip2008.list b/Install/Zip2008.list index edc3950c4..369d282b8 100644 --- a/Install/Zip2008.list +++ b/Install/Zip2008.list @@ -1,17 +1,16 @@ -MCServer.exe +..\MCServer\MCServer.exe +..\MCServer\Plugins +..\MCServer\webadmin +..\MCServer\crafting.txt +..\MCServer\furnace.txt +..\MCServer\items.ini +..\MCServer\monsters.ini MCServer*debug.cmd -Plugins -webadmin -crafting.txt banned.example.ini -furnace.txt groups.example.ini -items.ini Lua-LICENSE.txt MersenneTwister-LICENSE.txt -monsters.ini settings.example.ini -terrain.ini users.example.ini webadmin.example.ini whitelist.example.ini \ No newline at end of file diff --git a/Install/Zip2008_PDBs.list b/Install/Zip2008_PDBs.list index 35ffc5919..568858cbb 100644 --- a/Install/Zip2008_PDBs.list +++ b/Install/Zip2008_PDBs.list @@ -4,5 +4,4 @@ VC2008\Release\Lua\*.pdb VC2008\Release\ToLua\*.pdb VC2008\Release\webserver\*.pdb VC2008\Release\zlib*.pdb -source\Bindings.* - +source\Bindings.* \ No newline at end of file diff --git a/Install/banned.example.ini b/Install/banned.example.ini new file mode 100644 index 000000000..efe5f51b6 --- /dev/null +++ b/Install/banned.example.ini @@ -0,0 +1,3 @@ +[Banned] +;PlayerName=1 + diff --git a/Install/groups.example.ini b/Install/groups.example.ini new file mode 100644 index 000000000..7f061204b --- /dev/null +++ b/Install/groups.example.ini @@ -0,0 +1,17 @@ +[Admins] +Permissions=* +Color=c + +[Mods] +Color=5 +Inherits=Vips +Permissions=core.time,core.item + +[Vips] +Permissions=core.teleport +Color=2 +Inherits=Default + +[Default] +Permissions=core.build,core.help,core.playerlist,core.pluginlist,core.spawn +Color=7 \ No newline at end of file diff --git a/Install/settings.example.ini b/Install/settings.example.ini new file mode 100644 index 000000000..bfb16c7e6 --- /dev/null +++ b/Install/settings.example.ini @@ -0,0 +1,31 @@ +[Server] +Port=25565 +MaxPlayers=42 +Description=MCServer - Slightly more custom! + +[Worlds] +DefaultWorld=world +;World=world_sexy + +[Plugins] +NewPlugin=Core +NewPlugin=ChatLog + +[HelpPlugin] +ShowPluginNames=1 + +[Physics] +Water=0 + +[Redstone] +SimulateRedstone=0 + +[Monsters] +AnimalsOn=0 +AnimalSpawnInterval=10 +Types=Spider,Chicken,Cow,Pig,Sheep,Squid,Enderman,Zombiepigman,Cavespider,Creeper,Ghast,Silverfish,Skeleton,Slime,Spider,Zombie + +[Authentication] +Server=session.minecraft.net +Address=/game/checkserver.jsp?user=%USERNAME%&serverId=%SERVERID% +Authenticate=0 diff --git a/Install/users.example.ini b/Install/users.example.ini new file mode 100644 index 000000000..fae7030f1 --- /dev/null +++ b/Install/users.example.ini @@ -0,0 +1,8 @@ +[SomeAdmin] +Groups=Admins + +[FancyModerator] +Groups=Moderators + +[ImportantPerson] +Groups=Vips \ No newline at end of file diff --git a/Install/webadmin.example.ini b/Install/webadmin.example.ini new file mode 100644 index 000000000..6ecbf7513 --- /dev/null +++ b/Install/webadmin.example.ini @@ -0,0 +1,6 @@ +[WebAdmin] +Enabled=1 +Port=8080 + +[User:admin] +Password=admin \ No newline at end of file diff --git a/Install/whitelist.example.ini b/Install/whitelist.example.ini new file mode 100644 index 000000000..eb884dcda --- /dev/null +++ b/Install/whitelist.example.ini @@ -0,0 +1,6 @@ +[WhiteListSettings] +WhiteListOn=0 + +[WhiteList] +;PlayerName=1 + diff --git a/MCServer/banned.example.ini b/MCServer/banned.example.ini deleted file mode 100644 index efe5f51b6..000000000 --- a/MCServer/banned.example.ini +++ /dev/null @@ -1,3 +0,0 @@ -[Banned] -;PlayerName=1 - diff --git a/MCServer/groups.example.ini b/MCServer/groups.example.ini deleted file mode 100644 index 7f061204b..000000000 --- a/MCServer/groups.example.ini +++ /dev/null @@ -1,17 +0,0 @@ -[Admins] -Permissions=* -Color=c - -[Mods] -Color=5 -Inherits=Vips -Permissions=core.time,core.item - -[Vips] -Permissions=core.teleport -Color=2 -Inherits=Default - -[Default] -Permissions=core.build,core.help,core.playerlist,core.pluginlist,core.spawn -Color=7 \ No newline at end of file diff --git a/MCServer/settings.example.ini b/MCServer/settings.example.ini deleted file mode 100644 index bfb16c7e6..000000000 --- a/MCServer/settings.example.ini +++ /dev/null @@ -1,31 +0,0 @@ -[Server] -Port=25565 -MaxPlayers=42 -Description=MCServer - Slightly more custom! - -[Worlds] -DefaultWorld=world -;World=world_sexy - -[Plugins] -NewPlugin=Core -NewPlugin=ChatLog - -[HelpPlugin] -ShowPluginNames=1 - -[Physics] -Water=0 - -[Redstone] -SimulateRedstone=0 - -[Monsters] -AnimalsOn=0 -AnimalSpawnInterval=10 -Types=Spider,Chicken,Cow,Pig,Sheep,Squid,Enderman,Zombiepigman,Cavespider,Creeper,Ghast,Silverfish,Skeleton,Slime,Spider,Zombie - -[Authentication] -Server=session.minecraft.net -Address=/game/checkserver.jsp?user=%USERNAME%&serverId=%SERVERID% -Authenticate=0 diff --git a/MCServer/users.example.ini b/MCServer/users.example.ini deleted file mode 100644 index fae7030f1..000000000 --- a/MCServer/users.example.ini +++ /dev/null @@ -1,8 +0,0 @@ -[SomeAdmin] -Groups=Admins - -[FancyModerator] -Groups=Moderators - -[ImportantPerson] -Groups=Vips \ No newline at end of file diff --git a/MCServer/webadmin.example.ini b/MCServer/webadmin.example.ini deleted file mode 100644 index 6ecbf7513..000000000 --- a/MCServer/webadmin.example.ini +++ /dev/null @@ -1,6 +0,0 @@ -[WebAdmin] -Enabled=1 -Port=8080 - -[User:admin] -Password=admin \ No newline at end of file diff --git a/MCServer/whitelist.example.ini b/MCServer/whitelist.example.ini deleted file mode 100644 index eb884dcda..000000000 --- a/MCServer/whitelist.example.ini +++ /dev/null @@ -1,6 +0,0 @@ -[WhiteListSettings] -WhiteListOn=0 - -[WhiteList] -;PlayerName=1 - diff --git a/MCServer_high_detail_debug.cmd b/MCServer_high_detail_debug.cmd deleted file mode 100644 index 384189c42..000000000 --- a/MCServer_high_detail_debug.cmd +++ /dev/null @@ -1 +0,0 @@ -MCServer /cdf \ No newline at end of file diff --git a/MCServer_medium_detail_debug.cmd b/MCServer_medium_detail_debug.cmd deleted file mode 100644 index b5bb0954c..000000000 --- a/MCServer_medium_detail_debug.cmd +++ /dev/null @@ -1 +0,0 @@ -MCServer /cdg \ No newline at end of file diff --git a/MersenneTwister-LICENSE.txt b/MersenneTwister-LICENSE.txt deleted file mode 100644 index db62b36c6..000000000 --- a/MersenneTwister-LICENSE.txt +++ /dev/null @@ -1,43 +0,0 @@ -// The Mersenne Twister is an algorithm for generating random numbers. It -// was designed with consideration of the flaws in various other generators. -// The period, 2^19937-1, and the order of equidistribution, 623 dimensions, -// are far greater. The generator is also fast; it avoids multiplication and -// division, and it benefits from caches and pipelines. For more information -// see the inventors' web page at -// http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/emt.html - -// Reference -// M. Matsumoto and T. Nishimura, "Mersenne Twister: A 623-Dimensionally -// Equidistributed Uniform Pseudo-Random Number Generator", ACM Transactions on -// Modeling and Computer Simulation, Vol. 8, No. 1, January 1998, pp 3-30. - -// Copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura, -// Copyright (C) 2000 - 2009, Richard J. Wagner -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions -// are met: -// -// 1. Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// 2. Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// 3. The names of its contributors may not be used to endorse or promote -// products derived from this software without specific prior written -// permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -// POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/Nightbuild2008.cmd b/Nightbuild2008.cmd index 61a622941..6e55ecc50 100644 --- a/Nightbuild2008.cmd +++ b/Nightbuild2008.cmd @@ -28,6 +28,9 @@ if %subwcrev%a == a set subwcrev=subwcrev echo Performing nightbuild of MC-Server + + + set DONOTPAUSE=y :: Update the sources to the latest revision: @@ -50,7 +53,7 @@ echo WCREV = %WCREV% :: Test if the version is already present -if exist MCServer_Win_%WCREV%.7z ( +if exist Install\MCServer_Win_%WCREV%.7z ( echo Latest version already present, bailing out goto end ) @@ -58,6 +61,8 @@ if exist MCServer_Win_%WCREV%.7z ( :: Update Bindings.cpp +del source\Bindings.cpp +del source\Bindings.h echo Updating Lua bindings set ALLTOLUA_WAIT=N cd source @@ -78,15 +83,18 @@ if errorlevel 1 goto haderror + :: Use 7-zip to compress the resulting files into a single file: :: Note: the output filename here must be the same as in the upload_win.ftp.template script -copy VC2008\Release\MCServer.exe MCServer.exe -%zip% a -mx9 -y MCServer_Win_%WCREV%.7z -scsWIN @Install\Zip2008.list +copy MCServer\MCServer.exe Install\MCServer.exe +cd Install +%zip% a -mx9 -y MCServer_Win_%WCREV%.7z -scsWIN @Zip2008.list if errorlevel 1 goto haderror +cd .. :: Also pack PDBs into a separate archive: :: Note: the output filename here must be the same as in the upload_win.ftp.template script -%zip% a -mx9 -y MCServer_Win_%WCREV%_PDBs.7z -scsWIN @Install\Zip2008_PDBs.list +%zip% a -mx9 -y Install\MCServer_Win_%WCREV%_PDBs.7z -scsWIN @Install\Zip2008_PDBs.list if errorlevel 1 goto haderror -- cgit v1.2.3