From cc72b204b2bfcf720d6520783290c3fd30a01ea2 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sat, 28 Dec 2019 12:53:37 +0100 Subject: Output the binaries into a per-configuration Server subfolder. (#4440) Make links to the original Server subfolder's items from the per-configuration Server subfolder. --- .travis.yml | 4 +- BACKERS | 20 ++++ CIbuild.sh | 2 +- Install/.gitignore | 2 - Install/Cuberite_high_detail_debug.cmd | 1 - Install/Cuberite_medium_detail_debug.cmd | 1 - Install/ThirdPartyLicenses/LibEvent-LICENSE.txt | 99 ----------------- Install/ThirdPartyLicenses/Lua-LICENSE.txt | 21 ---- Install/ThirdPartyLicenses/LuaExpat-license.html | 120 --------------------- Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt | 27 ----- .../ThirdPartyLicenses/MersenneTwister-LICENSE.txt | 43 -------- Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt | 20 ---- Install/ThirdPartyLicenses/fmt-LICENSE.rst | 23 ---- Install/WCVersion.cmd.template | 1 - Install/Zip2008.list | 19 ---- Install/Zip2008_PDBs.list | 3 - Server/BACKERS | 20 ---- Server/Install/.gitignore | 2 + Server/Install/Cuberite_high_detail_debug.cmd | 1 + Server/Install/Cuberite_medium_detail_debug.cmd | 1 + Server/Install/PackWindowsExecutables.cmd | 21 ++++ .../ThirdPartyLicenses/LibEvent-LICENSE.txt | 99 +++++++++++++++++ Server/Install/ThirdPartyLicenses/Lua-LICENSE.txt | 21 ++++ .../ThirdPartyLicenses/LuaExpat-license.html | 120 +++++++++++++++++++++ .../ThirdPartyLicenses/LuaSQLite3-LICENSE.txt | 27 +++++ .../ThirdPartyLicenses/MersenneTwister-LICENSE.txt | 43 ++++++++ .../ThirdPartyLicenses/SQLiteCpp-LICENSE.txt | 20 ++++ Server/Install/ThirdPartyLicenses/fmt-LICENSE.rst | 23 ++++ Server/Install/WindowsExecutables.list | 19 ++++ Server/Install/WindowsPDBs.list | 2 + appveyor.yml | 68 +++++------- lib/lua | 2 +- src/CMakeLists.txt | 87 ++++++++++++--- 33 files changed, 521 insertions(+), 461 deletions(-) create mode 100644 BACKERS delete mode 100644 Install/.gitignore delete mode 100644 Install/Cuberite_high_detail_debug.cmd delete mode 100644 Install/Cuberite_medium_detail_debug.cmd delete mode 100644 Install/ThirdPartyLicenses/LibEvent-LICENSE.txt delete mode 100644 Install/ThirdPartyLicenses/Lua-LICENSE.txt delete mode 100644 Install/ThirdPartyLicenses/LuaExpat-license.html delete mode 100644 Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt delete mode 100644 Install/ThirdPartyLicenses/MersenneTwister-LICENSE.txt delete mode 100644 Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt delete mode 100644 Install/ThirdPartyLicenses/fmt-LICENSE.rst delete mode 100644 Install/WCVersion.cmd.template delete mode 100644 Install/Zip2008.list delete mode 100644 Install/Zip2008_PDBs.list delete mode 100644 Server/BACKERS create mode 100644 Server/Install/.gitignore create mode 100644 Server/Install/Cuberite_high_detail_debug.cmd create mode 100644 Server/Install/Cuberite_medium_detail_debug.cmd create mode 100644 Server/Install/PackWindowsExecutables.cmd create mode 100644 Server/Install/ThirdPartyLicenses/LibEvent-LICENSE.txt create mode 100644 Server/Install/ThirdPartyLicenses/Lua-LICENSE.txt create mode 100644 Server/Install/ThirdPartyLicenses/LuaExpat-license.html create mode 100644 Server/Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt create mode 100644 Server/Install/ThirdPartyLicenses/MersenneTwister-LICENSE.txt create mode 100644 Server/Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt create mode 100644 Server/Install/ThirdPartyLicenses/fmt-LICENSE.rst create mode 100644 Server/Install/WindowsExecutables.list create mode 100644 Server/Install/WindowsPDBs.list diff --git a/.travis.yml b/.travis.yml index 266077156..742064177 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,13 +14,13 @@ matrix: packages: - ccache env: &Debug - - TRAVIS_CUBERITE_BUILD_TYPE=DEBUG CUBERITE_PATH=./Cuberite_debug + - TRAVIS_CUBERITE_BUILD_TYPE=DEBUG # AppleClang # OSX workers are slower to start up. Having these first in the build matrix makes travis faster overall. - os: osx compiler: clang env: &Release - - TRAVIS_CUBERITE_BUILD_TYPE=RELEASE CUBERITE_PATH=./Cuberite + - TRAVIS_CUBERITE_BUILD_TYPE=RELEASE - os: osx compiler: clang env: *Debug diff --git a/BACKERS b/BACKERS new file mode 100644 index 000000000..cf61dfe94 --- /dev/null +++ b/BACKERS @@ -0,0 +1,20 @@ +Thanks to the following people for supporting the Cuberite project with a donation: + + - Alvin + - Anonymous + - chrobione + - DrMasik + - Fllamber + - JimSVMI83 + - Lordake + - ltdTM + - Phillip Inman + - PureTryOut + - Robert Cringely + - spekdrum + - SphinxC0re + - Utking + - VaiN474 + +If you enjoy Cuberite, feel free to donate to the project on Bountysource: +https://salt.bountysource.com/teams/cuberite diff --git a/CIbuild.sh b/CIbuild.sh index 9f2145624..b4163f0a8 100755 --- a/CIbuild.sh +++ b/CIbuild.sh @@ -24,7 +24,7 @@ echo "Testing..." cd Server/; touch apiCheckFailed.flag if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then - ${CUBERITE_PATH} <<- EOF + ./Cuberite <<- EOF load APIDump apicheck restart diff --git a/Install/.gitignore b/Install/.gitignore deleted file mode 100644 index 52c5ca5a9..000000000 --- a/Install/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.tag -*.example.ini \ No newline at end of file diff --git a/Install/Cuberite_high_detail_debug.cmd b/Install/Cuberite_high_detail_debug.cmd deleted file mode 100644 index 0880495e3..000000000 --- a/Install/Cuberite_high_detail_debug.cmd +++ /dev/null @@ -1 +0,0 @@ -Cuberite --crash-dump-full diff --git a/Install/Cuberite_medium_detail_debug.cmd b/Install/Cuberite_medium_detail_debug.cmd deleted file mode 100644 index 1dcb291a0..000000000 --- a/Install/Cuberite_medium_detail_debug.cmd +++ /dev/null @@ -1 +0,0 @@ -Cuberite --crash-dump-globals diff --git a/Install/ThirdPartyLicenses/LibEvent-LICENSE.txt b/Install/ThirdPartyLicenses/LibEvent-LICENSE.txt deleted file mode 100644 index 402ca5089..000000000 --- a/Install/ThirdPartyLicenses/LibEvent-LICENSE.txt +++ /dev/null @@ -1,99 +0,0 @@ -Libevent is available for use under the following license, commonly known -as the 3-clause (or "modified") BSD license: - -============================== -Copyright (c) 2000-2007 Niels Provos -Copyright (c) 2007-2012 Niels Provos and Nick Mathewson - -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 name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. -============================== - -Portions of Libevent are based on works by others, also made available by -them under the three-clause BSD license above. The copyright notices are -available in the corresponding source files; the license is as above. Here's -a list: - -log.c: - Copyright (c) 2000 Dug Song - Copyright (c) 1993 The Regents of the University of California. - -strlcpy.c: - Copyright (c) 1998 Todd C. Miller - -win32select.c: - Copyright (c) 2003 Michael A. Davis - -evport.c: - Copyright (c) 2007 Sun Microsystems - -ht-internal.h: - Copyright (c) 2002 Christopher Clark - -minheap-internal.h: - Copyright (c) 2006 Maxim Yegorushkin - -============================== - -The arc4module is available under the following, sometimes called the -"OpenBSD" license: - - Copyright (c) 1996, David Mazieres - Copyright (c) 2008, Damien Miller - - Permission to use, copy, modify, and distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -============================== - -The Windows timer code is based on code from libutp, which is -distributed under this license, sometimes called the "MIT" license. - - -Copyright (c) 2010 BitTorrent, Inc. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/Install/ThirdPartyLicenses/Lua-LICENSE.txt b/Install/ThirdPartyLicenses/Lua-LICENSE.txt deleted file mode 100644 index 3c6d06fcf..000000000 --- a/Install/ThirdPartyLicenses/Lua-LICENSE.txt +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (C) 1994-2008 Lua.org, PUC-Rio. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF -ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED -TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT -SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Install/ThirdPartyLicenses/LuaExpat-license.html b/Install/ThirdPartyLicenses/LuaExpat-license.html deleted file mode 100644 index bd4a54f9a..000000000 --- a/Install/ThirdPartyLicenses/LuaExpat-license.html +++ /dev/null @@ -1,120 +0,0 @@ - - - - LuaExpat: XML Expat parsing for the Lua programming language - - - - - -
- -
- -
LuaExpat
-
XML Expat parsing for the Lua programming language
-
- -
- - - -
- -

License

- -

-LuaExpat is free software: it can be used for both academic and -commercial purposes at absolutely no cost. There are no royalties -or GNU-like "copyleft" restrictions. LuaExpat qualifies as Open Source -software. Its licenses are compatible with GPL. LuaExpat is not in -the public domain and the -Kepler Project -keep its copyright. The legal details are below. -

- -

The spirit of the license is that you are free to use LuaExpat -for any purpose at no cost without having to ask us. The only -requirement is that if you do use LuaExpat, then you should give us -credit by including the appropriate copyright notice somewhere in -your product or its documentation.

- -

The LuaExpat library is designed and implemented by Roberto -Ierusalimschy. The implementation is not derived from licensed -software.

- -
-

Copyright © 2003-2007 The Kepler Project. -

- -

Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation -files (the "Software"), to deal in the Software without -restriction, including without limitation the rights to use, copy, -modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions:

- -

The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software.

- -

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN -ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE.

- -
- -
- -
-

Valid XHTML 1.0!

-

- $Id: license.html,v 1.9 2007/06/05 20:03:12 carregal Exp $ -

-
- -
- - - diff --git a/Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt b/Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt deleted file mode 100644 index cf1014378..000000000 --- a/Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt +++ /dev/null @@ -1,27 +0,0 @@ -/************************************************************************ -* lsqlite3 * -* Copyright (C) 2002-2013 Tiago Dionizio, Doug Currie * -* All rights reserved. * -* Author : Tiago Dionizio * -* Author : Doug Currie * -* Library : lsqlite3 - a SQLite 3 database binding for Lua 5 * -* * -* Permission is hereby granted, free of charge, to any person obtaining * -* a copy of this software and associated documentation files (the * -* "Software"), to deal in the Software without restriction, including * -* without limitation the rights to use, copy, modify, merge, publish, * -* distribute, sublicense, and/or sell copies of the Software, and to * -* permit persons to whom the Software is furnished to do so, subject to * -* the following conditions: * -* * -* The above copyright notice and this permission notice shall be * -* included in all copies or substantial portions of the Software. * -* * -* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * -* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * -* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.* -* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * -* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * -* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * -* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * -************************************************************************/ diff --git a/Install/ThirdPartyLicenses/MersenneTwister-LICENSE.txt b/Install/ThirdPartyLicenses/MersenneTwister-LICENSE.txt deleted file mode 100644 index 5c7a6ef04..000000000 --- a/Install/ThirdPartyLicenses/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/Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt b/Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt deleted file mode 100644 index ec952abba..000000000 --- a/Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2012-2014 Sebastien Rombauts (sebastien.rombauts@gmail.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR -IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/Install/ThirdPartyLicenses/fmt-LICENSE.rst b/Install/ThirdPartyLicenses/fmt-LICENSE.rst deleted file mode 100644 index eb6be6503..000000000 --- a/Install/ThirdPartyLicenses/fmt-LICENSE.rst +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (c) 2012 - 2016, Victor Zverovich - -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. - -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. diff --git a/Install/WCVersion.cmd.template b/Install/WCVersion.cmd.template deleted file mode 100644 index 7c6fac164..000000000 --- a/Install/WCVersion.cmd.template +++ /dev/null @@ -1 +0,0 @@ -set WCREV=$WCREV$ \ No newline at end of file diff --git a/Install/Zip2008.list b/Install/Zip2008.list deleted file mode 100644 index 92c728d52..000000000 --- a/Install/Zip2008.list +++ /dev/null @@ -1,19 +0,0 @@ -..\Server\Cuberite.exe -..\Server\*.dll -..\Server\Plugins -..\Server\Prefabs -..\Server\webadmin -..\Server\BACKERS -..\Server\brewing.txt -..\Server\crafting.txt -..\Server\furnace.txt -..\Server\items.ini -..\Server\monsters.ini -..\Server\buildinfo.txt -..\Server\README.txt -..\Server\favicon.png -..\CONTRIBUTORS -..\LICENSE -Cuberite*debug.cmd -*.example.ini -ThirdPartyLicenses diff --git a/Install/Zip2008_PDBs.list b/Install/Zip2008_PDBs.list deleted file mode 100644 index ca523522e..000000000 --- a/Install/Zip2008_PDBs.list +++ /dev/null @@ -1,3 +0,0 @@ -Server\*.pdb -Server\buildinfo.txt -src\Bindings\Bindings.* diff --git a/Server/BACKERS b/Server/BACKERS deleted file mode 100644 index cf61dfe94..000000000 --- a/Server/BACKERS +++ /dev/null @@ -1,20 +0,0 @@ -Thanks to the following people for supporting the Cuberite project with a donation: - - - Alvin - - Anonymous - - chrobione - - DrMasik - - Fllamber - - JimSVMI83 - - Lordake - - ltdTM - - Phillip Inman - - PureTryOut - - Robert Cringely - - spekdrum - - SphinxC0re - - Utking - - VaiN474 - -If you enjoy Cuberite, feel free to donate to the project on Bountysource: -https://salt.bountysource.com/teams/cuberite diff --git a/Server/Install/.gitignore b/Server/Install/.gitignore new file mode 100644 index 000000000..52c5ca5a9 --- /dev/null +++ b/Server/Install/.gitignore @@ -0,0 +1,2 @@ +*.tag +*.example.ini \ No newline at end of file diff --git a/Server/Install/Cuberite_high_detail_debug.cmd b/Server/Install/Cuberite_high_detail_debug.cmd new file mode 100644 index 000000000..0880495e3 --- /dev/null +++ b/Server/Install/Cuberite_high_detail_debug.cmd @@ -0,0 +1 @@ +Cuberite --crash-dump-full diff --git a/Server/Install/Cuberite_medium_detail_debug.cmd b/Server/Install/Cuberite_medium_detail_debug.cmd new file mode 100644 index 000000000..1dcb291a0 --- /dev/null +++ b/Server/Install/Cuberite_medium_detail_debug.cmd @@ -0,0 +1 @@ +Cuberite --crash-dump-globals diff --git a/Server/Install/PackWindowsExecutables.cmd b/Server/Install/PackWindowsExecutables.cmd new file mode 100644 index 000000000..8993ab3ed --- /dev/null +++ b/Server/Install/PackWindowsExecutables.cmd @@ -0,0 +1,21 @@ +@echo off +:: This script is run in the Appveyor CI builds to pack up the artifacts +:: It is expected to be run with the Server folder as the current working dir +@echo on + +del Cuberite.zip +del PDBs.zip +del ManualAPI.zip +del AutoAPI.zip +rd /q /s Plugins\ManualApiDump +7z a -tzip -y Cuberite.zip -scsWIN -i@Install\WindowsExecutables.list -xr!*.git* +7z a -tzip -y PDBs.zip -scsWIN -i@Install/WindowsPDBs.list -xr!*.git* +git clone https://github.com/madmaxoft/ManualApiDump Plugins/ManualApiDump +echo load ManualApiDump 1>cmds.txt +echo manualapi 1>>cmds.txt +echo load APIDump 1>>cmds.txt +echo api 1>>cmds.txt +echo stop 1>>cmds.txt +Cuberite --port 32767 0 +Copyright (c) 2007-2012 Niels Provos and Nick Mathewson + +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 name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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. +============================== + +Portions of Libevent are based on works by others, also made available by +them under the three-clause BSD license above. The copyright notices are +available in the corresponding source files; the license is as above. Here's +a list: + +log.c: + Copyright (c) 2000 Dug Song + Copyright (c) 1993 The Regents of the University of California. + +strlcpy.c: + Copyright (c) 1998 Todd C. Miller + +win32select.c: + Copyright (c) 2003 Michael A. Davis + +evport.c: + Copyright (c) 2007 Sun Microsystems + +ht-internal.h: + Copyright (c) 2002 Christopher Clark + +minheap-internal.h: + Copyright (c) 2006 Maxim Yegorushkin + +============================== + +The arc4module is available under the following, sometimes called the +"OpenBSD" license: + + Copyright (c) 1996, David Mazieres + Copyright (c) 2008, Damien Miller + + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +============================== + +The Windows timer code is based on code from libutp, which is +distributed under this license, sometimes called the "MIT" license. + + +Copyright (c) 2010 BitTorrent, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/Server/Install/ThirdPartyLicenses/Lua-LICENSE.txt b/Server/Install/ThirdPartyLicenses/Lua-LICENSE.txt new file mode 100644 index 000000000..3c6d06fcf --- /dev/null +++ b/Server/Install/ThirdPartyLicenses/Lua-LICENSE.txt @@ -0,0 +1,21 @@ +Copyright (C) 1994-2008 Lua.org, PUC-Rio. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR +ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE +OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/Server/Install/ThirdPartyLicenses/LuaExpat-license.html b/Server/Install/ThirdPartyLicenses/LuaExpat-license.html new file mode 100644 index 000000000..bd4a54f9a --- /dev/null +++ b/Server/Install/ThirdPartyLicenses/LuaExpat-license.html @@ -0,0 +1,120 @@ + + + + LuaExpat: XML Expat parsing for the Lua programming language + + + + + +
+ +
+ +
LuaExpat
+
XML Expat parsing for the Lua programming language
+
+ +
+ + + +
+ +

License

+ +

+LuaExpat is free software: it can be used for both academic and +commercial purposes at absolutely no cost. There are no royalties +or GNU-like "copyleft" restrictions. LuaExpat qualifies as Open Source +software. Its licenses are compatible with GPL. LuaExpat is not in +the public domain and the +Kepler Project +keep its copyright. The legal details are below. +

+ +

The spirit of the license is that you are free to use LuaExpat +for any purpose at no cost without having to ask us. The only +requirement is that if you do use LuaExpat, then you should give us +credit by including the appropriate copyright notice somewhere in +your product or its documentation.

+ +

The LuaExpat library is designed and implemented by Roberto +Ierusalimschy. The implementation is not derived from licensed +software.

+ +
+

Copyright © 2003-2007 The Kepler Project. +

+ +

Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, copy, +modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions:

+ +

The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software.

+ +

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS +BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN +ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.

+ +
+ +
+ +
+

Valid XHTML 1.0!

+

+ $Id: license.html,v 1.9 2007/06/05 20:03:12 carregal Exp $ +

+
+ +
+ + + diff --git a/Server/Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt b/Server/Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt new file mode 100644 index 000000000..cf1014378 --- /dev/null +++ b/Server/Install/ThirdPartyLicenses/LuaSQLite3-LICENSE.txt @@ -0,0 +1,27 @@ +/************************************************************************ +* lsqlite3 * +* Copyright (C) 2002-2013 Tiago Dionizio, Doug Currie * +* All rights reserved. * +* Author : Tiago Dionizio * +* Author : Doug Currie * +* Library : lsqlite3 - a SQLite 3 database binding for Lua 5 * +* * +* Permission is hereby granted, free of charge, to any person obtaining * +* a copy of this software and associated documentation files (the * +* "Software"), to deal in the Software without restriction, including * +* without limitation the rights to use, copy, modify, merge, publish, * +* distribute, sublicense, and/or sell copies of the Software, and to * +* permit persons to whom the Software is furnished to do so, subject to * +* the following conditions: * +* * +* The above copyright notice and this permission notice shall be * +* included in all copies or substantial portions of the Software. * +* * +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.* +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY * +* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * +* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * +* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * +************************************************************************/ diff --git a/Server/Install/ThirdPartyLicenses/MersenneTwister-LICENSE.txt b/Server/Install/ThirdPartyLicenses/MersenneTwister-LICENSE.txt new file mode 100644 index 000000000..5c7a6ef04 --- /dev/null +++ b/Server/Install/ThirdPartyLicenses/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/Server/Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt b/Server/Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt new file mode 100644 index 000000000..ec952abba --- /dev/null +++ b/Server/Install/ThirdPartyLicenses/SQLiteCpp-LICENSE.txt @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2012-2014 Sebastien Rombauts (sebastien.rombauts@gmail.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/Server/Install/ThirdPartyLicenses/fmt-LICENSE.rst b/Server/Install/ThirdPartyLicenses/fmt-LICENSE.rst new file mode 100644 index 000000000..eb6be6503 --- /dev/null +++ b/Server/Install/ThirdPartyLicenses/fmt-LICENSE.rst @@ -0,0 +1,23 @@ +Copyright (c) 2012 - 2016, Victor Zverovich + +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. + +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. diff --git a/Server/Install/WindowsExecutables.list b/Server/Install/WindowsExecutables.list new file mode 100644 index 000000000..66eeb4175 --- /dev/null +++ b/Server/Install/WindowsExecutables.list @@ -0,0 +1,19 @@ +Cuberite.exe +*.dll +Plugins +Prefabs +webadmin +BACKERS +brewing.txt +crafting.txt +furnace.txt +items.ini +monsters.ini +buildinfo.txt +README.txt +favicon.png +CONTRIBUTORS +LICENSE +Cuberite*debug.cmd +*.example.ini +ThirdPartyLicenses diff --git a/Server/Install/WindowsPDBs.list b/Server/Install/WindowsPDBs.list new file mode 100644 index 000000000..56b161b04 --- /dev/null +++ b/Server/Install/WindowsPDBs.list @@ -0,0 +1,2 @@ +*.pdb +buildinfo.txt diff --git a/appveyor.yml b/appveyor.yml index 2ba248df0..2be646452 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,15 +11,15 @@ environment: matrix: - job_name: Windows-x64-debug configuration: Debug - CUBERITE_EXECUTABLE: cuberite_debug + BUILD_DIR: Debug-x64 - job_name: Windows-x86 configuration: Release - CUBERITE_EXECUTABLE: cuberite + BUILD_DIR: Release-x86 - job_name: Windows-x64 configuration: Release - CUBERITE_EXECUTABLE: cuberite + BUILD_DIR: Release-x64 install: - echo %TIME% @@ -35,8 +35,8 @@ for: - job_name: Windows-x64-debug before_build: - - if not exist Debug-x64 mkdir Debug-x64 - - cd Debug-x64 + - if not exist %BUILD_DIR% mkdir %BUILD_DIR% + - cd %BUILD_DIR% - echo %TIME% - cmake -G "Visual Studio 14 2015 Win64" -DSELF_TEST=1 -DBUILD_TOOLS=1 .. - echo %TIME% @@ -56,8 +56,8 @@ for: - job_name: Windows-x86 before_build: - - if not exist Release-x86 mkdir Release-x86 - - cd Release-x86 + - if not exist %BUILD_DIR% mkdir %BUILD_DIR% + - cd %BUILD_DIR% - echo %TIME% - cmake -G "Visual Studio 14 2015" .. - echo %TIME% @@ -77,8 +77,8 @@ for: - job_name: Windows-x64 before_build: - - if not exist Release-x64 mkdir Release-x64 - - cd Release-x64 + - if not exist %BUILD_DIR% mkdir %BUILD_DIR% + - cd %BUILD_DIR% - echo %TIME% - cmake -G "Visual Studio 14 2015 Win64" .. - echo %TIME% @@ -89,44 +89,24 @@ for: parallel: true verbosity: minimal +########################################### +# Cache for speeding up subsequent builds # +########################################### cache: - Debug-x64 - Release-x86 - Release-x64 +##################### +# Package artifacts # +##################### + after_build: -- cd Install -- echo Cuberite %APPVEYOR_JOB_NAME%-#%APPVEYOR_BUILD_NUMBER% 1>..\Server\buildinfo.txt -- 7z a -tzip -y ../Cuberite.zip -scsWIN -i@Zip2008.list -xr!*.git* -- cd .. -- 7z a -tzip -y PDBs.zip -scsWIN -i@Install/Zip2008_PDBs.list -xr!*.git* -- cd Server\plugins -- git clone https://github.com/madmaxoft/ManualApiDump -- cd .. -- echo load ManualApiDump 1>cmds.txt -- echo manualapi 1>>cmds.txt -- echo load APIDump 1>>cmds.txt -- echo api 1>>cmds.txt -- echo stop 1>>cmds.txt -- "%CUBERITE_EXECUTABLE% --port 32767 0buildinfo.txt +- Install\PackWindowsExecutables.cmd +- appveyor PushArtifact Cuberite.zip -FileName Cuberite.zip +- appveyor PushArtifact PDBs.zip -FileName PDBs.zip +- appveyor PushArtifact AutoAPI.zip -FileName AutoAPI.zip +- appveyor PushArtifact ManualAPI.zip -FileName ManualAPI.zip +- appveyor PushArtifact .luacheckrc -FileName .luacheckrc diff --git a/lib/lua b/lib/lua index e28ba2761..4a435929d 160000 --- a/lib/lua +++ b/lib/lua @@ -1 +1 @@ -Subproject commit e28ba276192e2aa68601952ab88760387fa7fd25 +Subproject commit 4a435929d50870b63bc97174a9e5820e400f93d8 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 105f234f1..4358f6bce 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -323,25 +323,84 @@ if (MSVC) endif() + + + add_executable(${CMAKE_PROJECT_NAME} ${SOURCE}) # Output the executable into the $/Server folder, so that it has access to external resources: SET_TARGET_PROPERTIES(${CMAKE_PROJECT_NAME} PROPERTIES - RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Server - RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_SOURCE_DIR}/Server - RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_SOURCE_DIR}/Server - RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_SOURCE_DIR}/Server - RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_SOURCE_DIR}/Server - RUNTIME_OUTPUT_DIRECTORY_DEBUGPROFILE ${CMAKE_SOURCE_DIR}/Server - RUNTIME_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_SOURCE_DIR}/Server + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Server + RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/Server + RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/Server + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR}/Server + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR}/Server + RUNTIME_OUTPUT_DIRECTORY_DEBUGPROFILE ${CMAKE_BINARY_DIR}/Server + RUNTIME_OUTPUT_DIRECTORY_RELEASEPROFILE ${CMAKE_BINARY_DIR}/Server +) + + + + + +# Create a symbolic link from ${orig} to ${link} +# If ${link} already exists, does nothing. +function(make_symlink orig link) + # Get OS dependent path to use in `execute_process` + message("Creating symlink, orig = ${orig}; link = ${link}") + file(TO_NATIVE_PATH "${orig}" orig) + file(TO_NATIVE_PATH "${link}" link) + + if (NOT EXISTS ${link}) + if (CMAKE_HOST_UNIX) + set(command ln -s ${orig} ${link}) + else() + if (IS_DIRECTORY ${orig}) + set(command cmd.exe /c mklink /j ${link} ${orig}) + else() + set(command cmd.exe /c mklink /h ${link} ${orig}) + endif() + endif() + + execute_process(COMMAND ${command} + RESULT_VARIABLE result + ERROR_VARIABLE output) + + if (NOT ${result} EQUAL 0) + message(FATAL_ERROR "Could not create symbolic link for: ${link} --> ${orig}: ${output}") + endif() + endif() +endfunction(make_symlink) + + + + + +# Populate the output folder with symlinks to the Server folder's internals: +set(symlinks + Install + lang + Plugins + Prefabs + Protocol + webadmin + brewing.txt + crafting.txt + favicon.png + items.ini + monsters.ini ) +message("Creating output folder and symlinks...") +file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/Server") +foreach (symlink ${symlinks}) + make_symlink("${CMAKE_SOURCE_DIR}/Server/${symlink}" "${CMAKE_BINARY_DIR}/Server/${symlink}") +endforeach(symlink) +make_symlink("${CMAKE_SOURCE_DIR}/BACKERS" "${CMAKE_BINARY_DIR}/Server/BACKERS") +make_symlink("${CMAKE_SOURCE_DIR}/CONTRIBUTORS" "${CMAKE_BINARY_DIR}/Server/CONTRIBUTORS") +make_symlink("${CMAKE_SOURCE_DIR}/LICENSE" "${CMAKE_BINARY_DIR}/Server/LICENSE") +make_symlink("${CMAKE_SOURCE_DIR}/Server/Install/ThirdPartyLicenses" "${CMAKE_BINARY_DIR}/Server/ThirdPartyLicenses") -# Make the debug executable have a "_debug" suffix -SET_TARGET_PROPERTIES(${CMAKE_PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "_debug") -# Make the profiled executables have a "_profile" postfix -SET_TARGET_PROPERTIES(${CMAKE_PROJECT_NAME} PROPERTIES DEBUGPROFILE_POSTFIX "_debug_profile") -SET_TARGET_PROPERTIES(${CMAKE_PROJECT_NAME} PROPERTIES RELEASEPROFILE_POSTFIX "_profile") # Precompiled headers (2nd part) @@ -375,9 +434,11 @@ target_link_libraries(${CMAKE_PROJECT_NAME} luaexpat jsoncpp_lib_static mbedtls # Create a folder for Bindings' documentation: FILE(MAKE_DIRECTORY "Bindings/docs") +make_symlink("${CMAKE_SOURCE_DIR}/src/Bindings/docs" "${CMAKE_BINARY_DIR}/Server/BindingsDocs") -# For MSVC, set the startup project to Cuberite: +# For MSVC, set the startup project to Cuberite, and the debugger dir: if (MSVC) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT ${CMAKE_PROJECT_NAME}) + set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/Server") endif() -- cgit v1.2.3