diff options
| author |  jan Iversen <jani@libreoffice.org> | 2018-05-20 12:57:14 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-05-20 11:35:28 -0700 |
| commit | d7e31ebbcd2966ed31e0fe371e1362a6296d619d (patch) | |
| tree | 96e89b808ae255a046dbfbc266c69d5ce4c538cf /packaging/ios/build.sh | |
| parent | 16555e663b811c0fa5d273570025d70d2640146d (diff) | |
| download | subsurface-d7e31ebbcd2966ed31e0fe371e1362a6296d619d.tar.gz | |
iOS: get rid of ios/Subsurface-mobile
Having a split between ios and ios/Subsurface-mobile is just confusing
and without a practical reason
Move files from ios/Subsurface-mobile to ios and update .gitignore
Signed-off-by: Jan Iversen <jani@apache.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'packaging/ios/build.sh')
| -rwxr-xr-x | packaging/ios/build.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/packaging/ios/build.sh b/packaging/ios/build.sh index 17471efa3..195bfeaf9 100755 --- a/packaging/ios/build.sh +++ b/packaging/ios/build.sh @@ -47,9 +47,9 @@ fi 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 -echo "#define MOBILE_VERSION_STRING \"$MOBILEVERSION\"" >> subsurface-mobile/ssrf-version.h +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 BUNDLE=org.subsurface-divelog.subsurface-mobile if [ "${IOS_BUNDLE_PRODUCT_IDENTIFIER}" != "" ] ; then @@ -226,19 +226,17 @@ fi pushd ${SUBSURFACE_SOURCE}/translations SRCS=$(ls *.ts | grep -v source) popd -pushd Subsurface-mobile mkdir -p translations for src in $SRCS; do ${IOS_QT}/${QT_VERSION}/ios/bin/lrelease ${SUBSURFACE_SOURCE}/translations/$src -qm translations/${src/.ts/.qm} done -popd # in order to be able to use xcode without going through Qt Creator # call qmake directly mkdir -p build-Subsurface-mobile-Qt_$(echo ${QT_VERSION} | tr . _)_for_iOS-${DEBUGRELEASE} cd build-Subsurface-mobile-Qt_$(echo ${QT_VERSION} | tr . _)_for_iOS-${DEBUGRELEASE} -${IOS_QT}/${QT_VERSION}/ios/bin/qmake ../Subsurface-mobile/Subsurface-mobile.pro \ +${IOS_QT}/${QT_VERSION}/ios/bin/qmake ../Subsurface-mobile.pro \ -spec macx-ios-clang CONFIG+=$TARGET CONFIG+=$TARGET2 CONFIG+=$DRCONFIG make qmake_all |