From 8a6728eb085576afad215d42ccdfefae1c9c3db0 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 6 Mar 2016 11:12:27 -0800 Subject: Revert "iOS build: add the pri file for generating the version" This reverts commit 7fac2a38b2c5a744e1292b37dc0e1e71d3fcf333. Oops, that should have been dropped in the rebase before pushing the changes. I did this instead in commit 99d1d8876eb4 ("iOS build: create ssrf-version.h by hand") --- .../ios/subsurface-ios/subsurface-gen-version.pri | 34 ---------------------- 1 file changed, 34 deletions(-) delete mode 100644 packaging/ios/subsurface-ios/subsurface-gen-version.pri (limited to 'packaging/ios') diff --git a/packaging/ios/subsurface-ios/subsurface-gen-version.pri b/packaging/ios/subsurface-ios/subsurface-gen-version.pri deleted file mode 100644 index c6192f2a7..000000000 --- a/packaging/ios/subsurface-ios/subsurface-gen-version.pri +++ /dev/null @@ -1,34 +0,0 @@ -# Generate the ssrf-version.h file -VERSION_FILE = ssrf-version.h -macx: VER_OS = darwin -unix: !macx: VER_OS = linux -win32: VER_OS = win -exists(.git/HEAD): { - win32: SET_GIT_DIR = set GIT_DIR - else: SET_GIT_DIR = GIT_DIR - GIT_HEAD = .git/HEAD - VERSION_SCRIPT = $$PWD/scripts/get-version - # always use linux here -------------------vvv so we get the true full version - FULL_VERSION = "`$$VERSION_SCRIPT linux`" - VERSION = $$system("sh scripts/get-version full || echo $${VERSION}") - PRODVERSION_STRING = $$system("sh scripts/get-version win $$FULL_VERSION || echo $${VERSION}.0.0-git") - VERSION_STRING = $$system("sh scripts/get-version linux $$FULL_VERSION || echo $${VERSION}-git") - version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("$$SET_GIT_DIR=$$PWD/.git git rev-parse --symbolic-full-name HEAD") - version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT $$VER_OS || echo $$VERSION-git`\\\" > ${QMAKE_FILE_OUT} - version_h.input = GIT_HEAD - version_h.output = $$VERSION_FILE - version_h.variable_out = GENERATED_FILES - version_h.CONFIG = ignore_no_exist - QMAKE_EXTRA_COMPILERS += version_h -} else { - # This is probably a package - exists(.gitversion): { - FULL_VERSION = $$system("cat .gitversion") - } else { - FULL_VERSION = $$VERSION - } - system(echo \\$${LITERAL_HASH}define GIT_VERSION_STRING \\\"$$FULL_VERSION\\\" > $$VERSION_FILE) - system(echo \\$${LITERAL_HASH}define CANONICAL_VERSION_STRING \\\"$$FULL_VERSION\\\" >> $$VERSION_FILE) - - QMAKE_CLEAN += $$VERSION_FILE -} -- cgit v1.2.3-70-g09d2