From 9533ecbf198c89379148a3690c6f3c00c35fb4c1 Mon Sep 17 00:00:00 2001 From: woblight Date: Sun, 22 Jul 2018 17:22:16 +0200 Subject: [PATCH] describe: always add commit hash --- CI.mk | 2 +- GitAddonsManager.pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CI.mk b/CI.mk index a99f330..301ebf6 100644 --- a/CI.mk +++ b/CI.mk @@ -99,7 +99,7 @@ quazip/build/release/quazip.dll: quazip/quazip.pro $(wine) mingw32-make -C quazip/build build_win32/GitAddonsManager.exe: Qt libgit2-0.27.2/build/libgit2.dll zlib/build/libzlib.dll quazip/build/release/quazip.dll - mkdir -p build_win32 && cd build_win32 && $(qmake) $(qmake_opts) ../GitAddonsManager.pro GIT_DESCRIBE="$(shell git describe --tags)" DEFINES+='GAM_BUILD_NAME=\\\"Win32\\\"' + mkdir -p build_win32 && cd build_win32 && $(qmake) $(qmake_opts) ../GitAddonsManager.pro GIT_DESCRIBE="$(shell git describe --tags --long)" DEFINES+='GAM_BUILD_NAME=\\\"Win32\\\"' $(wine) mingw32-make -C build_win32 winbuild: build_win32/GitAddonsManager.exe diff --git a/GitAddonsManager.pro b/GitAddonsManager.pro index 0d22a8a..849516a 100644 --- a/GitAddonsManager.pro +++ b/GitAddonsManager.pro @@ -41,7 +41,7 @@ win32 { } isEmpty(GIT_DESCRIBE){ - GIT_DESCRIBE = $$system(git describe --tags) + GIT_DESCRIBE = $$system(git describe --tags --long) } isEmpty(GIT_DESCRIBE){ message("WARNING: empty git describe")