aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2017-11-28 21:45:58 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-11-29 14:56:39 -0800
commit6d5144451d8d367d8fbe610247aff6bc8645f937 (patch)
tree54e955bc43845ea4c98dad5af427d555fd9fdec2 /packaging
parente8278becd2fdcd41d3e6c16902343efc88a1ed01 (diff)
downloadsubsurface-6d5144451d8d367d8fbe610247aff6bc8645f937.tar.gz
iOS build: only use annotated tags for version
This avoids picking the continuous tag. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/ios/build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh
index 3fff41d76..1e95a4d19 100644
--- a/packaging/ios/build.sh
+++ b/packaging/ios/build.sh
@@ -22,8 +22,8 @@ LIBUSB_VERSION=1.0.19
LIBFTDI_VERSION=1.2
# set up the Subsurface versions by hand
-GITVERSION=$(git describe --tags --abbrev=12)
-CANONICALVERSION=$(git describe --tags --abbrev=12 | sed -e 's/-g.*$// ; s/^v//' | sed -e 's/-/./')
+GITVERSION=$(git describe --abbrev=12)
+CANONICALVERSION=$(git describe --abbrev=12 | sed -e 's/-g.*$// ; s/^v//' | sed -e 's/-/./')
MOBILEVERSION=$(grep MOBILE ../../cmake/Modules/version.cmake | cut -d\" -f 2)
echo "#define GIT_VERSION_STRING \"$GITVERSION\"" > subsurface-mobile/ssrf-version.h
echo "#define CANONICAL_VERSION_STRING \"$CANONICALVERSION\"" >> subsurface-mobile/ssrf-version.h