|
|
|
@ -188,13 +188,18 @@ exists ($$PWD/.git) {
@@ -188,13 +188,18 @@ exists ($$PWD/.git) {
|
|
|
|
|
} else { |
|
|
|
|
# development version "Development branch:sha date" |
|
|
|
|
GIT_VERSION = "Development $${GIT_BRANCH}:$${GIT_HASH} $${GIT_TIME}" |
|
|
|
|
VERSION = 0.0.0 |
|
|
|
|
VERSION = 0.0.0 |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
MacBuild { |
|
|
|
|
MAC_VERSION = $$section(VERSION, ".", 0, 2) |
|
|
|
|
MAC_BUILD = $$section(VERSION, ".", 3, 3) |
|
|
|
|
message(QGroundControl version $${MAC_VERSION} build $${MAC_BUILD} describe $${GIT_VERSION}) |
|
|
|
|
} AndroidBuild { |
|
|
|
|
ANDROID_VERSION_NAME = $${GIT_VERSION} |
|
|
|
|
ANDROID_VERSION_CODE = $$split(VERSION, .) |
|
|
|
|
ANDROID_VERSION_CODE = $$system(echo $((100000*$$member(ANDROID_VERSION_CODE, 0)+10000*$$member(ANDROID_VERSION_CODE, 1)+1000*$$member(ANDROID_VERSION_CODE, 2)))) |
|
|
|
|
message(QGroundControl ANDROID_VERSION_NAME \'$${ANDROID_VERSION_NAME}\' ANDROID_VERSION_CODE \'$${ANDROID_VERSION_CODE}\') |
|
|
|
|
} else { |
|
|
|
|
message(QGroundControl $${GIT_VERSION}) |
|
|
|
|
} |
|
|
|
|