X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=1031ba5eb596105cf428ab5dc9a52c49bcbdc1b5;hp=84a303ade85b24fd9fb6c2904ffa89c82350faab;hb=67b2de8a399c2feba3e7c7aa3f2be71dd5839dca;hpb=9a98e0d1635c3a19767a9a62f2c807e2d549c1e5

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 84a303a..1031ba5 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -21,11 +21,11 @@
 
 set -e
 
-# The path where Android NDK is located.
-ANDROID_NDK=/usr/local/android-ndk-r9d
+# The path where the Android NDK is located.
+ANDROID_NDK=$HOME/android/android-ndk-r9d
 
-# The path where Android SDK is located.
-ANDROID_SDK=/usr/local/android
+# The path where the Android SDK is located.
+ANDROID_SDK=$HOME/android/android-sdk-linux
 
 # The path where your Android toolchain directory is located.
 TOOLCHAIN=$HOME/android/android-arm-toolchain
@@ -52,18 +52,20 @@ PARALLEL="-j 2"
 # -----------------------------------------------------------------------------
 
 VER_LIBICONV=1.14
-VER_GETTEXT=0.18.3
+VER_GETTEXT=0.19.2
 VER_ZLIB=1.2.8
-VER_PCRE=8.33
-VER_LIBFFI=3.0.13
-VER_GLIB=2.38.2
-VER_GLIB_SHORT=2.38
-VER_LIBZIP=0.11.1
+VER_PCRE=8.35
+VER_LIBFFI=3.1
+VER_GLIB=2.41.3
+VER_GLIB_SHORT=2.41
+VER_LIBSIGCXX=2.3.2
+VER_LIBSIGCXX_SHORT=2.3
+VER_LIBZIP=0.11.2
 VER_LIBFTDI1=1.1
-VER_LIBUSBX=1.0.17
+VER_LIBUSB=1.0.19
 VER_PYTHON=3.3.3
 VER_BOOST=1.55.0
-VER_QT=n0.31
+VER_QT=5.3.1
 
 SF_MIRROR=switch.dl.sourceforge.net
 
@@ -74,7 +76,7 @@ case "$TOOLCHAIN_TRIPLET" in
   arm*) TARGET_ARCH=armeabi;;
   mips*) TARGET_ARCH=mips;;
   i686*) TARGET_ARCH=x86;;
-  *) echo >&2 "Unknown prefix for TOOLCHAIN_TRIPLET"; exit 1;;
+  *) echo >&2 "Unknown prefix for TOOLCHAIN_TRIPLET."; exit 1;;
 esac
 
 # -----------------------------------------------------------------------------
@@ -84,15 +86,16 @@ rm -rf $BUILDDIR
 mkdir $BUILDDIR
 cd $BUILDDIR
 
+# -----------------------------------------------------------------------------
+
 # Build host Python before we start messing with the environment.
+# Don't do parallel builds, this doesn't seem to work well.
 $WGET http://python.org/ftp/python/$VER_PYTHON/Python-$VER_PYTHON.tar.xz
 tar xJf Python-$VER_PYTHON.tar.xz
 cd Python-$VER_PYTHON
 ./configure
-make python $PARALLEL
-make Parser/pgen $PARALLEL
+make python
 mv python hostpython
-mv Parser/pgen Parser/hostpgen
 cd ..
 
 # -----------------------------------------------------------------------------
@@ -108,23 +111,40 @@ export -n PKG_CONFIG_PATH
 C="--host=$TOOLCHAIN_TRIPLET --prefix=$PREFIX"
 CM="-Wno-dev -DCMAKE_TOOLCHAIN_FILE=../android.toolchain.cmake -DANDROID_ABI=${TARGET_ARCH} -DCMAKE_INSTALL_PREFIX=${PREFIX} -DANDROID_STANDALONE_TOOLCHAIN=${TOOLCHAIN}"
 
