mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-09-10 23:22:33 +02:00
properly "stringizing" build number
This commit is contained in:
+1
-1
@@ -89,7 +89,7 @@ exists(build_num) {
|
||||
if (isEmpty(BUILD_NUM)) {
|
||||
GIT_BRANCH=$$system(git branch | grep '\\*' | cut -c3-)
|
||||
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
|
||||
|
||||
+5
-1
@@ -25,7 +25,11 @@ std::string sysfname;
|
||||
std::string tempfname;
|
||||
std::string argv0;
|
||||
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;
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user