Renamed output directory to Server

.gitignore

@@ -2,12 +2,13 @@ build/
 nbproject/
 ipch/
 Win32/
-MCServer/MCServer
-MCServer/buildinfo
-MCServer/CONTRIBUTORS
-MCServer/LICENSE
-MCServer/Licenses
-MCServer/itemblacklist
+MCServer
+Server/Cuberite
+Server/buildinfo
+Server/CONTRIBUTORS
+Server/LICENSE
+Server/Licenses
+Server/itemblacklist
 Testing/
 ChunkWorxSave.ini
 doxy/
@@ -71,11 +72,11 @@ CMakeFiles
 Makefile
 cmake_install.cmake
 install_mainfest.txt
-src/MCServer
+src/Cuberite
 lib/tolua++/tolua
 src/Bindings/Bindings.*
 src/Bindings/BindingDependencies.txt
-MCServer.dir/
+Cuberite.dir/
 src/AllFiles.lst
 
 #win32 cmake stuff

.gitmodules

@@ -1,23 +1,23 @@
 [submodule "MCServer/Plugins/Core"]
-	path = MCServer/Plugins/Core
+	path = Server/Plugins/Core
 	url = https://github.com/mc-server/Core.git
 [submodule "MCServer/Plugins/ProtectionAreas"]
-	path = MCServer/Plugins/ProtectionAreas
+	path = Server/Plugins/ProtectionAreas
 	url = https://github.com/mc-server/ProtectionAreas.git
 [submodule "MCServer/Plugins/TransAPI"]
-	path = MCServer/Plugins/TransAPI
+	path = Server/Plugins/TransAPI
 	url = https://github.com/bearbin/transapi.git
 [submodule "MCServer/Plugins/ChunkWorx"]
-	path = MCServer/Plugins/ChunkWorx
+	path = Server/Plugins/ChunkWorx
 	url = https://github.com/mc-server/ChunkWorx.git
 [submodule "MCServer/Plugins/ChatLog"]
-	path = MCServer/Plugins/ChatLog
+	path = Server/Plugins/ChatLog
 	url = https://github.com/mc-server/ChatLog.git
 [submodule "MCServer/Plugins/Handy"]
-	path = MCServer/Plugins/Handy
+	path = Server/Plugins/Handy
 	url = https://github.com/mc-server/Handy.git
 [submodule "MCServer/Plugins/MagicCarpet"]
-	path = MCServer/Plugins/MagicCarpet
+	path = Server/Plugins/MagicCarpet
 	url = https://github.com/mc-server/MagicCarpet.git
 [submodule "lib/polarssl"]
 	path = lib/polarssl

.travis.yml

@@ -1,7 +1,7 @@
 language: cpp
 sudo: false
 
-compiler: 
+compiler:
 - clang
 - gcc
 
@@ -16,8 +16,8 @@ addons:
 script: ./CIbuild.sh
 
 env:
-  - TRAVIS_MCSERVER_BUILD_TYPE=RELEASE MCSERVER_PATH=./MCServer
-  - TRAVIS_MCSERVER_BUILD_TYPE=DEBUG   MCSERVER_PATH=./MCServer_debug
+  - TRAVIS_CUBERITE_BUILD_TYPE=RELEASE CUBERITE_PATH=./Cuberite
+  - TRAVIS_CUBERITE_BUILD_TYPE=DEBUG   CUBERITE_PATH=./Cuberite_debug
 
 notifications:
   email:

CIbuild.sh

@@ -2,9 +2,9 @@
 
 set -e
 
-export MCSERVER_BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE"
-export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER
-export MCSERVER_BUILD_DATETIME=`date`
+export CUBERITE_BUILD_SERIES_NAME="Travis $CC $TRAVIS_CUBERITE_BUILD_TYPE"
+export CUBERITE_BUILD_ID=$TRAVIS_JOB_NUMBER
+export CUBERITE_BUILD_DATETIME=`date`
 
 if [ "$CXX" == "g++" ]; then
 	# This is a temporary workaround to allow the identification of GCC-4.8 by CMake, required for C++11 features
@@ -21,8 +21,8 @@ cd ..
 echo "Building..."
 make -j 2;
 make -j 2 test ARGS="-V";
-cd MCServer/;
-if [ "$TRAVIS_MCSERVER_BUILD_TYPE" != "COVERAGE" ]; then
-	echo restart | $MCSERVER_PATH;
-	echo stop | $MCSERVER_PATH;
+cd Server/;
+if [ "$TRAVIS_CUBERITE_BUILD_TYPE" != "COVERAGE" ]; then
+	echo restart | $CUBERITE_PATH;
+	echo stop | $CUBERITE_PATH;
 fi

CMakeLists.txt

