onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-14 00:49:09 +02:00
Code Issues Releases Wiki Activity

properly "stringizing" build number

Browse Source
This commit is contained in:
Vadim Kurland
2010-11-04 13:47:14 -07:00
parent 54244cb14c
commit 6735fbe781
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
qmake.inc.in
+1 -1
View File
@@ -89,7 +89,7 @@ exists(build_num) {
if (isEmpty(BUILD_NUM)) { if (isEmpty(BUILD_NUM)) {
GIT_BRANCH=$$system(git branch | grep '\\*' | cut -c3-) GIT_BRANCH=$$system(git branch | grep '\\*' | cut -c3-)
GIT_COMMIT=$$system(git show --abbrev-commit -1 --pretty=oneline --shortstat | head -1 | cut -c1-7) GIT_COMMIT=$$system(git show --abbrev-commit -1 --pretty=oneline --shortstat | head -1 | cut -c1-7)
BUILD_NUM="$$GIT_BRANCH:$$GIT_COMMIT" BUILD_NUM="\"$$GIT_BRANCH:$$GIT_COMMIT\""
} }
DEFINES += BUILD_NUM=$$BUILD_NUM DEFINES += BUILD_NUM=$$BUILD_NUM
src/common/init.cpp
+5 -1
View File
@@ -25,7 +25,11 @@ std::string sysfname;
std::string tempfname; std::string tempfname;
std::string argv0; std::string argv0;
std::string ee; std::string ee;
QString build_num = QString("").setNum(BUILD_NUM);
#define Str(x) #x
#define Xstr(x) Str(x)
QString build_num = Xstr(BUILD_NUM);
QString user_name; QString user_name;