mirror of
https://github.com/fwbuilder/fwbuilder
synced 2026-09-10 23:22:33 +02:00
deleted file build_num; will be adding this file when we produce source tar ball; if the file is missing, will use git branch and last commit in place of the build number
This commit is contained in:
@@ -83,4 +83,15 @@ exists(qmake2.inc) {
|
|||||||
include(qmake2.inc)
|
include(qmake2.inc)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
exists(build_num) {
|
||||||
|
include(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"
|
||||||
|
}
|
||||||
|
|
||||||
|
DEFINES += BUILD_NUM=$$BUILD_NUM
|
||||||
|
|
||||||
INSTALLS += target
|
INSTALLS += target
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
|
|
||||||
|
|
||||||
#include "../../config.h"
|
#include "../../config.h"
|
||||||
#include "../../build_num"
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ INSTALLS -= target
|
|||||||
# control whether we build debug or release in ../../qmake.inc
|
# control whether we build debug or release in ../../qmake.inc
|
||||||
# CONFIG += precompile_header
|
# CONFIG += precompile_header
|
||||||
HEADERS += ../../config.h \
|
HEADERS += ../../config.h \
|
||||||
../../build_num \
|
|
||||||
events.h \
|
events.h \
|
||||||
FWWindow.h \
|
FWWindow.h \
|
||||||
ProjectPanel.h \
|
ProjectPanel.h \
|
||||||
|
|||||||
Reference in New Issue
Block a user