diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-11 17:15:39 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-17 09:17:54 -0800 |
| commit | 55dc4451887d0f354502d8e7b248de4c7edb28c0 (patch) | |
| tree | 868f1bd38583785c8fa742ec63e39bbf1da3005f /packaging | |
| parent | 80b5e7990a5c4d1335e575732e2bdb7796589f72 (diff) | |
| download | subsurface-55dc4451887d0f354502d8e7b248de4c7edb28c0.tar.gz | |
build-system/iOS: create the build directory parallel to subsurface
This seems more consistent with how we do things elsewhere.
Also make sure that the ssrf-version.h file is created in the correct
directory.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging')
| -rwxr-xr-x | packaging/ios/build.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 119ca06ad..8b6c45400 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -60,9 +60,9 @@ fi GITVERSION=$(cd "$SUBSURFACE_SOURCE" ; git describe --abbrev=12) CANONICALVERSION=$(echo $GITVERSION | sed -e 's/-g.*$// ; s/^v//' | sed -e 's/-/./') MOBILEVERSION=$(grep MOBILE "$SUBSURFACE_SOURCE"/cmake/Modules/version.cmake | cut -d\" -f 2) -echo "#define GIT_VERSION_STRING \"$GITVERSION\"" > ssrf-version.h -echo "#define CANONICAL_VERSION_STRING \"$CANONICALVERSION\"" >> ssrf-version.h -echo "#define MOBILE_VERSION_STRING \"$MOBILEVERSION\"" >> ssrf-version.h +echo "#define GIT_VERSION_STRING \"$GITVERSION\"" > "$SUBSURFACE_SOURCE"/ssrf-version.h +echo "#define CANONICAL_VERSION_STRING \"$CANONICALVERSION\"" >> "$SUBSURFACE_SOURCE"/ssrf-version.h +echo "#define MOBILE_VERSION_STRING \"$MOBILEVERSION\"" >> "$SUBSURFACE_SOURCE"/ssrf-version.h BUNDLE=org.subsurface-divelog.subsurface-mobile if [ "${IOS_BUNDLE_PRODUCT_IDENTIFIER}" != "" ] ; then @@ -314,10 +314,12 @@ for BUILD_NOW in $BUILD_LOOP; do else DRCONFIG="release" fi + cd "$PARENT_DIR" BUILDX=build-Subsurface-mobile-Qt_$(echo "$QT_VERSION" | tr . _)_for_iOS-"$BUILD_NOW" mkdir -p "$BUILDX" pushd "$BUILDX" - ln -s ../ssrf-version.h . + rm -f ssrf-version.h + ln -s "$SUBSURFACE_SOURCE"/ssrf-version.h . "$IOS_QT"/"$QT_VERSION"/ios/bin/qmake "$SUBSURFACE_SOURCE"/Subsurface-mobile.pro \ -spec macx-ios-clang CONFIG+=$TARGET CONFIG+=$TARGET2 CONFIG+=$DRCONFIG |