build-system/iOS: remove outdated build-ios directories

The places we build things are still rather inconsistent for historic reasons -
this definitely deserves some more cleaning up.
The top level build-ios dir was completely unused, and the build location for
the googlemaps plugin was inconsistent with all of the other build dirs.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-12-16 16:39:30 -08:00
parent 856a0d36f5
commit e3a83dcc90
2 changed files with 3 additions and 6 deletions

View file

@ -373,7 +373,7 @@ ios {
../install-root/ios/lib/libzip.a \
../install-root/ios/lib/libxslt.a \
../install-root/ios/lib/qml/org/kde/kirigami.2/libkirigamiplugin.a \
../googlemaps/build-ios/libqtgeoservices_googlemaps.a \
../googlemaps-build/libqtgeoservices_googlemaps.a \
-liconv \
-lsqlite3 \
-lxml2

View file

@ -45,9 +45,6 @@ cd ..
export PARENT_DIR=$PWD
popd
# prepare build dir
mkdir -p build-ios
IOS_QT=~/Qt
QT_VERSION=$(cd "$IOS_QT"; ls -d [1-9]* | awk -F. '{ printf("%02d.%02d.%02d\n", $1,$2,$3); }' | sort -n | tail -1 | sed -e 's/\.0/\./g;s/^0//')
@ -249,8 +246,8 @@ for ARCH in $ARCHS; do
done
# build googlemaps
mkdir -p "$PARENT_DIR"/googlemaps/build-ios
pushd "$PARENT_DIR"/googlemaps/build-ios
mkdir -p "$PARENT_DIR"/googlemaps-build
pushd "$PARENT_DIR"/googlemaps-build
"$IOS_QT"/"$QT_VERSION"/ios/bin/qmake "$PARENT_DIR"/googlemaps/googlemaps.pro CONFIG+=release
make
if [ "$DEBUGRELEASE" != "Release" ] ; then