X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=5e08bda3fc69fd593ddc9147ad3e2bc506e69504;hp=2c7a0c9e65d90d0a459c505bd3a34a3ef3e60c92;hb=7b8889711d74c1d669fab2b026d5e634a8d9b0f3;hpb=0832e7d675a9ea308ddcafbb2a1ed425c720fa1e

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 2c7a0c9..5e08bda 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -19,113 +19,314 @@
 ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 ##
 
+set -e
+
+# The path where Android NDK is located.
+ANDROID_NDK=/usr/local/android-ndk-r9d
+
+# The path where Android SDK is located.
+ANDROID_SDK=/usr/local/android
+
 # The path where your Android toolchain directory is located.
 TOOLCHAIN=$HOME/android/android-arm-toolchain
+# TOOLCHAIN=$HOME/android/android-mipsel-toolchain
+# TOOLCHAIN=$HOME/android/android-i686-toolchain
+
+# Select which Android toolchain to use.
+# Don't forget to also adapt TOOLCHAIN above if you change TOOLCHAIN_TRIPLET!
+TOOLCHAIN_TRIPLET=arm-linux-androideabi
+# TOOLCHAIN_TRIPLET=mipsel-linux-android
+# TOOLCHAIN_TRIPLET=i686-linux-android
 
 # The path where the cross-compiled packages will be installed.
 PREFIX=$HOME/sr_android
 
 # The path where to download files to and where to build packages.
-BUILDDIR=./sr_android_build
+BUILDDIR=./build
+
+# Edit this to enable/disable/modify parallel compiles.
+PARALLEL="-j 2"
 
 # You usually don't need to change anything below this line.
 
 # -----------------------------------------------------------------------------
 
 VER_LIBICONV=1.14
-VER_GETTEXT=0.18.2
-VER_LIBFFI=3.0.11
-VER_GLIB=2.34.3
-VER_LIBZIP=0.10.1
-VER_LIBUSB=0.1.12
-VER_LIBFTDI=0.20
+VER_GETTEXT=0.18.3
+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_LIBFTDI1=1.1
+VER_LIBUSBX=1.0.17
+VER_PYTHON=3.3.3
+VER_BOOST=1.55.0
+VER_QT=5.2.1
 
 SF_MIRROR=switch.dl.sourceforge.net
 
-# -----------------------------------------------------------------------------
+WGET="wget --quiet"
+GIT_CLONE="git clone --depth=1"
 
-# We need to find tools in the toolchain and in the install directory.
-export PATH=$PREFIX/bin:$TOOLCHAIN/bin:$PATH
+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;;
+esac
 
-# Define some helper variables.
-C="--host=arm-linux-androideabi --prefix=$PREFIX"
-P="$PREFIX/lib/pkgconfig"
+# -----------------------------------------------------------------------------
 
 # Remove build directory contents (if any) and create a new build dir.
 rm -rf $BUILDDIR
 mkdir $BUILDDIR
 cd $BUILDDIR
 
+# Build host Python before we start messing with the environment.
+$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
+mv python hostpython
+mv Parser/pgen Parser/hostpgen
+cd ..
+
+# -----------------------------------------------------------------------------
+
+# We need to find tools in the toolchain.
+export PATH=$TOOLCHAIN/bin:$PATH
+
+# Tell pkg-config to only look for our cross-built stuff.
+export PKG_CONFIG_LIBDIR="$PREFIX/lib/pkgconfig"
+export -n PKG_CONFIG_PATH
+
+# Define some helper variables.
+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}"
+
 # Get the latest versions of config.guess/config.sub that know about Android.
-git clone git://git.savannah.gnu.org/config.git
+$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
+patch < ../android.toolchain.cmake.patch android.toolchain.cmake
 
 # -----------------------------------------------------------------------------
 
-## # TODO: Doesn't build yet.
-## # libiconv (needed for glib)
-## wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$VER_LIBICONV.tar.gz
-## tar xfz libiconv-$VER_LIBICONV.tar.gz
-## cd libiconv-$VER_LIBICONV
-## cp -f ../config/config.guess build-aux
-## cp -f ../config/config.sub build-aux
-## cp -f ../config/config.guess libcharset/build-aux
-## cp -f ../config/config.sub libcharset/build-aux
-## ./configure $C && make && make install
-## cd ..
-
-## # TODO: Needs libiconv
-## # gettext (needed for glib)
-## wget http://ftp.gnu.org/pub/gnu/gettext/gettext-$VER_GETTEXT.tar.gz
-## tar xfz gettext-$VER_GETTEXT.tar.gz
-## cd gettext-$VER_GETTEXT
-## ./configure $C && make && make install
-## cd ..
+# Python (needed for libsigrokdecode)
+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
+cd ..
+
+# libiconv (needed for glib)
+$WGET http://ftp.gnu.org/pub/gnu/libiconv/libiconv-$VER_LIBICONV.tar.gz
+tar xfz libiconv-$VER_LIBICONV.tar.gz
+cd libiconv-$VER_LIBICONV
+cp -f ../config/config.guess build-aux
+cp -f ../config/config.sub build-aux
+cp -f ../config/config.guess libcharset/build-aux
+cp -f ../config/config.sub libcharset/build-aux
+./configure $C --enable-shared
+make lib/localcharset.h
+cd libcharset
+make $PARALLEL
+make install
+cd ../lib
+make $PARALLEL
+make install
+cd ..
+test -d $PREFIX/include || mkdir $PREFIX/include
+cp include/iconv.h.inst $PREFIX/include/iconv.h
+cd ..
+
+# gettext (needed for glib)
+$WGET http://ftp.gnu.org/pub/gnu/gettext/gettext-$VER_GETTEXT.tar.gz
+tar xfz gettext-$VER_GETTEXT.tar.gz
+cd gettext-$VER_GETTEXT
+./configure $C --enable-shared --disable-libasprintf
+cd gettext-runtime
+make $PARALLEL
+make install
+cd ../..
 
 # zlib (needed for glib and libzip)
