mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
build-system: small changes to the iOS build script
This makes it marginally easier to deal with debug builds and release builds in parallel. The quick builds work most of the time, but not always. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
0a4689c2e6
commit
7801b0c28a
1 changed files with 20 additions and 9 deletions
|
@ -31,6 +31,10 @@ while [[ $# -gt 0 ]] ; do
|
|||
# build both debug and release for all devices
|
||||
DEBUGRELEASE="All"
|
||||
;;
|
||||
-quick)
|
||||
# don't rebuild googlemaps and kirigami
|
||||
QUICK="1"
|
||||
;;
|
||||
*)
|
||||
echo "Unknown command line argument $arg"
|
||||
;;
|
||||
|
@ -88,6 +92,8 @@ popd
|
|||
# get all 3rd part libraries
|
||||
"$SUBSURFACE_SOURCE"/scripts/get-dep-lib.sh ios "$PARENT_DIR"
|
||||
|
||||
if [ "$QUICK" != "1" ] ; then
|
||||
|
||||
for ARCH in $ARCHS; do
|
||||
|
||||
echo next building for $ARCH
|
||||
|
@ -258,21 +264,24 @@ fi
|
|||
popd
|
||||
|
||||
# build Kirigami
|
||||
mkdir -p "$PARENT_DIR"/kirigami-build
|
||||
pushd "$PARENT_DIR"/kirigami-build
|
||||
mkdir -p "$PARENT_DIR"/kirigami-release-build
|
||||
pushd "$PARENT_DIR"/kirigami-release-build
|
||||
"$IOS_QT"/"$QT_VERSION"/ios/bin/qmake "$SUBSURFACE_SOURCE"/mobile-widgets/3rdparty/kirigami/kirigami.pro CONFIG+=release
|
||||
make
|
||||
#make install
|
||||
if [ "$DEBUGRELEASE" != "Release" ] ; then
|
||||
"$IOS_QT"/"$QT_VERSION"/ios/bin/qmake "$SUBSURFACE_SOURCE"/mobile-widgets/3rdparty/kirigami/kirigami.pro CONFIG+=debug
|
||||
make clean
|
||||
make
|
||||
#make install
|
||||
fi
|
||||
# since the install prefix for qmake is rather weirdly implemented, let's copy things by hand into the multiarch destination
|
||||
mkdir -p "$INSTALL_ROOT"/../lib/qml/
|
||||
cp -a org "$INSTALL_ROOT"/../lib/qml/
|
||||
popd
|
||||
if [ "$DEBUGRELEASE" != "Release" ] ; then
|
||||
mkdir -p "$PARENT_DIR"/kirigami-debug-build
|
||||
pushd "$PARENT_DIR"/kirigami-debug-build
|
||||
"$IOS_QT"/"$QT_VERSION"/ios/bin/qmake "$SUBSURFACE_SOURCE"/mobile-widgets/3rdparty/kirigami/kirigami.pro CONFIG+=debug
|
||||
make
|
||||
# since the install prefix for qmake is rather weirdly implemented, let's copy things by hand into the multiarch destination
|
||||
mkdir -p "$INSTALL_ROOT"/../lib/qml/
|
||||
cp -a org "$INSTALL_ROOT"/../lib/qml/
|
||||
popd
|
||||
fi
|
||||
|
||||
# now combine the libraries into fat libraries
|
||||
ARCH_ROOT=$PARENT_DIR/install-root/ios
|
||||
|
@ -288,6 +297,8 @@ if [ "$TARGET" = "iphoneos" ] ; then
|
|||
popd
|
||||
fi
|
||||
|
||||
fi
|
||||
|
||||
pushd "$SUBSURFACE_SOURCE"/translations
|
||||
SRCS=$(ls ./*.ts | grep -v source)
|
||||
popd
|
||||
|
|
Loading…
Reference in a new issue