diff --git a/CMakeLists.txt b/CMakeLists.txt index 2515fa31..e23a5729 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -227,7 +227,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) # Get the current commit SHA1 execute_process( - COMMAND git log -1 --format=%h + COMMAND git log -1 --format=%h --abbrev=7 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE GIT_SHA1 OUTPUT_STRIP_TRAILING_WHITESPACE @@ -241,7 +241,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW) OUTPUT_STRIP_TRAILING_WHITESPACE ) - SET(GIT_LIVE_REV_CMD "`cd '${PROJECT_SOURCE_DIR}' && git rev-list HEAD --count`.`cd '${PROJECT_SOURCE_DIR}' && git log -1 --format=%h`") + SET(GIT_LIVE_REV_CMD "`cd '${PROJECT_SOURCE_DIR}' && git rev-list HEAD --count`.`cd '${PROJECT_SOURCE_DIR}' && git log -1 --format=%h --abbrev=7`") MESSAGE(STATUS "Using GIT revision stamp: [${GIT_COMMIT_COUNT}.${GIT_SHA1}] CMD [${GIT_LIVE_REV_CMD}]") diff --git a/mk/linux/coverity-scan.sh b/mk/linux/coverity-scan.sh index 99edfe24..4f7cc179 100755 --- a/mk/linux/coverity-scan.sh +++ b/mk/linux/coverity-scan.sh @@ -45,7 +45,7 @@ fi # exit 1 GITBRANCH=$(git rev-parse --abbrev-ref HEAD | tr '/' '-') -GITVERSION_SHA1=$(git log -1 --format=%h) +GITVERSION_SHA1=$(git log -1 --format=%h --abbrev=7) GITVERSION_REV=$(git rev-list HEAD --count) VERSION=${GITBRANCH}.${GITVERSION_REV}.${GITVERSION_SHA1} diff --git a/mk/linux/make-binary-archive.sh b/mk/linux/make-binary-archive.sh index e8724ee7..af5d68d2 100755 --- a/mk/linux/make-binary-archive.sh +++ b/mk/linux/make-binary-archive.sh @@ -32,7 +32,7 @@ REPO_DATADIR="$REPODIR/data/glest_game" if [ -d "$REPODIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then cd "$REPODIR" if [ "$SOURCE_BRANCH" = "" ]; then SOURCE_BRANCH="$(git branch | awk -F '* ' '/^* / {print $2}')"; fi - SOURCE_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h)]")" + SOURCE_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h --abbrev=7)]")" fi ARCHIVE_TYPE="tar.xz" SNAPSHOTNAME="mg-binary-$kernel-$architecture" diff --git a/mk/linux/make-data-archive.sh b/mk/linux/make-data-archive.sh index 8035fe54..265a7a31 100755 --- a/mk/linux/make-data-archive.sh +++ b/mk/linux/make-data-archive.sh @@ -25,14 +25,14 @@ if [ -f "$REPO_DATADIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then DATA_BRANCH="$(git branch | grep '^* ' | awk '{print $2}')" # on macos are problems with more advanced using awk ^ DATA_COMMIT_NR="$(git rev-list HEAD --count)" - DATA_COMMIT="$(echo "[$DATA_COMMIT_NR.$(git log -1 --format=%h)]")" + DATA_COMMIT="$(echo "[$DATA_COMMIT_NR.$(git log -1 --format=%h --abbrev=7)]")" DATA_HASH=$(git log -1 --format=%H) fi if [ -d "$REPODIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then cd "$REPODIR" if [ "$SOURCE_BRANCH" = "" ]; then SOURCE_BRANCH="$(git branch | grep '^* ' | awk '{print $2}')"; fi # on macos are problems with more advanced using awk ^ - SOURCE_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h)]")" + SOURCE_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h --abbrev=7)]")" if [ "$DATA_HASH" = "" ]; then DATA_HASH=$(git submodule status "$REPO_DATADIR" | awk '{print $1}'); fi fi classic_snapshot_for_tests=0 diff --git a/mk/linux/mg-version-synch.sh b/mk/linux/mg-version-synch.sh index f352ae9a..1fbfd9f2 100755 --- a/mk/linux/mg-version-synch.sh +++ b/mk/linux/mg-version-synch.sh @@ -44,7 +44,7 @@ if [ "$modifymore" = "yes" ]; then fi if [ "$modifymore" = "yes" ] && [ "$(git status >/dev/null 2>&1; echo "$?")" -eq "0" ]; then # const string GIT_RawRev = "$4446.1a8673f$"; - GitCommitForRelease="`git rev-list HEAD --count`.`git log -1 --format=%h`"; + GitCommitForRelease="`git rev-list HEAD --count`.`git log -1 --format=%h --abbrev=7`"; echo 'GitCommitForRelease # before:' grep -E '^GitCommitForRelease = "[^"]*";$' "$VERSION_INFO_FILE" grep -E '^ const string GIT_RawRev = "\$[^"$]*\$";$' ../../source/glest_game/facilities/game_util.cpp diff --git a/mk/macos/make-binary-archive.sh b/mk/macos/make-binary-archive.sh index a594dc4f..a7fc79bc 100755 --- a/mk/macos/make-binary-archive.sh +++ b/mk/macos/make-binary-archive.sh @@ -31,7 +31,7 @@ if [ -d "$REPODIR/.git" ] && [ "$(which git 2>/dev/null)" != "" ]; then cd "$REPODIR" if [ "$SOURCE_BRANCH" = "" ]; then SOURCE_BRANCH="$(git branch | grep '^* ' | awk '{print $2}')"; fi # on macos are problems with more advanced using awk ^ - SOURCE_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h)]")" + SOURCE_COMMIT="$(echo "[$(git rev-list HEAD --count).$(git log -1 --format=%h --abbrev=7)]")" fi ARCHIVE_TYPE="tar.bz2" diff --git a/mk/windoze/build-mg-2010.bat b/mk/windoze/build-mg-2010.bat index e96e8fe3..5bcff9ae 100644 --- a/mk/windoze/build-mg-2010.bat +++ b/mk/windoze/build-mg-2010.bat @@ -84,7 +84,7 @@ git submodule update set GITVERSION_SHA1=. set GITVERSION_REV=. -set GET_GIT_SHA1="git log -1 --format=%%h" +set GET_GIT_SHA1="git log -1 --format=%%h --abbrev=7" for /f "delims=" %%a in ('%GET_GIT_SHA1%') do @set GITVERSION_SHA1=%%a for /f "delims=" %%a in ('git rev-list HEAD --count') do @set GITVERSION_REV=%%a ECHO Will build using GIT Revision: [%GITVERSION_REV%.%GITVERSION_SHA1%] diff --git a/mk/windoze/build-mg-2012.bat b/mk/windoze/build-mg-2012.bat index 25464c22..1bd489ce 100644 --- a/mk/windoze/build-mg-2012.bat +++ b/mk/windoze/build-mg-2012.bat @@ -108,7 +108,7 @@ git submodule update set GITVERSION_SHA1=. set GITVERSION_REV=. -set GET_GIT_SHA1="git log -1 --format=%%h" +set GET_GIT_SHA1="git log -1 --format=%%h --abbrev=7" for /f "delims=" %%a in ('%GET_GIT_SHA1%') do @set GITVERSION_SHA1=%%a for /f "delims=" %%a in ('git rev-list HEAD --count') do @set GITVERSION_REV=%%a ECHO Will build using GIT Revision: [%GITVERSION_REV%.%GITVERSION_SHA1%] diff --git a/mk/windoze/build-mg-2015.bat b/mk/windoze/build-mg-2015.bat index 2184f8a6..466d39e6 100644 --- a/mk/windoze/build-mg-2015.bat +++ b/mk/windoze/build-mg-2015.bat @@ -96,7 +96,7 @@ git submodule update set GITVERSION_SHA1=. set GITVERSION_REV=. -set GET_GIT_SHA1="git log -1 --format=%%h" +set GET_GIT_SHA1="git log -1 --format=%%h --abbrev=7" for /f "delims=" %%a in ('%GET_GIT_SHA1%') do @set GITVERSION_SHA1=%%a for /f "delims=" %%a in ('git rev-list HEAD --count') do @set GITVERSION_REV=%%a ECHO Will build using GIT Revision: [%GITVERSION_REV%.%GITVERSION_SHA1%] diff --git a/mk/windoze/build-mg32bit-2015.bat b/mk/windoze/build-mg32bit-2015.bat index db72675b..a0269a78 100644 --- a/mk/windoze/build-mg32bit-2015.bat +++ b/mk/windoze/build-mg32bit-2015.bat @@ -90,7 +90,7 @@ git submodule update set GITVERSION_SHA1=. set GITVERSION_REV=. -set GET_GIT_SHA1="git log -1 --format=%%h" +set GET_GIT_SHA1="git log -1 --format=%%h --abbrev=7" for /f "delims=" %%a in ('%GET_GIT_SHA1%') do @set GITVERSION_SHA1=%%a for /f "delims=" %%a in ('git rev-list HEAD --count') do @set GITVERSION_REV=%%a ECHO Will build using GIT Revision: [%GITVERSION_REV%.%GITVERSION_SHA1%] diff --git a/mk/windoze/coverity-scan.bat b/mk/windoze/coverity-scan.bat index 2fea6049..dc25bf94 100644 --- a/mk/windoze/coverity-scan.bat +++ b/mk/windoze/coverity-scan.bat @@ -59,7 +59,7 @@ rem pause set GITVERSION_SHA1=. set GITVERSION_REV=. -set GET_GIT_SHA1="git log -1 --format=%%h" +set GET_GIT_SHA1="git log -1 --format=%%h --abbrev=7" for /f "delims=" %%a in ('%GET_GIT_SHA1%') do @set GITVERSION_SHA1=%%a for /f "delims=" %%a in ('git rev-list HEAD --count') do @set GITVERSION_REV=%%a