@@ -10,9 +10,9 @@ endif()
 
 # These env variables are used for configuring Travis CI builds.
 # See https://github.com/mc-server/MCServer/pull/767
-if(DEFINED ENV{TRAVIS_MCSERVER_BUILD_TYPE})
-	message("Setting build type to $ENV{TRAVIS_MCSERVER_BUILD_TYPE}")
-	set(CMAKE_BUILD_TYPE $ENV{TRAVIS_MCSERVER_BUILD_TYPE})
+if(DEFINED ENV{TRAVIS_CUBERITE_BUILD_TYPE})
+	message("Setting build type to $ENV{TRAVIS_CUBERITE_BUILD_TYPE}")
+	set(CMAKE_BUILD_TYPE $ENV{TRAVIS_CUBERITE_BUILD_TYPE})
 endif()
 
 if(DEFINED ENV{TRAVIS_MCSERVER_FORCE32})
@@ -23,13 +23,13 @@ if(DEFINED ENV{TRAVIS_BUILD_WITH_COVERAGE})
 	set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE})
 endif()
 
-if(DEFINED ENV{MCSERVER_BUILD_ID})
+if(DEFINED ENV{CUBERITE_BUILD_ID})
 	# The build info is defined by the build system (Travis / Jenkins)
-	set(BUILD_ID $ENV{MCSERVER_BUILD_ID})
-	set(BUILD_SERIES_NAME $ENV{MCSERVER_BUILD_SERIES_NAME})
-	set(BUILD_DATETIME $ENV{MCSERVER_BUILD_DATETIME})
-	if(DEFINED ENV{MCSERVER_BUILD_COMMIT_ID})
-		set(BUILD_COMMIT_ID $ENV{MCSERVER_BUILD_COMMIT_ID})
+	set(BUILD_ID $ENV{CUBERITE_BUILD_ID})
+	set(BUILD_SERIES_NAME $ENV{CUBERITE_BUILD_SERIES_NAME})
+	set(BUILD_DATETIME $ENV{CUBERITE_BUILD_DATETIME})
+	if(DEFINED ENV{CUBERITE_BUILD_COMMIT_ID})
+		set(BUILD_COMMIT_ID $ENV{CUBERITE_BUILD_COMMIT_ID})
 	else()
 		message("Commit id not set, attempting to determine id from git")
 		execute_process(
@@ -75,16 +75,16 @@ endif()
 # We need C++11 features, Visual Studio has those from VS2012, but it needs a new platform toolset for those; VS2013 supports them natively:
 # Adapted from http://binglongx.wordpress.com/2013/06/28/set-non-default-platform-toolset-in-cmake/
 if(MSVC OR MSVC_IDE)
-  if( MSVC_VERSION LESS 1700 )       # VC10- / VS2010-
-    message(FATAL_ERROR "The project requires C++11 features. "
-      "You need at least Visual Studio 11 (Microsoft Visual Studio 2012), "
-      "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012).")
-  elseif( MSVC_VERSION EQUAL 1700 )  # VC11 / VS2012
-    message( "VC11: using Microsoft Visual Studio 2012 "
-      "with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012)" )
-    set(CMAKE_GENERATOR_TOOLSET "v120_CTP_Nov2012" CACHE STRING "Platform Toolset" FORCE)
-  else() # VC12+, assuming C++11 supported.
-  endif()
+	if( MSVC_VERSION LESS 1700 )       # VC10- / VS2010-
+		message(FATAL_ERROR "The project requires C++11 features. "
+		"You need at least Visual Studio 11 (Microsoft Visual Studio 2012), "
+		"with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012).")
+	elseif( MSVC_VERSION EQUAL 1700 )  # VC11 / VS2012
+		message( "VC11: using Microsoft Visual Studio 2012 "
+		"with Microsoft Visual C++ Compiler Nov 2012 CTP (v120_CTP_Nov2012)" )
+		set(CMAKE_GENERATOR_TOOLSET "v120_CTP_Nov2012" CACHE STRING "Platform Toolset" FORCE)
+	else() # VC12+, assuming C++11 supported.
+	endif()
 endif()
 
 set(BUILD_TOOLS OFF CACHE BOOL "")
@@ -129,7 +129,7 @@ endif()
 
 
 
-project (MCServer)
+project (Cuberite)
 
 # Set options for SQLiteCpp, disable all their tests and lints:
 set(SQLITECPP_RUN_CPPLINT     OFF CACHE BOOL "Run cpplint.py tool for Google C++ StyleGuide."  FORCE)
@@ -259,4 +259,3 @@ if (MSVC)
 		)
 	endif()
 endif()
-

MCServer/delete_windows_service.cmd

@@ -1,4 +0,0 @@
-@echo off
-set SERVICENAME="MCServer"
-
-sc delete %SERVICENAME%

