mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: iOS, change location of 3rd party builds

Browse source 
move location of 3rd build to follow same pattern as desktop/mobile build

update central .gitignore to silence libdivecomputer/build-ios, this should
really be in libdivecomputer, but it is more easy to put it in a subsurface
controlled file.

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2019-12-17 11:47:21 +01:00 committed by Dirk Hohndel
parent fa8c7ecc58
commit 7eddaeea21
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packaging/ios/Subsurface-mobile.pro
View file

@ -136,7 +136,7 @@ LIBS += ../../../../install-root/ios/lib/libdivecomputer.a \
../../../../install-root/ios/lib/libgit2.a \ ../../../../install-root/ios/lib/libgit2.a \
../../../../install-root/ios/lib/libzip.a \ ../../../../install-root/ios/lib/libzip.a \
../../../../install-root/ios/lib/libxslt.a \ ../../../../install-root/ios/lib/libxslt.a \
../build-ios/googlemaps-build/libqtgeoservices_googlemaps.a \ ../../../../googlemaps/build-ios/libqtgeoservices_googlemaps.a \
-liconv \ -liconv \
-lsqlite3 \ -lsqlite3 \
-lxml2 -lxml2

30
packaging/ios/build.sh
View file

@ -145,8 +145,8 @@ for ARCH in $ARCHS; do
autoreconf --install autoreconf --install
popd popd
if [ ! -e $PKG_CONFIG_LIBDIR/libxslt.pc ] ; then if [ ! -e $PKG_CONFIG_LIBDIR/libxslt.pc ] ; then
mkdir -p build-ios/libxslt-build-$ARCH_NAME mkdir -p ${SSRF_CLONE}/libxslt/build-ios/$ARCH_NAME
pushd build-ios/libxslt-build-$ARCH_NAME pushd ${SSRF_CLONE}/libxslt/build-ios/$ARCH_NAME
${SSRF_CLONE}/libxslt/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --without-python --without-crypto --enable-static --disable-shared ${SSRF_CLONE}/libxslt/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --without-python --without-crypto --enable-static --disable-shared
make make
make install make install
@ -157,8 +157,8 @@ for ARCH in $ARCHS; do
pushd ${SSRF_CLONE}/libzip pushd ${SSRF_CLONE}/libzip
# don't waste time on building command line tools, examples, manual, and regression tests - and don't build the BZIP2 support we don't need # don't waste time on building command line tools, examples, manual, and regression tests - and don't build the BZIP2 support we don't need
sed -i.bak 's/ADD_SUBDIRECTORY(src)//;s/ADD_SUBDIRECTORY(examples)//;s/ADD_SUBDIRECTORY(man)//;s/ADD_SUBDIRECTORY(regress)//' CMakeLists.txt sed -i.bak 's/ADD_SUBDIRECTORY(src)//;s/ADD_SUBDIRECTORY(examples)//;s/ADD_SUBDIRECTORY(man)//;s/ADD_SUBDIRECTORY(regress)//' CMakeLists.txt
mkdir -p build-ios/libzip-build-$ARCH_NAME mkdir -p ${SSRF_CLONE}/libzip/build-ios/$ARCH_NAME
pushd build-ios/libzip-build-$ARCH_NAME pushd ${SSRF_CLONE}/libzip/build-ios/$ARCH_NAME
cmake -DBUILD_SHARED_LIBS="OFF" \ cmake -DBUILD_SHARED_LIBS="OFF" \
-DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN_FILE" \ -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN_FILE" \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \ -DCMAKE_INSTALL_PREFIX=${PREFIX} \
@ -182,8 +182,8 @@ for ARCH in $ARCHS; do
popd popd
if [ ! -e $PKG_CONFIG_LIBDIR/libgit2.pc ] ; then if [ ! -e $PKG_CONFIG_LIBDIR/libgit2.pc ] ; then
mkdir -p build-ios/libgit2-build-$ARCH mkdir -p ${SSRF_CLONE}/libgit2/build-ios/$ARCH
pushd build-ios/libgit2-build-$ARCH pushd ${SSRF_CLONE}/libgit2/build-ios/$ARCH
cmake ${SSRF_CLONE}/libgit2 \ cmake ${SSRF_CLONE}/libgit2 \
-G "Unix Makefiles" \ -G "Unix Makefiles" \
-DBUILD_SHARED_LIBS="OFF" \ -DBUILD_SHARED_LIBS="OFF" \
@ -216,16 +216,16 @@ for ARCH in $ARCHS; do
autoreconf --install autoreconf --install
popd popd
fi fi
if [ ! -f build-ios/libdivecomputer-${ARCH}.SHA ] ; then mkdir -p ../../libdivecomputer/build-ios/$ARCH
echo "" > build-ios/libdivecomputer-${ARCH}.SHA if [ ! -f ../../libdivecomputer/build-ios/${ARCH}/git.SHA ] ; then
echo "" > ../../libdivecomputer/build-ios/${ARCH}/git.SHA
fi fi
CURRENT_SHA=$(cd ../../libdivecomputer ; git describe) CURRENT_SHA=$(cd ../../libdivecomputer ; git describe)
PREVIOUS_SHA=$(cat build-ios/libdivecomputer-${ARCH}.SHA) PREVIOUS_SHA=$(cat ../../libdivecomputer/build-ios/${ARCH}/git.SHA)
if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] ; then if [ ! "$CURRENT_SHA" = "$PREVIOUS_SHA" ] ; then
echo $CURRENT_SHA > build-ios/libdivecomputer-${ARCH}.SHA echo $CURRENT_SHA > ../../libdivecomputer/build-ios/${ARCH}/git.SHA
mkdir -p build-ios/libdivecomputer-build-$ARCH pushd ../../libdivecomputer/build-ios/$ARCH
pushd build-ios/libdivecomputer-build-$ARCH ../../configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared --enable-examples=no --without-libusb --without-hidapi --enable-ble
../../../../libdivecomputer/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --enable-static --disable-shared --enable-examples=no --without-libusb --without-hidapi --enable-ble
make make
make install make install
popd popd
@ -234,8 +234,8 @@ for ARCH in $ARCHS; do
done done
# build googlemaps # build googlemaps
mkdir -p build-ios/googlemaps-build mkdir -p ${SSRF_CLONE}/googlemaps/build-ios
pushd build-ios/googlemaps-build pushd ${SSRF_CLONE}/googlemaps/build-ios
${IOS_QT}/${QT_VERSION}/ios/bin/qmake ${SSRF_CLONE}/googlemaps/googlemaps.pro CONFIG+=release ${IOS_QT}/${QT_VERSION}/ios/bin/qmake ${SSRF_CLONE}/googlemaps/googlemaps.pro CONFIG+=release
make make
if [ "$DEBUGRELEASE" != "Release" ] ; then if [ "$DEBUGRELEASE" != "Release" ] ; then