-# TODO
+$WGET http://zlib.net/zlib-$VER_ZLIB.tar.gz
+tar xfvz zlib-$VER_ZLIB.tar.gz
+cd zlib-$VER_ZLIB
+# Note: zlib's configure doesn't understand --host, we need to pass $CC.
+CC=$TOOLCHAIN_TRIPLET-gcc ./configure --prefix=$PREFIX
+make $PARALLEL
+make install
+cd ..
 
 # pcre (needed for glib)
-# TODO
+$WGET ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$VER_PCRE.tar.gz
+tar xfvz pcre-$VER_PCRE.tar.gz
+cd pcre-$VER_PCRE
+./configure $C --disable-cpp
+make $PARALLEL
+make install
+cd ..
 
 # libffi (needed for glib)
-wget ftp://sourceware.org/pub/libffi/libffi-$VER_LIBFFI.tar.gz
+$WGET ftp://sourceware.org/pub/libffi/libffi-$VER_LIBFFI.tar.gz
 tar xfz libffi-$VER_LIBFFI.tar.gz
 cd libffi-$VER_LIBFFI
-./configure $C && make && make install
+./configure $C
+make $PARALLEL
+make install
 cd ..
 
-## # TODO: Not all build-dependencies build, yet.
-## # glib
-## wget ftp://ftp.gnome.org/pub/gnome/sources/glib/2.34/glib-$VER_GLIB.tar.xz
-## tar xfJ glib-$VER_GLIB.tar.xz
-## cd glib-$VER_GLIB
-## ./configure $C && make && make install
-## cd ..
+# glib
+$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
+./autogen.sh
+# Note: Manual LDFLAGS/CPPFLAGS needed for libiconv, rest uses pkg-config.
+LDFLAGS=-L$PREFIX/lib CPPFLAGS=-I$PREFIX/include glib_cv_stack_grows=no glib_cv_uscore=no ac_cv_func_posix_getpwuid_r=no ac_cv_func_posix_getgrgid_r=no ./configure --disable-compile-warnings $C
+make $PARALLEL
+make install
+cd ..
 
 # libzip
-wget http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz
+$WGET http://www.nih.at/libzip/libzip-$VER_LIBZIP.tar.gz
 tar xfz libzip-$VER_LIBZIP.tar.gz
 cd libzip-$VER_LIBZIP
 cp -f ../config/config.guess .
 cp -f ../config/config.sub .
-./configure $C && make && make install
+./configure $C
+make $PARALLEL
+make install
 cd ..
 
-# libusb-0.1 (not used directly, but needed for libftdi)
-wget http://$SF_MIRROR/project/libusb/libusb-0.1%20%28LEGACY%29/$VER_LIBUSB/libusb-$VER_LIBUSB.tar.gz
-tar xfz libusb-$VER_LIBUSB.tar.gz
-cd libusb-$VER_LIBUSB
-cp -f ../config/config.guess .
-cp -f ../config/config.sub .
-./configure $C && make && make install
+# 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
+patch -p1 < ../../libusb-1.0.patch
+./configure $C --disable-udev
+make $PARALLEL
+make install
 cd ..
 
-# libftdi
-wget http://www.intra2net.com/en/developer/libftdi/download/libftdi-$VER_LIBFTDI.tar.gz
-tar xfz libftdi-$VER_LIBFTDI.tar.gz
-cd libftdi-$VER_LIBFTDI
-cp -f ../config/config.guess .
-cp -f ../config/config.sub .
-./configure $C && make && make install
+# libftdi1
+$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 .
+make $PARALLEL
+make install
+cd ..
+
+# libserialport
+$GIT_CLONE git://sigrok.org/libserialport
+cd libserialport
+./autogen.sh
+./configure $C
+make $PARALLEL V=1
+make install
+cd ..
+
+# libsigrok
+$GIT_CLONE git://sigrok.org/libsigrok
+cd libsigrok
+./autogen.sh
+./configure $C
+make $PARALLEL V=1
+make install
+cd ..
+
+# libsigrokdecode
+$GIT_CLONE git://sigrok.org/libsigrokdecode
+cd libsigrokdecode
+./autogen.sh
+./configure $C
+make $PARALLEL V=1
+make install
+cd ..
+
+# sigrok-cli
+$GIT_CLONE git://sigrok.org/sigrok-cli
+cd sigrok-cli
+./autogen.sh
+./configure $C
+make $PARALLEL V=1
+make install
+cd ..
+
+
+# Check if we have kit to build PulseView
+
+if [ -z "$ANDROID_NDK" -o ! -d "$ANDROID_NDK" ]; then
+  echo "Android NDK not available, not building PulseView"
+  exit 0
+fi
+
+if [ -z "$ANDROID_SDK" -o ! -d "$ANDROID_SDK"/platforms/android-8 -o \
+     ! -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"
+  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)
+$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
+cd ..
+
+# 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
+./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 -opensource -confirm-license
+make $PARALLEL
+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 .
+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 -r "$PREFIX"/lib/python3.3 assets/
+cp -r "$PREFIX"/share/libsigrokdecode assets/
+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
+ant debug
+cd ../..