Changeset 01d610b in subsurface


Ignore:
Timestamp:
May 27, 2017, 5:41:28 PM (4 weeks ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
b400a5a
Parents:
9d1ebff
git-author:
Dirk Hohndel <dirk@…> (05/27/17 14:54:28)
git-committer:
Dirk Hohndel <dirk@…> (05/27/17 17:41:28)
Message:

Update Android build scripts

  • prepare for Qt 5.9
  • remove references to ANT
  • adjust to changed location of the resulting apk

Signed-off-by: Dirk Hohndel <dirk@…>

Location:
packaging/android
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • packaging/android/android-build-wrapper.sh

    rd82f8cb r01d610b  
    123123echo "${BUILDNR}" > ./buildnr.dat
    124124
    125 echo "Building Subsurface-mobile ${VERSION} for Android, build nr ${BUILDNR} as Subsurface-mobile-$VERSION-${NAME}arm.apk"
     125echo "Building Subsurface-mobile ${VERSION} for Android, build nr ${BUILDNR} as Subsurface-mobile-${VERSION}-arm.apk"
    126126
    127127if [ "$1" = release ] || [ "$1" = Release ] || [ "$1" = debug ] || [ "$1" = Debug ] ; then
     
    132132fi
    133133
    134 rm -f ./subsurface-mobile-build-arm/bin/QtApp-debug.apk
     134rm -f ./subsurface-mobile-build-arm/build/outputs/apk/*.apk
    135135rm -d ./subsurface-mobile-build-arm/AndroidManifest.xml
    136 rm -d ./subsurface-mobile-build-arm/bin/AndroidManifest.xml
     136
    137137if [ "$USE_X" ] ; then
    138138        bash "$USE_X" subsurface/packaging/android/build.sh "$RELEASE" -buildnr "$BUILDNR" arm "$@"
     
    141141fi
    142142
    143 ls -l ./subsurface-mobile-build-arm/bin/*.apk
     143ls -l ./subsurface-mobile-build-arm/build/outputs/apk/*.apk
    144144
  • packaging/android/build.sh

    r1df4b6c r01d610b  
    7777if [ -n "${QT5_ANDROID+X}" ] ; then
    7878        echo "Using Qt5 in $QT5_ANDROID"
     79elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.9" ] ; then
     80        export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.9
    7981elif [ -d "$SUBSURFACE_SOURCE/../Qt/5.8" ] ; then
    8082        export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.8
     
    8688        export QT5_ANDROID=$SUBSURFACE_SOURCE/../Qt/5.5
    8789else
    88         echo "Cannot find Qt 5.7, 5.6 or 5.5 under $SUBSURFACE_SOURCE/../Qt"
     90        echo "Cannot find Qt 5.5 or newer under $SUBSURFACE_SOURCE/../Qt"
    8991        exit 1
    9092fi
     
    343345        cd subsurface-mobile-build-"$ARCH"
    344346        MOBILE_CMAKE=-DSUBSURFACE_TARGET_EXECUTABLE=MobileExecutable
     347        BUILD_NAME=Subsurface-mobile
    345348else
    346349        MOBILE_CMAKE=""
    347350        mkdir -p subsurface-build-"$ARCH"
    348351        cd subsurface-build-"$ARCH"
    349 fi
    350 
    351 # something in the qt-android-cmake-thingies mangles your path, so thats why we need to hard-code ant and pkg-config here.
     352        BUILD_NAME=Subsurface
     353fi
     354
    352355if [ "$PLATFORM" = "Darwin" ] ; then
    353         ANT=/usr/local/bin/ant
    354356        FTDI=OFF
    355357else
    356         ANT=/usr/bin/ant
    357358        FTDI=ON
    358359fi
     
    360361PKGCONF=$(which pkg-config)
    361362cmake $MOBILE_CMAKE \
    362         -DQT_ANDROID_ANT=${ANT} \
    363363        -DPKG_CONFIG_EXECUTABLE="$PKGCONF" \
    364364        -DQT_ANDROID_SDK_ROOT="$ANDROID_SDK_ROOT" \
     
    411411make "$@"
    412412
    413 #make install INSTALL_ROOT=android_build
    414 # bug in androiddeployqt? why is it looking for something with the builddir in it?
    415 #ln -fs android-libsubsurface.so-deployment-settings.json android-libsubsurface-build-${ARCH}.so-deployment-settings.json
    416 #$QT5_ANDROID_BIN/androiddeployqt --output android_build
     413echo "Done building $BUILD_NAME for Android"
Note: See TracChangeset for help on using the changeset viewer.