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

Upgrade 3pp for android and testing

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin 2017-06-01 17:04:53 +02:00 • committed by Dirk Hohndel
parent 2fa7e86708
commit d97055d47c
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.travis.yml
View file

@ -29,11 +29,11 @@ addons:
- mesa-common-dev - mesa-common-dev
before_install: before_install:
- if [ ! -e Qt/5.8 ] ; then - if [ ! -e Qt/5.9 ] ; then
rm -rf Qt ; rm -rf Qt ;
wget http://download.qt.io/official_releases/qt/5.8/5.8.0/qt-opensource-linux-x64-android-5.8.0.run ; wget http://download.qt.io/official_releases/qt/5.9/5.9.0/qt-opensource-linux-x64-5.9.0.run ;
chmod +x ./qt-opensource-linux-x64-android-5.8.0.run ; chmod +x ./qt-opensource-linux-x64-5.9.0.run ;
./qt-opensource-linux-x64-android-5.8.0.run -platform minimal --script qt-installer-noninteractive.qs --no-force-installations ; ./qt-opensource-linux-x64-5.9.0.run -platform minimal --script qt-installer-noninteractive.qs --no-force-installations ;
fi fi
# TestPreferences uses gui calls, so run a xvfb so it has something to talk to # TestPreferences uses gui calls, so run a xvfb so it has something to talk to
- "export DISPLAY=:99.0" - "export DISPLAY=:99.0"
@ -44,7 +44,7 @@ script:
- perl -pi -e 's/BUILDGRANTLEE=1/BUILDGRANTLEE=0/' scripts/build.sh - perl -pi -e 's/BUILDGRANTLEE=1/BUILDGRANTLEE=0/' scripts/build.sh
- perl -pi -e 's/BUILDMARBLE=1/BUILDMARBLE=0/' scripts/build.sh - perl -pi -e 's/BUILDMARBLE=1/BUILDMARBLE=0/' scripts/build.sh
- perl -pi -e 's/-DNO_PRINTING=OFF/-DNO_PRINTING=ON -DNO_MARBLE=ON -DUSE_WEBENGINE=ON/' scripts/build.sh - perl -pi -e 's/-DNO_PRINTING=OFF/-DNO_PRINTING=ON -DNO_MARBLE=ON -DUSE_WEBENGINE=ON/' scripts/build.sh
- export CMAKE_PREFIX_PATH=$PWD/Qt/5.8/gcc_64/lib/cmake ; - export CMAKE_PREFIX_PATH=$PWD/Qt/5.9/gcc_64/lib/cmake ;
cd .. ; cd .. ;
bash -e ./subsurface/scripts/build.sh -both bash -e ./subsurface/scripts/build.sh -both
- env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build check - env CTEST_OUTPUT_ON_FAILURE=1 make -C subsurface/build check

12
packaging/android/build.sh
View file

@ -39,7 +39,7 @@ SUBSURFACE_DESKTOP=OFF
# Which arch should we build for? # Which arch should we build for?
ARCH=arm ARCH=arm
# Which SDK buildtools revision is used? # Which SDK buildtools revision is used?
ANDROID_BUILDTOOLS_REVISION=23.0.3 ANDROID_BUILDTOOLS_REVISION=25.0.3
while [ "$#" -gt 0 ] ; do while [ "$#" -gt 0 ] ; do
case "$1" in case "$1" in
@ -72,7 +72,7 @@ done
export ARCH export ARCH
# Configure where we can find things here # Configure where we can find things here
export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r13b} export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r14b}
if [ -n "${QT5_ANDROID+X}" ] ; then if [ -n "${QT5_ANDROID+X}" ] ; then
echo "Using Qt5 in $QT5_ANDROID" echo "Using Qt5 in $QT5_ANDROID"
@ -100,13 +100,13 @@ else
fi fi
# Which versions are we building against? # Which versions are we building against?
SQLITE_VERSION=3130000 SQLITE_VERSION=3190200
LIBXML2_VERSION=2.9.4 LIBXML2_VERSION=2.9.4
LIBXSLT_VERSION=1.1.29 LIBXSLT_VERSION=1.1.29
LIBZIP_VERSION=1.1.3 LIBZIP_VERSION=1.1.3
LIBGIT2_VERSION=0.24.1 LIBGIT2_VERSION=0.25.1
LIBUSB_VERSION=1.0.20 LIBUSB_VERSION=1.0.20
OPENSSL_VERSION=1.0.2h OPENSSL_VERSION=1.0.2l
LIBFTDI_VERSION=1.3 LIBFTDI_VERSION=1.3
if [ "$ARCH" = "arm" ] ; then if [ "$ARCH" = "arm" ] ; then
@ -144,7 +144,7 @@ else
fi fi
if [ ! -e sqlite-autoconf-${SQLITE_VERSION}.tar.gz ] ; then if [ ! -e sqlite-autoconf-${SQLITE_VERSION}.tar.gz ] ; then
wget http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_VERSION}.tar.gz wget http://www.sqlite.org/2017/sqlite-autoconf-${SQLITE_VERSION}.tar.gz
fi fi
if [ ! -e sqlite-autoconf-${SQLITE_VERSION} ] ; then if [ ! -e sqlite-autoconf-${SQLITE_VERSION} ] ; then
tar -zxf sqlite-autoconf-${SQLITE_VERSION}.tar.gz tar -zxf sqlite-autoconf-${SQLITE_VERSION}.tar.gz