+# Look for STL, needed to build bindings
+NDK_TOOLCHAIN_VERSION=`${TOOLCHAIN_TRIPLET}-gcc --version | head -1 | sed -e 's/.* \([0-9]\+\.[0-9.]\+\)\( \|.*\)$/\1/'`
+STL_BASE="${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}"
+if [ -d ${STL_BASE}/include ]; then
+  CPPFLAGS_STL="-I${STL_BASE}/include -I${STL_BASE}/libs/${TARGET_ARCH}/include"
+  LDFLAGS_STL="-L${STL_BASE}/libs/${TARGET_ARCH} -Wl,-rpath=${STL_BASE}/libs/${TARGET_ARCH}"
+  BINDINGS_CONFIG="--enable-bindings"
+else
+  echo "Warning: STL unavailable, libsigrok bindings will not be built."
+  CPPFLAGS_STL=
+  LDFLAGS_STL=
+  BINDINGS_CONFIG="--disable-bindings"
+fi
+
+# -----------------------------------------------------------------------------
+
 # Get the latest versions of config.guess/config.sub that know about Android.
 $GIT_CLONE git://git.savannah.gnu.org/config.git
 
-# Get a toolchain for cmake that knows about Android
-wget https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake
+# Get a toolchain for cmake that knows about Android.
+$WGET https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake
 patch < ../android.toolchain.cmake.patch android.toolchain.cmake
 
 # -----------------------------------------------------------------------------
 
 # Python (needed for libsigrokdecode)
+# Don't do parallel Python builds, this doesn't seem to work well.
 cd Python-$VER_PYTHON
 make distclean
 autoreconf
 patch -p1 < ../../Python-$VER_PYTHON.patch
 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fdatasync=no ac_cv_func_killpg=no ac_cv_func_waitid=no ac_cv_func_sigaltstack=no ./configure $C --build=x86_64-linux-gnu --disable-ipv6
 sed -i "s/^#zlib/zlib/g" Modules/Setup
-make HOSTPYTHON=./hostpython HOSTPGEN=./Parser/hostpgen install $PARALLEL
+make PYTHON_FOR_BUILD=./hostpython install
 cd ..
 
 # libiconv (needed for glib)
@@ -186,7 +206,7 @@ make $PARALLEL
 make install
 cd ..
 
-# glib
+# glib (needed for libsigrok)
 $WGET http://ftp.gnome.org/pub/gnome/sources/glib/$VER_GLIB_SHORT/glib-$VER_GLIB.tar.xz
 tar xJf glib-$VER_GLIB.tar.xz
 cd glib-$VER_GLIB
@@ -197,7 +217,7 @@ make $PARALLEL
 make install
 cd ..
 
-# libzip
+# libzip (needed for libsigrok)
 $WGET http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz
 tar xfz libzip-$VER_LIBZIP.tar.gz
 cd libzip-$VER_LIBZIP
@@ -208,21 +228,21 @@ make $PARALLEL
 make install
 cd ..
 
-# libusb-1.0
-$WGET http://$SF_MIRROR/project/libusbx/releases/$VER_LIBUSBX/source/libusbx-$VER_LIBUSBX.tar.bz2
-tar xfj libusbx-$VER_LIBUSBX.tar.bz2
-cd libusbx-$VER_LIBUSBX
+# libusb-1.0 (needed for libsigrok)
+$WGET http://$SF_MIRROR/project/libusb/libusb-1.0/libusb-$VER_LIBUSB/libusb-$VER_LIBUSB.tar.bz2
+tar xfj libusb-$VER_LIBUSB.tar.bz2
+cd libusb-$VER_LIBUSB
 patch -p1 < ../../libusb-1.0.patch
 ./configure $C --disable-udev
 make $PARALLEL
 make install
 cd ..
 
-# libftdi1
+# libftdi1 (needed for libsigrok)
 $WGET http://www.intra2net.com/en/developer/libftdi/download/libftdi1-$VER_LIBFTDI1.tar.bz2
 tar xfj libftdi1-$VER_LIBFTDI1.tar.bz2
 cd libftdi1-$VER_LIBFTDI1
-cmake $CM .
+cmake $CM -DFTDIPP=OFF .
 make $PARALLEL
 make install
 cd ..
@@ -231,96 +251,132 @@ cd ..
 $GIT_CLONE git://sigrok.org/libserialport
 cd libserialport
 ./autogen.sh
-./configure $C
+mkdir build
+cd build
+../configure $C
 make $PARALLEL V=1
 make install
