From d646c81eb7e33970d75d8f143fcfb15cb581b9dc Mon Sep 17 00:00:00 2001 From: Mattes D Date: Tue, 30 Jun 2015 09:51:19 +0200 Subject: Removed the MakeLuaAPI script. It has been superseded by feeding commands to the server directly via stdin. --- MCServer/settings_apidump.ini | 30 -------------------- MakeLuaAPI.cmd | 66 ------------------------------------------- compile.sh | 2 +- 3 files changed, 1 insertion(+), 97 deletions(-) delete mode 100644 MCServer/settings_apidump.ini delete mode 100644 MakeLuaAPI.cmd diff --git a/MCServer/settings_apidump.ini b/MCServer/settings_apidump.ini deleted file mode 100644 index 80227a713..000000000 --- a/MCServer/settings_apidump.ini +++ /dev/null @@ -1,30 +0,0 @@ -; This settings file is used by the $/MakeLuaAPI.cmd script -; It is copied over settings.ini so that the APIDump plugin gets loaded upon server start - -[Server] -Description=MCServer - in C++! -MaxPlayers=100 -HardcoreEnabled=0 -Port=25565 -PortsIPv6= -DefaultViewDistance=10 - -[RCON] -Enabled=0 - -[Authentication] -Authenticate=1 -Server=session.minecraft.net -Address=/game/checkserver.jsp?user=%USERNAME%&serverId=%SERVERID% - -[Worlds] -; World=secondworld -DefaultWorld=world - -[Plugins] -Plugin=APIDump - -[DeadlockDetect] -Enabled=0 -IntervalSec=20 - diff --git a/MakeLuaAPI.cmd b/MakeLuaAPI.cmd deleted file mode 100644 index 90b8cf53e..000000000 --- a/MakeLuaAPI.cmd +++ /dev/null @@ -1,66 +0,0 @@ -@echo off -:: MakeLuaAPI.cmd -:: This script is run after the nightbuild to produce the Lua API documentation and upload it to a website. -:: It expects at least three environment variables set: ftpsite, ftpuser and ftppass, specifying the FTP site and login to use for the upload - - - - - -:: Check that we got all the environment vars needed for the upload: - -if "a%ftppass%" == "a" ( - echo You need to set FTP password in the ftppass environment variable to upload the files - goto end -) -if "a%ftpuser%" == "a" ( - echo You need to set FTP username in the ftpuser environment variable to upload the files - goto end -) -if "a%ftpsite%" == "a" ( - echo You need to set FTP server in the ftpsite environment variable to upload the files - goto end -) - - - - - -:: Create the API documentation by running the server and stopping it right after it starts: - -cd MCServer -copy /Y settings_apidump.ini settings.ini -echo api | MCServer -cd .. - - - - - -:: Upload the API to the web: - -ncftpput -p %ftppass% -u %ftpuser% -T temp_ -R %ftpsite% /LuaAPI MCServer/API/*.* -if errorlevel 1 goto haderror -echo Upload finished. - -goto end - - - - - -:haderror -echo an error was encountered, check command output above -pause -goto finished - - - - - -:end -if "a%1" == "a" pause - - - -:finished \ No newline at end of file diff --git a/compile.sh b/compile.sh index 1e965aecc..9ef6d6149 100755 --- a/compile.sh +++ b/compile.sh @@ -1,7 +1,7 @@ #|| goto :windows_detected # Do we already have a repo? -if [[ -d .git && -f easyinstall.sh && -f MakeLuaAPI.cmd ]]; then # A good enough indicator that we're in the MCServer git repo. +if [[ -d .git && -f easyinstall.sh && -f src/BlockArea.cpp ]]; then # A good enough indicator that we're in the MCServer git repo. cd ../ echo "MCServer repository detected. This should make the process faster, especially if you compiled before." fi -- cgit v1.2.3