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

build-system: update get-dep-lib with Android fix.

Browse source 
Android build uses wget and not curl.

Currently android uses older versions of some libs, due to that
a new switch is added temporary.

Old version tested for curl and if not found set the different versions,
however this is not a stable method for obvious reasons

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-05-17 20:55:58 +02:00 • committed by Dirk Hohndel
parent a181020b19
commit 8e2aaa4242
1 changed files with 20 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
scripts/get-dep-lib.sh
View file

@ -14,14 +14,12 @@ CURRENT_SQLITE="3190200"
CURRENT_LIBXML2="v2.9.4" CURRENT_LIBXML2="v2.9.4"
CURRENT_LIBFTDI="1.3" CURRENT_LIBFTDI="1.3"
# deal with all the command line arguments # deal with all the command line arguments
if [[ $# -ne 2 && $# -ne 3 ]] ; then if [[ $# -ne 2 && $# -ne 3 ]] ; then
echo "wrong number of parameters, format:" echo "wrong number of parameters, format:"
echo "get-dep-lib.sh <platform> <install dir>" echo "get-dep-lib.sh <platform> <install dir>"
echo "or"
echo "get-dep-lib.sh single <install dir> <lib>" echo "get-dep-lib.sh single <install dir> <lib>"
echo "get-dep-lib.sh singleAndroid <install dir> <lib>"
echo "where" echo "where"
echo "<platform> is one of scripts, ios or android" echo "<platform> is one of scripts, ios or android"
echo "(the name of the directory where build.sh resides)" echo "(the name of the directory where build.sh resides)"
@ -37,6 +35,19 @@ if [ ! -d ${INSTDIR} ] ; then
mkdir -p ${INSTDIR} mkdir -p ${INSTDIR}
fi fi
# FIX FOR ANDROID,
if [ "$PLATFORM" == "singleAndroid" ] ; then
CURRENT_LIBZIP="1.1.3"
CURRENT_LIBUSB="v1.0.20"
CURRENT_OPENSSL="OpenSSL_1_0_2l"
fi
# no curl and old libs (never version breaks)
# check whether to use curl or wget
if [ "`which curl`" == "" ] ; then
CURL="wget "
else
CURL="curl -O "
fi
case ${PLATFORM} in case ${PLATFORM} in
scripts) scripts)
BUILD="libzip libgit2 googlemaps hidapi libcurl libusb openssl libssh2" BUILD="libzip libgit2 googlemaps hidapi libcurl libusb openssl libssh2"
@ -50,6 +61,9 @@ case ${PLATFORM} in
single) single)
BUILD="$3" BUILD="$3"
;; ;;
singleAndroid)
BUILD="$3"
;;
*) *)
echo "Unknown platform ${PLATFORM}, choose between native, ios or android" echo "Unknown platform ${PLATFORM}, choose between native, ios or android"
;; ;;
@ -74,7 +88,7 @@ if [[ "$BUILD" = *"libcurl"* && ! -d libcurl ]]; then
fi fi
if [[ "$BUILD" = *"libftdi"* && ! -d libftdi1 ]]; then if [[ "$BUILD" = *"libftdi"* && ! -d libftdi1 ]]; then
curl -O https://www.intra2net.com/en/developer/libftdi/download/libftdi1-${CURRENT_LIBFTDI}.tar.bz2 ${CURL} https://www.intra2net.com/en/developer/libftdi/download/libftdi1-${CURRENT_LIBFTDI}.tar.bz2
tar -jxf libftdi1-${CURRENT_LIBFTDI}.tar.bz2 tar -jxf libftdi1-${CURRENT_LIBFTDI}.tar.bz2
mv libftdi1-${CURRENT_LIBFTDI} libftdi1 mv libftdi1-${CURRENT_LIBFTDI} libftdi1
fi fi
@ -135,7 +149,7 @@ if [[ "$BUILD" = *"libxslt"* && ! -d libxslt ]]; then
fi fi
if [[ "$BUILD" = *"libzip"* && ! -d libzip ]]; then if [[ "$BUILD" = *"libzip"* && ! -d libzip ]]; then
curl -O https://libzip.org/download/libzip-${CURRENT_LIBZIP}.tar.gz ${CURL} https://libzip.org/download/libzip-${CURRENT_LIBZIP}.tar.gz
tar xzf libzip-${CURRENT_LIBZIP}.tar.gz tar xzf libzip-${CURRENT_LIBZIP}.tar.gz
mv libzip-${CURRENT_LIBZIP} libzip mv libzip-${CURRENT_LIBZIP} libzip
fi fi
@ -173,7 +187,7 @@ if [[ "$BUILD" = *"openssl"* && ! -d openssl ]]; then
fi fi
if [[ "$BUILD" = *"sqlite"* && ! -d sqlite ]]; then if [[ "$BUILD" = *"sqlite"* && ! -d sqlite ]]; then
curl -O http://www.sqlite.org/2017/sqlite-autoconf-${CURRENT_SQLITE}.tar.gz ${CURL} http://www.sqlite.org/2017/sqlite-autoconf-${CURRENT_SQLITE}.tar.gz
tar -zxf sqlite-autoconf-${CURRENT_SQLITE}.tar.gz tar -zxf sqlite-autoconf-${CURRENT_SQLITE}.tar.gz
mv sqlite-autoconf-${CURRENT_SQLITE} sqlite mv sqlite-autoconf-${CURRENT_SQLITE} sqlite
fi fi