mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

buils-system/iOS: change confusing variable name

Browse source 
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2020-02-08 14:40:37 -08:00
parent a7d1dbd013
commit 6fed3d6517
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
packaging/ios/build.sh
View file

@ -42,7 +42,7 @@ done
TOP=$(pwd) TOP=$(pwd)
SUBSURFACE_SOURCE=${TOP}/../../../subsurface SUBSURFACE_SOURCE=${TOP}/../../../subsurface
pushd ${SUBSURFACE_SOURCE}/.. pushd ${SUBSURFACE_SOURCE}/..
SSRF_CLONE=$(pwd) PARENT_DIR=$(pwd)
popd popd
# prepare build dir # prepare build dir
@ -87,13 +87,13 @@ popd
# now build all the dependencies for the three relevant architectures (x86_64 is for the simulator) # now build all the dependencies for the three relevant architectures (x86_64 is for the simulator)
# get all 3rd part libraries # get all 3rd part libraries
../../scripts/get-dep-lib.sh ios ${SSRF_CLONE} ../../scripts/get-dep-lib.sh ios ${PARENT_DIR}
for ARCH in $ARCHS; do for ARCH in $ARCHS; do
echo next building for $ARCH echo next building for $ARCH
INSTALL_ROOT=$SSRF_CLONE/install-root/ios/$ARCH INSTALL_ROOT=$PARENT_DIR/install-root/ios/$ARCH
mkdir -p $INSTALL_ROOT/lib $INSTALL_ROOT/bin $INSTALL_ROOT/include mkdir -p $INSTALL_ROOT/lib $INSTALL_ROOT/bin $INSTALL_ROOT/include
PKG_CONFIG_LIBDIR=$INSTALL_ROOT/lib/pkgconfig PKG_CONFIG_LIBDIR=$INSTALL_ROOT/lib/pkgconfig
@ -141,24 +141,24 @@ for ARCH in $ARCHS; do
hosttarget=$ARCH hosttarget=$ARCH
# libxslt have too old config.sub # libxslt have too old config.sub
pushd ${SSRF_CLONE}/libxslt pushd ${PARENT_DIR}/libxslt
autoreconf --install autoreconf --install
popd popd
if [ ! -e $PKG_CONFIG_LIBDIR/libxslt.pc ] ; then if [ ! -e $PKG_CONFIG_LIBDIR/libxslt.pc ] ; then
mkdir -p ${SSRF_CLONE}/libxslt/build-ios/$ARCH_NAME mkdir -p ${PARENT_DIR}/libxslt/build-ios/$ARCH_NAME
pushd ${SSRF_CLONE}/libxslt/build-ios/$ARCH_NAME pushd ${PARENT_DIR}/libxslt/build-ios/$ARCH_NAME
${SSRF_CLONE}/libxslt/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --without-python --without-crypto --enable-static --disable-shared ${PARENT_DIR}/libxslt/configure --host=${BUILDCHAIN} --prefix=${PREFIX} --without-python --without-crypto --enable-static --disable-shared
make make
make install make install
popd popd
fi fi
if [ ! -e $PKG_CONFIG_LIBDIR/libzip.pc ] ; then if [ ! -e $PKG_CONFIG_LIBDIR/libzip.pc ] ; then
pushd ${SSRF_CLONE}/libzip pushd ${PARENT_DIR}/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 ${SSRF_CLONE}/libzip/build-ios/$ARCH_NAME mkdir -p ${PARENT_DIR}/libzip/build-ios/$ARCH_NAME
pushd ${SSRF_CLONE}/libzip/build-ios/$ARCH_NAME pushd ${PARENT_DIR}/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} \
@ -166,7 +166,7 @@ for ARCH in $ARCHS; do
-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE \ -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE \
-DENABLE_OPENSSL=FALSE \ -DENABLE_OPENSSL=FALSE \
-DENABLE_GNUTLS=FALSE \ -DENABLE_GNUTLS=FALSE \
${SSRF_CLONE}/libzip ${PARENT_DIR}/libzip
# quiet the super noise warnings # quiet the super noise warnings
sed -i.bak 's/C_FLAGS = /C_FLAGS = -Wno-nullability-completeness -Wno-expansion-to-defined /' lib/CMakeFiles/zip.dir/flags.make sed -i.bak 's/C_FLAGS = /C_FLAGS = -Wno-nullability-completeness -Wno-expansion-to-defined /' lib/CMakeFiles/zip.dir/flags.make
make make
@ -176,15 +176,15 @@ for ARCH in $ARCHS; do
popd popd
fi fi
pushd ${SSRF_CLONE}/libgit2 pushd ${PARENT_DIR}/libgit2
# libgit2 with -Wall on iOS creates megabytes of warnings... # libgit2 with -Wall on iOS creates megabytes of warnings...
sed -i.bak 's/ADD_C_FLAG_IF_SUPPORTED(-W/# ADD_C_FLAG_IF_SUPPORTED(-W/' CMakeLists.txt sed -i.bak 's/ADD_C_FLAG_IF_SUPPORTED(-W/# ADD_C_FLAG_IF_SUPPORTED(-W/' CMakeLists.txt
popd popd
if [ ! -e $PKG_CONFIG_LIBDIR/libgit2.pc ] ; then if [ ! -e $PKG_CONFIG_LIBDIR/libgit2.pc ] ; then
mkdir -p ${SSRF_CLONE}/libgit2/build-ios/$ARCH mkdir -p ${PARENT_DIR}/libgit2/build-ios/$ARCH
pushd ${SSRF_CLONE}/libgit2/build-ios/$ARCH pushd ${PARENT_DIR}/libgit2/build-ios/$ARCH
cmake ${SSRF_CLONE}/libgit2 \ cmake ${PARENT_DIR}/libgit2 \
-G "Unix Makefiles" \ -G "Unix Makefiles" \
-DBUILD_SHARED_LIBS="OFF" \ -DBUILD_SHARED_LIBS="OFF" \
-DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN_FILE" \ -DCMAKE_TOOLCHAIN_FILE="$TOOLCHAIN_FILE" \
@ -194,7 +194,7 @@ for ARCH in $ARCHS; do
-DCMAKE_PREFIX_PATH=${PREFIX} \ -DCMAKE_PREFIX_PATH=${PREFIX} \
-DCURL=OFF \ -DCURL=OFF \
-DUSE_SSH=OFF \ -DUSE_SSH=OFF \
${SSRF_CLONE}/libgit2/ ${PARENT_DIR}/libgit2/
sed -i.bak 's/C_FLAGS = /C_FLAGS = -Wno-nullability-completeness -Wno-expansion-to-defined /' CMakeFiles/git2.dir/flags.make sed -i.bak 's/C_FLAGS = /C_FLAGS = -Wno-nullability-completeness -Wno-expansion-to-defined /' CMakeFiles/git2.dir/flags.make
make make
make install make install
@ -234,19 +234,19 @@ for ARCH in $ARCHS; do
done done
# build googlemaps # build googlemaps
mkdir -p ${SSRF_CLONE}/googlemaps/build-ios mkdir -p ${PARENT_DIR}/googlemaps/build-ios
pushd ${SSRF_CLONE}/googlemaps/build-ios pushd ${PARENT_DIR}/googlemaps/build-ios
${IOS_QT}/${QT_VERSION}/ios/bin/qmake ${SSRF_CLONE}/googlemaps/googlemaps.pro CONFIG+=release ${IOS_QT}/${QT_VERSION}/ios/bin/qmake ${PARENT_DIR}/googlemaps/googlemaps.pro CONFIG+=release
make make
if [ "$DEBUGRELEASE" != "Release" ] ; then if [ "$DEBUGRELEASE" != "Release" ] ; then
${IOS_QT}/${QT_VERSION}/ios/bin/qmake ${SSRF_CLONE}/googlemaps/googlemaps.pro CONFIG+=debug ${IOS_QT}/${QT_VERSION}/ios/bin/qmake ${PARENT_DIR}/googlemaps/googlemaps.pro CONFIG+=debug
make clean make clean
make make
fi fi
popd popd
# now combine the libraries into fat libraries # now combine the libraries into fat libraries
ARCH_ROOT=$SSRF_CLONE/install-root/ios ARCH_ROOT=$PARENT_DIR/install-root/ios
cp -a $ARCH_ROOT/x86_64/* $ARCH_ROOT cp -a $ARCH_ROOT/x86_64/* $ARCH_ROOT
if [ "$TARGET" = "iphoneos" ] ; then if [ "$TARGET" = "iphoneos" ] ; then
pushd $ARCH_ROOT/lib pushd $ARCH_ROOT/lib