Merge pull request #1241 from jemc/builds-qt-android

Problem: No builtin way to build for qt-android

.gitignore

@@ -124,6 +124,7 @@ builds/msvc/**/*.user
 builds/msvc/**/*Debug
 builds/msvc/**/*Release
 builds/redhat/zeromq.spec
+builds/qt-android/prefix/
 packaging/nuget/*.nupkg
 foreign/openpgm/*
 !foreign/openpgm/*.tar.bz2

.travis.yml

@@ -2,14 +2,9 @@
 
 language: c
 
-#   Build required projects first
-before_script:
+env:
+  - BUILD_TYPE=default
+  - BUILD_TYPE=qt-android
 
-#   libsodium
-- git clone git://github.com/jedisct1/libsodium.git
-- ( cd libsodium; ./autogen.sh; ./configure; make check; sudo make install; sudo ldconfig )
-
-#   Build and check this project
-script:
-- ./autogen.sh && ./configure --with-libsodium=yes && make && make check
-- sudo make install
+#   Build and check this project according to the BUILD_TYPE
+script: ./ci_build.sh

builds/qt-android/build.sh

+#!/usr/bin/env bash
+
+# Get directory of current script
+ANDROID_BUILD_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+# Get access to android_build functions and variables
+source ${ANDROID_BUILD_DIR}/android_build_helper.sh
+
+# Choose a C++ standard library implementation from the ndk
+ANDROID_BUILD_CXXSTL="gnustl_shared_48"
+
+# Set up android build environment and set ANDROID_BUILD_OPTS array
+android_build_env
+android_build_opts
+
+# Clear a temporary build directory
+cache="/tmp/android_build/${TOOLCHAIN_NAME}"
+rm -rf "${cache}"
+mkdir -p "${cache}"
+
+
+echo
+echo "Building qt-android libsodium from latest release tarball..."
+echo
+
+wget "https://download.libsodium.org/libsodium/releases/LATEST.tar.gz" \
+    -O "${cache}/libsodium.tar.gz"
+
+(cd "${cache}" && mkdir libsodium \
+    && tar -C libsodium -xf libsodium.tar.gz --strip=1 \
+    && cd "libsodium" && ./autogen.sh \
+    && ./configure "${ANDROID_BUILD_OPTS[@]}" --disable-soname-versions \
+    && make \
+    && make install) || exit 1
+
+echo
+echo "Building qt-android libzmq from local source..."
+echo
+
+cp -r ../.. "${cache}/libzmq"
+
+(cd "${cache}/libzmq" && ./autogen.sh \
+    && ./configure "${ANDROID_BUILD_OPTS[@]}" --with-libsodium=yes \
+    && make \
+    && make install) || exit 1
+
+echo
+echo "Verifying qt-android libsodium.so and libzmq.so libraries..."
+echo
+
+android_build_verify_so "libsodium.so"
+android_build_verify_so "libzmq.so" "libsodium.so"
+
+echo
+echo "Completed qt-android build!"
+echo

builds/qt-android/ci_build.sh

+#!/usr/bin/env bash
+
+(cd '/tmp' \
+    && wget http://dl.google.com/android/ndk/android-ndk-r9-linux-x86_64.tar.bz2 \
+    && tar -xf android-ndk-r9-linux-x86_64.tar.bz2 \
+    && mv android-ndk-r9 android-ndk)
+
+export ANDROID_NDK_ROOT="/tmp/android-ndk"
+export TOOLCHAIN_PATH="/tmp/android-ndk/toolchains/arm-linux-androideabi-4.8/prebuilt/linux-x86_64/bin"
+export TOOLCHAIN_NAME="arm-linux-androideabi-4.8"
+export TOOLCHAIN_HOST="arm-linux-androideabi"
+export TOOLCHAIN_ARCH="arm"
+
+source ./build.sh

ci_build.sh

+#!/usr/bin/env bash
+
+if [ $BUILD_TYPE == "default" ]; then
+    #   Build required projects first
+
+    #   libsodium
+    git clone git://github.com/jedisct1/libsodium.git
+    ( cd libsodium; ./autogen.sh; ./configure; make check; sudo make install; sudo ldconfig )
+
+    #   Build and check this project
+    ./autogen.sh && ./configure --with-libsodium=yes && make && make check
+    sudo make install
+else
+    cd ./builds/${BUILD_TYPE} && ./ci_build.sh
+fi