-cd ..
+cd ../..
+
+# Build dependencies for libsigrok bindings if needed
+
+if [ x"$CPPFLAGS_STL" != x ]; then
+
+  # libsigc++ (needed for glibmm)
+  $WGET http://ftp.gnome.org/pub/gnome/sources/libsigc++/$VER_LIBSIGCXX_SHORT/libsigc++-$VER_LIBSIGCXX.tar.xz
+  tar xJf libsigc++-$VER_LIBSIGCXX.tar.xz
+  cd libsigc++-$VER_LIBSIGCXX
+  cp -f ../config/config.guess build
+  cp -f ../config/config.sub build
+  CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure $C
+  make $PARALLEL
+  make install
+  cd ..
+
+  # glibmm (needed for libsigrok bindings)
+  $WGET http://ftp.gnome.org/pub/gnome/sources/glibmm/$VER_GLIB_SHORT/glibmm-$VER_GLIB.tar.xz
+  tar xJf glibmm-$VER_GLIB.tar.xz
+  cd glibmm-$VER_GLIB
+  CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure $C
+  make $PARALLEL
+  make install
+  cd ..
+
+fi
 
 # libsigrok
 $GIT_CLONE git://sigrok.org/libsigrok
 cd libsigrok
 ./autogen.sh
-./configure $C
+mkdir build
+cd build
+CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL" ../configure $C $BINDINGS_CONFIG --datadir=/sdcard
 make $PARALLEL V=1
-make install
-cd ..
+make datadir='$(datarootdir)' install
+cd ../..
 
 # libsigrokdecode
 $GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
-./configure $C
+mkdir build
+cd build
+../configure $C
 make $PARALLEL V=1
 make install
-cd ..
+cd ../..
 
 # sigrok-cli
 $GIT_CLONE git://sigrok.org/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
-./configure $C
+mkdir build
+cd build
+../configure $C
 make $PARALLEL V=1
 make install
-cd ..
-
+cd ../..
 
-# Check if we have kit to build PulseView
+# Check if we have all requirements to build PulseView:
 
 if [ -z "$ANDROID_NDK" -o ! -d "$ANDROID_NDK" ]; then
-  echo "Android NDK not available, not building PulseView"
+  echo "Android NDK not available, not building PulseView."
   exit 0
 fi
 
-if [ -z "$ANDROID_SDK" -o ! -d "$ANDROID_SDK"/platforms/android-4 -o \
-     ! -d "$ANDROID_SDK"/platforms/android-7 -o \
+if [ -z "$ANDROID_SDK" -o \
      ! -d "$ANDROID_SDK"/platforms/android-8 -o \
-     ! -d "$ANDROID_SDK"/platforms/android-14 ]; then
-  echo "Android SDK with platforms 4 7 8 14 not available, not building PulseView"
+     ! -d "$ANDROID_SDK"/platforms/android-10 -o \
+     ! -d "$ANDROID_SDK"/platforms/android-11 -o \
+     ! -d "$ANDROID_SDK"/platforms/android-14 -o \
+     ! -d "$ANDROID_SDK"/platforms/android-16 ]; then
+  echo "Android SDK with platforms 8 10 11 14 16 not available, not building PulseView."
   exit 0
 fi
 
-ANDROID_TOOLS=${ANDROID_SDK}/tools
-ANDROID_BUILD_TOOLS=${ANDROID_SDK}/build-tools/19.0.1
-
-if [ ! -e "$ANDROID_TOOLS/android" -o ! -e "$ANDROID_BUILD_TOOLS/dx" ]; then
-  echo "Essential Android build tools not available, not building PulseView"
+if [ ! -e "${ANDROID_SDK}/tools/android" ]; then
+  echo "Essential Android build tools not available, not building PulseView."
   exit 0
 fi
 
-NDK_TOOLCHAIN_VERSION=`${TOOLCHAIN_TRIPLET}-gcc --version | head -1 | sed -e 's/.* \([0-9]\+\.[0-9.]\+\)\( \|.*\)$/\1/'`
 NDK_HOST=`"$ANDROID_NDK/ndk-build" -p 2>/dev/null | awk '$1 == "HOST_TAG" { print $3 }'`
 