MCServer/install_windows_service.cmd

@@ -1,7 +0,0 @@
-rem Alter this if you need to install multiple instances.
-@echo off
-set SERVICENAME="MCServer"
-
-set CURRENTDIR=%CD%
-sc create %SERVICENAME% binPath= "%CURRENTDIR%\MCServer.exe -d" start= auto DisplayName= %SERVICENAME%
-sc description %SERVICENAME% "Minecraft server instance"

MCServer/profile_run.cmd

@@ -1,101 +0,0 @@
-@echo off
-::
-:: Profiling using a MSVC standalone profiler
-::
-:: See http://www.codeproject.com/Articles/144643/Profiling-of-C-Applications-in-Visual-Studio-for-F for details
-:: Note that this script assumes a newer version of the tool, Performance Tools 2010, so that it is Win7-compatible
-:: Download at http://www.microsoft.com/en-ca/download/details.aspx?id=23205
-::
-:: This script sets the profiler up, then starts the app, waits for it to finish and stops the profiler.
-:: Then it generates all the CSV report files
-::
-:: It expects the MS Performance tools installed in C:\Program Files\Microsoft Visual Studio 9.0\Team Tools\Performance Tools
-:: You can override this path by setting the pt environment variable prior to launching this script
-::
-:: By default it will launch the 32-bit release version of MCServer; set the app environment variable to another executable to run that instead.
-:: Set the IsExecutablex64 env variable to \x64 to profile a 64-bit executable instead (available as the profile_run_x64.cmd script)
-:: Note that the app needs to be compiled with the "/PROFILE" flag in order for the profiling to work
-
-
-
-
-setlocal
-
-:: Get the 32-bit program files folder
-:: Note that in Win7 the %ProgramFiles% variable points to 32-bit program files for normal users and to 64-bit program files for elevated users
-:: This script needs elevation, but the performance tools are 32-bit only
-if "%programfiles(x86)%p" == "p" (
-	set ProgFiles="%ProgramFiles%"
-) else (
-	set ProgFiles="%ProgramFiles(x86)%"
-)
-
-:: Check that the required variables exist, provide defaults:
-if %pt%n == n (
-	set pt="%ProgFiles:"=%\Microsoft Visual Studio 10.0\Team Tools\Performance Tools"
-)
-
-if %app%n == n (
-	set app=MCServer_profile.exe
-)
-
-if %outputdir%n == n (
-	set outputdir=..\Profiling
-)
-
-
-
-
-:: Create the output directory, if it didn't exist
-mkdir %outputdir%
-
-
-
-
-
-:: Start the profiler
-set outputname=profile.vsp
-set output=%outputdir%\%outputname%
-%pt%%IsExecutablex64%\vsperfcmd /start:sample /output:%output%
-if errorlevel 1 goto haderror
-
-:: Launch the application via the profiler
-%pt%%IsExecutablex64%\vsperfcmd /launch:%app%
-if errorlevel 1 goto haderrorshutdown
-
-:: Shut down the profiler (this command waits, until the application is terminated)
-%pt%%IsExecutablex64%\vsperfcmd /shutdown
-if errorlevel 1 goto haderror
-
-
-
-
-
-:: cd to outputdir, so that the reports are generated there
-cd %outputdir%
-
-:: generate the report files (.csv)
-%pt%\vsperfreport /summary:all %outputname% /symbolpath:"srv*C:\Programovani\Symbols*http://msdl.microsoft.com/download/symbols" 
-if errorlevel 1 goto haderror
-
-
-
-
-
-goto finished
-
-
-
-
-:haderrorshutdown
-echo An error was encountered, shutting down the profiler
-%pt%%IsExecutablex64%\vsperfcmd /shutdown
-
-:haderror
-echo An error was encountered
-pause
-
-
-
-
-:finished

MCServer/profile_run_debug.cmd

@@ -1,5 +0,0 @@
-@echo off
-:: This script uses the profile_run.cmd script to run profiling on the DebugProfile executable
-
-set app=MCServer_debug_profile.exe
-call profile_run.cmd

MCServer/profile_run_x64.cmd

@@ -1,5 +0,0 @@
-@echo off
-:: This script uses the profile_run.cmd script to run profiling on a x64 release executable
-
-set IsExecutablex64=\x64
-call profile_run.cmd

Server/.gitignore

@@ -3,8 +3,8 @@
 *.exp
 *.lib
 *.ini
-MCServer
-MCServer_debug
+Cuberite
+Cuberite_debug
 CommLogs/
 GalExports/
 logs
@@ -33,4 +33,3 @@ mcserver_api.lua
 # Ignore the webadmin certs / privkey, so that no-one commits theirs by accident:
 webadmin/httpscert.crt
 webadmin/httpskey.pem
-