summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTycho <work.tycho+git@gmail.com>2014-09-10 19:08:50 +0200
committerTycho <work.tycho+git@gmail.com>2014-09-10 19:08:50 +0200
commit4f67ca4c0ac2f3ea4090882d982670b94913c6b2 (patch)
tree09b1a9461b17fdeb63cacd9617439e23d87a93e2
parentMerge pull request #1413 from mc-server/versionInfo (diff)
downloadcuberite-4f67ca4c0ac2f3ea4090882d982670b94913c6b2.tar
cuberite-4f67ca4c0ac2f3ea4090882d982670b94913c6b2.tar.gz
cuberite-4f67ca4c0ac2f3ea4090882d982670b94913c6b2.tar.bz2
cuberite-4f67ca4c0ac2f3ea4090882d982670b94913c6b2.tar.lz
cuberite-4f67ca4c0ac2f3ea4090882d982670b94913c6b2.tar.xz
cuberite-4f67ca4c0ac2f3ea4090882d982670b94913c6b2.tar.zst
cuberite-4f67ca4c0ac2f3ea4090882d982670b94913c6b2.zip
Diffstat (limited to '')
-rwxr-xr-xCIbuild.sh6
-rw-r--r--CMakeLists.txt12
2 files changed, 9 insertions, 9 deletions
diff --git a/CIbuild.sh b/CIbuild.sh
index df023316e..5d95f88a6 100755
--- a/CIbuild.sh
+++ b/CIbuild.sh
@@ -2,9 +2,9 @@
set -e
-export BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE"
-export BUILD_ID=$TRAVIS_JOB_NUMBER
-export BUILD_DATETIME=`date`
+export MCSERVER_BUILD_SERIES_NAME="Travis $CC $TRAVIS_MCSERVER_BUILD_TYPE"
+export MCSERVER_BUILD_ID=$TRAVIS_JOB_NUMBER
+export MCSERVER_BUILD_DATETIME=`date`
cmake . -DBUILD_TOOLS=1 -DSELF_TEST=1;
make -j 2;
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f58f157a..188cf81e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,12 +18,12 @@ if(DEFINED ENV{TRAVIS_BUILD_WITH_COVERAGE})
set(BUILD_WITH_COVERAGE $ENV{TRAVIS_BUILD_WITH_COVERAGE})
endif()
-if(DEFINED ENV{BUILD_ID})
- set(BUILD_ID $ENV{BUILD_ID})
- set(BUILD_SERIES_NAME $ENV{BUILD_SERIES_NAME})
- set(BUILD_DATETIME $ENV{BUILD_DATETIME})
- if(DEFINED ENV{BUILD_COMMIT_ID})
- set(BUILD_COMMIT_ID $ENV{BUILD_COMMIT_ID})
+if(DEFINED ENV{MCSERVER_BUILD_ID})
+ 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})
else()
message("Commit id not set, attempting to determine id from git")
execute_process(