From 6d5144451d8d367d8fbe610247aff6bc8645f937 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 28 Nov 2017 21:45:58 -0800 Subject: iOS build: only use annotated tags for version This avoids picking the continuous tag. Signed-off-by: Dirk Hohndel --- packaging/ios/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packaging/ios/build.sh') 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 -- cgit v1.2.3-70-g09d2