Changeset d97055d in subsurface


Ignore:
Timestamp:
Jun 21, 2017, 6:43:15 PM (5 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
f0c9032
Parents:
2fa7e86
git-author:
Anton Lundin <glance@…> (06/01/17 08:04:53)
git-committer:
Dirk Hohndel <dirk@…> (06/21/17 18:43:15)
Message:

Upgrade 3pp for android and testing

Signed-off-by: Anton Lundin <glance@…>

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • .travis.yml

    r24f61e8 rd97055d  
    3030
    3131before_install:
    32     - if [ ! -e Qt/5.8 ] ; then
     32    - if [ ! -e Qt/5.9 ] ; then
    3333          rm -rf Qt ;
    34           wget http://download.qt.io/official_releases/qt/5.8/5.8.0/qt-opensource-linux-x64-android-5.8.0.run ;
    35           chmod +x ./qt-opensource-linux-x64-android-5.8.0.run ;
    36           ./qt-opensource-linux-x64-android-5.8.0.run -platform minimal --script qt-installer-noninteractive.qs --no-force-installations ;
     34          wget http://download.qt.io/official_releases/qt/5.9/5.9.0/qt-opensource-linux-x64-5.9.0.run ;
     35          chmod +x ./qt-opensource-linux-x64-5.9.0.run ;
     36          ./qt-opensource-linux-x64-5.9.0.run -platform minimal --script qt-installer-noninteractive.qs --no-force-installations ;
    3737      fi
    3838      # TestPreferences uses gui calls, so run a xvfb so it has something to talk to
     
    4545    - perl -pi -e 's/BUILDMARBLE=1/BUILDMARBLE=0/' scripts/build.sh
    4646    - perl -pi -e 's/-DNO_PRINTING=OFF/-DNO_PRINTING=ON -DNO_MARBLE=ON -DUSE_WEBENGINE=ON/' scripts/build.sh
    47     - export CMAKE_PREFIX_PATH=$PWD/Qt/5.8/gcc_64/lib/cmake ;
     47    - export CMAKE_PREFIX_PATH=$PWD/Qt/5.9/gcc_64/lib/cmake ;
    4848      cd .. ;
    4949      bash -e ./subsurface/scripts/build.sh -both
  • packaging/android/build.sh

    r01d610b rd97055d  
    4040ARCH=arm
    4141# Which SDK buildtools revision is used?
    42 ANDROID_BUILDTOOLS_REVISION=23.0.3
     42ANDROID_BUILDTOOLS_REVISION=25.0.3
    4343
    4444while [ "$#" -gt 0 ] ; do
     
    7373
    7474# Configure where we can find things here
    75 export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r13b}
     75export ANDROID_NDK_ROOT=${ANDROID_NDK_ROOT-$SUBSURFACE_SOURCE/../android-ndk-r14b}
    7676
    7777if [ -n "${QT5_ANDROID+X}" ] ; then
     
    101101
    102102# Which versions are we building against?
    103 SQLITE_VERSION=3130000
     103SQLITE_VERSION=3190200
    104104LIBXML2_VERSION=2.9.4
    105105LIBXSLT_VERSION=1.1.29
    106106LIBZIP_VERSION=1.1.3
    107 LIBGIT2_VERSION=0.24.1
     107LIBGIT2_VERSION=0.25.1
    108108LIBUSB_VERSION=1.0.20
    109 OPENSSL_VERSION=1.0.2h
     109OPENSSL_VERSION=1.0.2l
    110110LIBFTDI_VERSION=1.3
    111111
     
    145145
    146146if [ ! -e sqlite-autoconf-${SQLITE_VERSION}.tar.gz ] ; then
    147         wget http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_VERSION}.tar.gz
     147        wget http://www.sqlite.org/2017/sqlite-autoconf-${SQLITE_VERSION}.tar.gz
    148148fi
    149149if [ ! -e sqlite-autoconf-${SQLITE_VERSION} ] ; then
Note: See TracChangeset for help on using the changeset viewer.