From b995ff56edb5a049e44b8c8b7dbc91f5c38aad97 Mon Sep 17 00:00:00 2001 From: Flow86 Date: Tue, 22 Aug 2017 11:20:32 +0200 Subject: [PATCH] FIX: forced version gets corrupted on creating a release --- Jenkinsfile | 4 ++-- release/create_release.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e6e2f43879..c853bdab77 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,7 +33,7 @@ def transformIntoStep(arch, wspwd) { PARAMS=create_nightly elif [ "${env.BRANCH_NAME}" == "stable" ] ; then PARAMS=create_stable - COMMANDS='&& rm -f build_version_defines.h.force && make updateversion && sed -i -e "s/WINDOW_VERSION \\\"[0-9]*\\\"/WINDOW_VERSION \\\"\$(cat ../.stable-version)\\\"/g" build_version_defines.h && touch build_version_defines.h.force' + COMMANDS='&& rm -f build_version_defines.h.force && make updateversion && sed -i -e "s/WINDOW_VERSION \\\"[0-9]*\\\"/WINDOW_VERSION \\\"\$(cat ../.stable-version)\\\"/g" build_version_defines.h && touch build_version_defines.h.force && cat build_version_defines.h' fi docker run --rm -u jenkins -v \$(pwd):/workdir \ -v ~/.ssh:/home/jenkins/.ssh \ @@ -41,7 +41,7 @@ def transformIntoStep(arch, wspwd) { \$VOLUMES \ --name "${env.BUILD_TAG}-${arch}" \ git.ra-doersch.de:5005/rttr/docker-precise:master -c \ - "cd build && ./cmake.sh --prefix=. \$BARCH -DENABLE_WERROR=ON -DRTTR_USE_STATIC_BOOST=ON -DRTTR_PREFIX= \$COMMANDS && make \$PARAMS" + "cd build && ./cmake.sh --prefix=. \$BARCH -DRTTR_ENABLE_WERROR=ON -DRTTR_USE_STATIC_BOOST=ON -DRTTR_PREFIX= \$COMMANDS && make \$PARAMS" EXIT=\$? echo "Exiting with error code \$EXIT" exit \$EXIT diff --git a/release/create_release.sh b/release/create_release.sh index ecfcc595a8..cb98fe9690 100755 --- a/release/create_release.sh +++ b/release/create_release.sh @@ -93,8 +93,16 @@ echo "Current version is: $VERSION-$REVISION" echo "Savegame version: $SAVEGAMEVERSION" unpackedPath=$ARCHNEWDIR/unpacked/s25rttr_$VERSION + +# save build version +cp -v build_version_defines.h build_version_defines.h.bak + # Install into this folder cmake . -DCMAKE_INSTALL_PREFIX="${unpackedPath}" || error + +# restore build version, so that it stays definitly the same +cp -v build_version_defines.h.bak build_version_defines.h + make install || error DESTDIR="${unpackedPath}" ./prepareRelease.sh if [ ! $? = 0 ]; then