-
-# boost (needed for PulseView)
+# Boost (needed for PulseView)
 $WGET http://$SF_MIRROR/project/boost/boost/$VER_BOOST/boost_${VER_BOOST//./_}.tar.bz2
 tar xfj boost_${VER_BOOST//./_}.tar.bz2
 cd boost_${VER_BOOST//./_}
 patch -p1 < ../../boost.patch
-./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system,thread --without-icu
-echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxflags>\"-I$PREFIX/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/include -I${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH}/include\" <linkflags>\"-L$PREFIX/lib -L${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH} -lgnustl_shared\" ;" > user-config.jam
-./b2 -q -d+2 --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install
+./bootstrap.sh --with-toolset=gcc --with-libraries=filesystem,system --without-icu
+echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxflags>\"-I$PREFIX/include $CPPFLAGS_STL\" <linkflags>\"-L$PREFIX/lib $LDFLAGS_STL -lgnustl_shared\" ;" > user-config.jam
+./b2 -q -d+2 --user-config=user-config.jam toolset=gcc variant=release link=shared threading=multi runtime-link=shared target-os=android --prefix=$PREFIX --layout=system install $PARALLEL
 cd ..
 
-# qt (needed for PulseView)
-$GIT_CLONE -b $VER_QT git://anongit.kde.org/android-qt.git
-cd android-qt
+# Qt (needed for PulseView)
+$WGET http://download.qt-project.org/official_releases/qt/${VER_QT%.*}/${VER_QT}/single/qt-everywhere-opensource-src-${VER_QT}.tar.gz
+tar xfz qt-everywhere-opensource-src-${VER_QT}.tar.gz
+cd qt-everywhere-opensource-src-${VER_QT}
 patch -p1 < ../../android-qt.patch
-ANDROID_SDK_PLATFORM_TOOLS_PATH=$ANDROID_BUILD_TOOLS ANDROID_SDK_TOOLS_PATH=$ANDROID_TOOLS ./android/androidconfigbuild.sh -n $ANDROID_NDK -a $TARGET_ARCH -l 14 -q 1 -d 1 -i $PREFIX -k 1 -o $NDK_HOST -v $NDK_TOOLCHAIN_VERSION
+./configure --prefix="$PREFIX" -developer-build -xplatform android-g++ -nomake tests -nomake examples -android-sdk "$ANDROID_SDK" -android-ndk "$ANDROID_NDK" -android-ndk-host "$NDK_HOST" -android-arch "$TARGET_ARCH" -android-toolchain-version "$NDK_TOOLCHAIN_VERSION" -skip qttranslations -skip qtwebkit -skip qtserialport -skip qtwebkit-examples -skip qtlocation -skip qtconnectivity -opensource -confirm-license
+make module-qtbase module-qtandroidextras module-qtsvg module-qtimageformats $PARALLEL
+make install
+cd ..
+
+# sigrok-androidutils
+$GIT_CLONE git://sigrok.org/sigrok-androidutils
+cd sigrok-androidutils
+./autogen.sh
+./configure $C --with-android-sdk="${ANDROID_SDK}"
+make $PARALLEL V=1
+make install
 cd ..
 
 # PulseView
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
-patch -p1 < ../../pulseview-cpp.patch
-cmake $CM -DQT_QMAKE_EXECUTABLE=${PREFIX}/bin/qmake -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl -DENABLE_DECODE=FALSE .
-make $PARALLEL
-cp -r "$PREFIX"/src/android/java .
-cp -r libs java/
-cd java
-patch -p2 < ../../../pulseview-java.patch
-mkdir -p assets
-READELF=$TOOLCHAIN_TRIPLET-readelf ../../../fix-libraries.sh "$PREFIX/lib" libs/"$TARGET_ARCH" libpulseview.so > assets/liblist.txt
-cp ${ANDROID_NDK}/sources/cxx-stl/gnu-libstdc++/${NDK_TOOLCHAIN_VERSION}/libs/${TARGET_ARCH}/libgnustl_shared.so libs/${TARGET_ARCH}/
-"$ANDROID_TOOLS/android" update project -p . -t android-14 -n PulseView
+cmake $CM -DANDROID_STL_PATH=${ANDROID_NDK}/sources/cxx-stl .
+make $PARALLEL VERBOSE=1
+cd android
+"${ANDROID_SDK}/tools/android" update project -p . -t android-14 -n PulseView
 ant debug
 cd ../..
+