Use full version for Mac dmg file

Only tagged releases should get the short version number.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-10-14 22:39:29 -07:00
parent 640f2067d5
commit 9dbf5a6daa
2 changed files with 3 additions and 1 deletions

View file

@ -6,6 +6,7 @@ win32: VER_OS = win
exists(.git/HEAD): {
GIT_HEAD = .git/HEAD
VERSION_SCRIPT = $$PWD/scripts/get-version
FULL_VERSION = $$system("$$VERSION_SCRIPT $$VER_OS")
version_h.depends = $$VERSION_SCRIPT
version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`$$VERSION_SCRIPT $$VER_OS`\\\" > ${QMAKE_FILE_OUT}
version_h.input = GIT_HEAD
@ -15,5 +16,6 @@ exists(.git/HEAD): {
QMAKE_EXTRA_COMPILERS += version_h
} else {
# This is probably a package
FULL_VERSION = $$VERSION
system(echo \\$${LITERAL_HASH}define VERSION_STRING \\\"$$VERSION\\\" > $$VERSION_FILE)
}

View file

@ -33,7 +33,7 @@ mac {
mac_dmg.target = mac-create-dmg
mac_dmg.commands = $$mac_deploy.commands -dmg
mac_dmg.commands += $${nltab}$(MOVE) $${TARGET}.dmg $${TARGET}-$${VERSION}.dmg
mac_dmg.commands += $${nltab}$(MOVE) $${TARGET}.dmg $${TARGET}-$${FULL_VERSION}.dmg
QMAKE_EXTRA_TARGETS += mac_deploy mac_dmg
} else: win32 {
# Windows bundling rules