diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-14 22:39:29 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-10-14 22:39:29 -0700 |
| commit | 9dbf5a6daa49d954e9f185e23822a7c598e3b7ce (patch) | |
| tree | 7116698e8afbd68269eee1eca372371f10af10f7 | |
| parent | 640f2067d5dcc99064734951cce7f5d86e020781 (diff) | |
| download | subsurface-9dbf5a6daa49d954e9f185e23822a7c598e3b7ce.tar.gz | |
Use full version for Mac dmg file
Only tagged releases should get the short version number.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | subsurface-gen-version.pri | 2 | ||||
| -rw-r--r-- | subsurface-install.pri | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/subsurface-gen-version.pri b/subsurface-gen-version.pri index aaef383ac..78e230ea6 100644 --- a/subsurface-gen-version.pri +++ b/subsurface-gen-version.pri @@ -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) } diff --git a/subsurface-install.pri b/subsurface-install.pri index 38b344387..26bffaca7 100644 --- a/subsurface-install.pri +++ b/subsurface-install.pri @@ -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 |