flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Added MCServer_ prfix to env vars for versions

Browse Source
This commit is contained in:
Tycho 2014-09-10 18:08:50 +01:00
parent 35a42fc437
commit 4f67ca4c0a
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CIbuild.sh
View File

@ -2,9 +2,9 @@
set -e set -e
export BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE" export MCSERVER_BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE"
export BUILD_ID=$TRAVIS_JOB_NUMBER export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER
export BUILD_DATETIME=`date` export MCSERVER_BUILD_DATETIME=`date`
cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1; cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1;
make -j 2; make -j 2;

12
CMakeLists.txt
View File

@ -18,12 +18,12 @@ if(DEFINED ENV{TRAVIS_BUILD_WITH_COVERAGE})
set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE}) set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE})
endif() endif()
if(DEFINED ENV{BUILD_ID}) if(DEFINED ENV{MCSERVER_BUILD_ID})
set(BUILD_ID $ENV{BUILD_ID}) set(BUILD_ID $ENV{MCSERVER_BUILD_ID})
set(BUILD_SERIES_NAME $ENV{BUILD_SERIES_NAME}) set(BUILD_SERIES_NAME $ENV{MCSERVER_BUILD_SERIES_NAME})
set(BUILD_DATETIME $ENV{BUILD_DATETIME}) set(BUILD_DATETIME $ENV{MCSERVER_BUILD_DATETIME})
if(DEFINED ENV{BUILD_COMMIT_ID}) if(DEFINED ENV{MCSERVER_BUILD_COMMIT_ID})
set(BUILD_COMMIT_ID $ENV{BUILD_COMMIT_ID}) set(BUILD_COMMIT_ID $ENV{MCSERVER_BUILD_COMMIT_ID})
else() else()
message("Commit id not set, attempting to determine id from git") message("Commit id not set, attempting to determine id from git")
execute_process( execute_process(