mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Android: whitespace change to build.sh
This indents the code that is only executed when we aren't in 'quick' mode. git show -w will show that there is no code change in this commit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel
parent
35ffd5f71e
commit
289e1cc37e
1 changed files with 162 additions and 162 deletions
|
|
@ -166,15 +166,15 @@ $QMAKE -query
|
||||||
|
|
||||||
if [ "$QUICK" = "" ] ; then
|
if [ "$QUICK" = "" ] ; then
|
||||||
|
|
||||||
# don't adjust indentation to make this a more reasonable commit
|
# don't adjust indentation to make this a more reasonable commit
|
||||||
# build google maps plugin
|
# build google maps plugin
|
||||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . googlemaps
|
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . googlemaps
|
||||||
# find qmake
|
# find qmake
|
||||||
QMAKE=$QT5_ANDROID/android_armv7/bin/qmake
|
QMAKE=$QT5_ANDROID/android_armv7/bin/qmake
|
||||||
$QMAKE -query
|
$QMAKE -query
|
||||||
QT_PLUGINS_PATH=$($QMAKE -query QT_INSTALL_PLUGINS)
|
QT_PLUGINS_PATH=$($QMAKE -query QT_INSTALL_PLUGINS)
|
||||||
GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.so
|
GOOGLEMAPS_BIN=libqtgeoservices_googlemaps.so
|
||||||
if [ ! -e "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] || [ googlemaps/.git/HEAD -nt "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] ; then
|
if [ ! -e "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] || [ googlemaps/.git/HEAD -nt "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] ; then
|
||||||
mkdir -p googlemaps-build-"$ARCH"
|
mkdir -p googlemaps-build-"$ARCH"
|
||||||
pushd googlemaps-build-"$ARCH"
|
pushd googlemaps-build-"$ARCH"
|
||||||
$QMAKE ../googlemaps/googlemaps.pro
|
$QMAKE ../googlemaps/googlemaps.pro
|
||||||
|
|
@ -185,25 +185,25 @@ if [ ! -e "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] || [ googlemaps/.git/
|
||||||
make -j4
|
make -j4
|
||||||
$QMAKE -install qinstall -exe $GOOGLEMAPS_BIN "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN
|
$QMAKE -install qinstall -exe $GOOGLEMAPS_BIN "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . sqlite
|
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . sqlite
|
||||||
if [ ! -e "$PKG_CONFIG_LIBDIR/sqlite3.pc" ] ; then
|
if [ ! -e "$PKG_CONFIG_LIBDIR/sqlite3.pc" ] ; then
|
||||||
mkdir -p sqlite-build-"$ARCH"
|
mkdir -p sqlite-build-"$ARCH"
|
||||||
pushd sqlite-build-"$ARCH"
|
pushd sqlite-build-"$ARCH"
|
||||||
../sqlite/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --enable-static --disable-shared
|
../sqlite/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --enable-static --disable-shared
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libxml2
|
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libxml2
|
||||||
if [ ! -e libxml2/configure ] ; then
|
if [ ! -e libxml2/configure ] ; then
|
||||||
pushd libxml2
|
pushd libxml2
|
||||||
autoreconf --install
|
autoreconf --install
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
if [ ! -e "$PKG_CONFIG_LIBDIR/libxml-2.0.pc" ] ; then
|
if [ ! -e "$PKG_CONFIG_LIBDIR/libxml-2.0.pc" ] ; then
|
||||||
mkdir -p libxml2-build-"$ARCH"
|
mkdir -p libxml2-build-"$ARCH"
|
||||||
pushd libxml2-build-"$ARCH"
|
pushd libxml2-build-"$ARCH"
|
||||||
../libxml2/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --without-python --without-iconv --enable-static --disable-shared
|
../libxml2/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --without-python --without-iconv --enable-static --disable-shared
|
||||||
|
|
@ -212,25 +212,25 @@ if [ ! -e "$PKG_CONFIG_LIBDIR/libxml-2.0.pc" ] ; then
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libxslt
|
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libxslt
|
||||||
if [ ! -e libxslt/configure ] ; then
|
if [ ! -e libxslt/configure ] ; then
|
||||||
pushd libxslt
|
pushd libxslt
|
||||||
autoreconf --install
|
autoreconf --install
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
if [ ! -e "$PKG_CONFIG_LIBDIR/libxslt.pc" ] ; then
|
if [ ! -e "$PKG_CONFIG_LIBDIR/libxslt.pc" ] ; then
|
||||||
mkdir -p libxslt-build-"$ARCH"
|
mkdir -p libxslt-build-"$ARCH"
|
||||||
pushd libxslt-build-"$ARCH"
|
pushd libxslt-build-"$ARCH"
|
||||||
../libxslt/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --with-libxml-prefix="$PREFIX" --without-python --without-crypto --enable-static --disable-shared
|
../libxslt/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --with-libxml-prefix="$PREFIX" --without-python --without-crypto --enable-static --disable-shared
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip
|
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libzip
|
||||||
if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then
|
if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then
|
||||||
# libzip expects a predefined macro that isn't there for our compiler
|
# libzip expects a predefined macro that isn't there for our compiler
|
||||||
pushd libzip
|
pushd libzip
|
||||||
git reset --hard
|
git reset --hard
|
||||||
|
|
@ -249,13 +249,13 @@ if [ ! -e "$PKG_CONFIG_LIBDIR/libzip.pc" ] ; then
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . openssl
|
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . openssl
|
||||||
if [ ! -e openssl-build-"$ARCH" ] ; then
|
if [ ! -e openssl-build-"$ARCH" ] ; then
|
||||||
mv openssl openssl-build-"$ARCH"
|
mv openssl openssl-build-"$ARCH"
|
||||||
fi
|
fi
|
||||||
if [ ! -e "$PKG_CONFIG_LIBDIR/libssl.pc" ] ; then
|
if [ ! -e "$PKG_CONFIG_LIBDIR/libssl.pc" ] ; then
|
||||||
pushd openssl-build-"$ARCH"
|
pushd openssl-build-"$ARCH"
|
||||||
perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org
|
perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org
|
||||||
# Use env to make all these temporary, so they don't pollute later builds.
|
# Use env to make all these temporary, so they don't pollute later builds.
|
||||||
|
|
@ -266,17 +266,17 @@ if [ ! -e "$PKG_CONFIG_LIBDIR/libssl.pc" ] ; then
|
||||||
CC=gcc \
|
CC=gcc \
|
||||||
ANDROID_DEV="$PREFIX" \
|
ANDROID_DEV="$PREFIX" \
|
||||||
bash -x ./config shared no-ssl2 no-ssl3 no-comp no-hw no-engine --openssldir="$PREFIX"
|
bash -x ./config shared no-ssl2 no-ssl3 no-comp no-hw no-engine --openssldir="$PREFIX"
|
||||||
# sed -i.bak -e 's/soname=\$\$SHLIB\$\$SHLIB_SOVER\$\$SHLIB_SUFFIX/soname=\$\$SHLIB/g' Makefile.shared
|
# sed -i.bak -e 's/soname=\$\$SHLIB\$\$SHLIB_SOVER\$\$SHLIB_SUFFIX/soname=\$\$SHLIB/g' Makefile.shared
|
||||||
make depend
|
make depend
|
||||||
make
|
make
|
||||||
# now fix the reference to libcrypto.so.1.0.0 to be just to libcrypto.so
|
# now fix the reference to libcrypto.so.1.0.0 to be just to libcrypto.so
|
||||||
perl -pi -e 's/libcrypto.so.1.0.0/libcrypto.so\x00\x00\x00\x00\x00\x00/' libssl.so.1.0.0
|
perl -pi -e 's/libcrypto.so.1.0.0/libcrypto.so\x00\x00\x00\x00\x00\x00/' libssl.so.1.0.0
|
||||||
make install_sw
|
make install_sw
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libgit2
|
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libgit2
|
||||||
if [ ! -e "$PKG_CONFIG_LIBDIR/libgit2.pc" ] ; then
|
if [ ! -e "$PKG_CONFIG_LIBDIR/libgit2.pc" ] ; then
|
||||||
# We don't want to find the HTTP_Parser package of the build host by mistake
|
# We don't want to find the HTTP_Parser package of the build host by mistake
|
||||||
perl -pi -e 's/FIND_PACKAGE\(HTTP_Parser\)/#FIND_PACKAGE(HTTP_Parser)/' libgit2/CMakeLists.txt
|
perl -pi -e 's/FIND_PACKAGE\(HTTP_Parser\)/#FIND_PACKAGE(HTTP_Parser)/' libgit2/CMakeLists.txt
|
||||||
mkdir -p libgit2-build-"$ARCH"
|
mkdir -p libgit2-build-"$ARCH"
|
||||||
|
|
@ -298,22 +298,22 @@ if [ ! -e "$PKG_CONFIG_LIBDIR/libgit2.pc" ] ; then
|
||||||
# Patch away pkg-config dependency to zlib, its there, i promise
|
# Patch away pkg-config dependency to zlib, its there, i promise
|
||||||
perl -pi -e 's/^(Requires.private:.*)zlib(.*)$/$1 $2/' "$PKG_CONFIG_LIBDIR"/libgit2.pc
|
perl -pi -e 's/^(Requires.private:.*)zlib(.*)$/$1 $2/' "$PKG_CONFIG_LIBDIR"/libgit2.pc
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libusb
|
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libusb
|
||||||
if ! grep -q libusb_set_android_open_callback libusb/libusb/libusb.h ; then
|
if ! grep -q libusb_set_android_open_callback libusb/libusb/libusb.h ; then
|
||||||
# Patch in our libusb callback
|
# Patch in our libusb callback
|
||||||
pushd libusb
|
pushd libusb
|
||||||
patch -p1 < "$SUBSURFACE_SOURCE"/packaging/android/patches/libusb-android.patch
|
patch -p1 < "$SUBSURFACE_SOURCE"/packaging/android/patches/libusb-android.patch
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
if [ ! -e libusb/configure ] ; then
|
if [ ! -e libusb/configure ] ; then
|
||||||
pushd libusb
|
pushd libusb
|
||||||
mkdir m4
|
mkdir m4
|
||||||
autoreconf -i
|
autoreconf -i
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
if [ ! -e "$PKG_CONFIG_LIBDIR/libusb-1.0.pc" ] ; then
|
if [ ! -e "$PKG_CONFIG_LIBDIR/libusb-1.0.pc" ] ; then
|
||||||
mkdir -p libusb-build-"$ARCH"
|
mkdir -p libusb-build-"$ARCH"
|
||||||
pushd libusb-build-"$ARCH"
|
pushd libusb-build-"$ARCH"
|
||||||
../libusb/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --enable-static --disable-shared --disable-udev --enable-system-log
|
../libusb/configure --host=${BUILDCHAIN} --prefix="$PREFIX" --enable-static --disable-shared --disable-udev --enable-system-log
|
||||||
|
|
@ -321,21 +321,21 @@ if [ ! -e "$PKG_CONFIG_LIBDIR/libusb-1.0.pc" ] ; then
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
|
|
||||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libftdi1
|
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libftdi1
|
||||||
if [ ! -e "$PKG_CONFIG_LIBDIR/libftdi1.pc" ] && [ "$PLATFORM" != "Darwin" ] ; then
|
if [ ! -e "$PKG_CONFIG_LIBDIR/libftdi1.pc" ] && [ "$PLATFORM" != "Darwin" ] ; then
|
||||||
mkdir -p libftdi1-build-"$ARCH"
|
mkdir -p libftdi1-build-"$ARCH"
|
||||||
pushd libftdi1-build-"$ARCH"
|
pushd libftdi1-build-"$ARCH"
|
||||||
cmake ../libftdi1 -DCMAKE_C_COMPILER="$CC" -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_PREFIX_PATH="$PREFIX" -DSTATICLIBS=ON -DPYTHON_BINDINGS=OFF -DDOCUMENTATION=OFF -DFTDIPP=OFF -DBUILD_TESTS=OFF -DEXAMPLES=OFF -DFTDI_EEPROM=OFF
|
cmake ../libftdi1 -DCMAKE_C_COMPILER="$CC" -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_PREFIX_PATH="$PREFIX" -DSTATICLIBS=ON -DPYTHON_BINDINGS=OFF -DDOCUMENTATION=OFF -DFTDIPP=OFF -DBUILD_TESTS=OFF -DEXAMPLES=OFF -DFTDI_EEPROM=OFF
|
||||||
make
|
make
|
||||||
make install
|
make install
|
||||||
popd
|
popd
|
||||||
fi
|
fi
|
||||||
# Blast away the shared version to force static linking
|
# Blast away the shared version to force static linking
|
||||||
if [ -e "$PREFIX/lib/libftdi1.so" ] ; then
|
if [ -e "$PREFIX/lib/libftdi1.so" ] ; then
|
||||||
rm "$PREFIX"/lib/libftdi1.so*
|
rm "$PREFIX"/lib/libftdi1.so*
|
||||||
fi
|
fi
|
||||||
|
|
||||||
fi # QUICK
|
fi # QUICK
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue