kivy · tito · Mar 4, 2015 · Feb 12, 2014 · Feb 26, 2014 · Mar 14, 2014
diff --git a/distribute.sh b/distribute.sh
@@ -42,6 +42,12 @@ if [ "X$VIRTUALENV_NAME" == "X" ]; then
 	VIRTUALENV_NAME="$(which virtualenv)"
 fi
 
+# Resolve Cython path
+CYTHON="$(which cython2)"
+if [ "X$CYTHON" == "X" ]; then
+        CYTHON="$(which cython)"
+fi
+
 # Paths
 ROOT_PATH="$(dirname $($PYTHON -c 'from __future__ import print_function; import os,sys;print(os.path.realpath(sys.argv[1]))' $0))"
 RECIPES_PATH="$ROOT_PATH/recipes"
@@ -54,13 +60,16 @@ JNI_PATH="$SRC_PATH/jni"
 DIST_PATH="$ROOT_PATH/dist/default"
 SITEPACKAGES_PATH="$BUILD_PATH/python-install/lib/python2.7/site-packages/"
 HOSTPYTHON="$BUILD_PATH/python-install/bin/python.host"
+CYTHON+=" -t"
 
 # Tools
 export LIBLINK_PATH="$BUILD_PATH/objects"
 export LIBLINK="$ROOT_PATH/src/tools/liblink"
 export BIGLINK="$ROOT_PATH/src/tools/biglink"
-export PIP=$PIP_NAME
-export VIRTUALENV=$VIRTUALENV_NAME
+export PIP=${PIP_NAME:-pip}
+export VIRTUALENV=${VIRTUALENV_NAME:-virtualenv}
+
+export COPYLIBS=0
 
 MD5SUM=$(which md5sum)
 if [ "X$MD5SUM" == "X" ]; then
@@ -146,7 +155,7 @@ function get_directory() {
 }
 
 function push_arm() {
-	info "Entering in ARM enviromnent"
+	info "Entering in ARM environment"
 
 	# save for pop
 	export OLD_PATH=$PATH
@@ -189,8 +198,11 @@ function push_arm() {
         export TOOLCHAIN_PREFIX=arm-linux-androideabi
         export TOOLCHAIN_VERSION=4.4.3
     elif  [ "X${ANDROIDNDKVER:0:2}" == "Xr9" ]; then
-            export TOOLCHAIN_PREFIX=arm-linux-androideabi
-            export TOOLCHAIN_VERSION=4.8
+        export TOOLCHAIN_PREFIX=arm-linux-androideabi
+        export TOOLCHAIN_VERSION=4.8
+    elif [ "X${ANDROIDNDKVER:0:3}" == "Xr10" ]; then
+        export TOOLCHAIN_PREFIX=arm-linux-androideabi
+        export TOOLCHAIN_VERSION=4.9
     else
         echo "Error: Please report issue to enable support for newer ndk."
         exit 1
@@ -216,6 +228,10 @@ function push_arm() {
 	export LD="$TOOLCHAIN_PREFIX-ld"
 	export STRIP="$TOOLCHAIN_PREFIX-strip --strip-unneeded"
 	export MAKE="make -j5"
+	export READELF="$TOOLCHAIN_PREFIX-readelf"
+
+	# This will need to be updated to support Python versions other than 2.7
+	export BUILDLIB_PATH="$BUILD_hostpython/build/lib.linux-`uname -m`-2.7/"
 
 	# Use ccache ?
 	which ccache &>/dev/null
@@ -252,6 +268,10 @@ function usage() {
 	echo "  -f                     Restart from scratch (remove the current build)"
 	echo "  -x                     display expanded values (execute 'set -x')"
 	echo
+	echo "Advanced:"
+	echo "  -C                     Copy libraries instead of using biglink"
+	echo "                         (may not work before Android 4.3)"
+	echo
 	echo "For developers:"
 	echo "  -u 'mod1 mod2'         Modules to update (if already compiled)"
 	echo
@@ -279,7 +299,7 @@ function check_build_deps() {
     DIST=$(lsb_release -is)
 	info "Check build dependencies for $DIST"
     case $DIST in
-		Debian|Ubuntu)
+		Debian|Ubuntu|LinuxMint)
 			check_pkg_deb_installed "build-essential zlib1g-dev cython"
 			;;
 		*)
@@ -344,6 +364,15 @@ function run_prepare() {
 		fi
 	done
 
+	if [ "$COPYLIBS" == "1" ]; then
+		info "Library files will be copied to the distribution (no biglink)"
+		error "NOTICE: This option is still beta!"
+		error "\tIf you encounter an error 'Failed to locate needed libraries!' and"
+		error "\tthe libraries listed are not supposed to be provided by your app or"
+		error "\tits dependencies, please submit a bug report at"
+		error "\thttps://github.com/kivy/python-for-android/issues"
+	fi
+
 	info "Distribution will be located at $DIST_PATH"
 	if [ -e "$DIST_PATH" ]; then
 		error "The distribution $DIST_PATH already exist"
@@ -526,6 +555,10 @@ function run_get_packages() {
 			try mkdir -p $BUILD_PATH/$module
 		fi
 
+		if [ ! -d "$PACKAGES_PATH/$module" ]; then
+			try mkdir -p "$PACKAGES_PATH/$module"
+		fi
+
 		if [ "X$url" == "X" ]; then
 			debug "No package for $module"
 			continue
@@ -535,7 +568,7 @@ function run_get_packages() {
 		marker_filename=".mark-$filename"
 		do_download=1
 
-		cd $PACKAGES_PATH
+		cd "$PACKAGES_PATH/$module"
 
 		# check if the file is already present
 		if [ -f $filename ]; then
@@ -605,7 +638,7 @@ function run_get_packages() {
 		fi
 
 		# decompress
-		pfilename=$PACKAGES_PATH/$filename
+		pfilename=$PACKAGES_PATH/$module/$filename
 		info "Extract $pfilename"
 		case $pfilename in
 			*.tar.gz|*.tgz )
@@ -704,7 +737,7 @@ function run_pymodules_install() {
 	debug "We want to install: $PYMODULES"
 
 	debug "Check if $VIRTUALENV and $PIP are present"
-	for tool in $VIRTUALENV $PIP; do
+	for tool in "$VIRTUALENV" "$PIP"; do
 		which $tool &>/dev/null
 		if [ $? -ne 0 ]; then
 			error "Tool $tool is missing"
@@ -719,10 +752,13 @@ function run_pymodules_install() {
 	fi
 
 	debug "Create a requirement file for pure-python modules"
-	try echo "$PYMODULES" | try sed 's/\ /\n/g' > requirements.txt
+	try echo "" > requirements.txt
+	for mod in $PYMODULES; do
+		echo $mod >> requirements.txt
+	done
 
 	debug "Install pure-python modules via pip in venv"
-	try bash -c "source venv/bin/activate && env CC=/bin/false CXX=/bin/false $PIP install --target '$SITEPACKAGES_PATH' --download-cache '$PACKAGES_PATH' -r requirements.txt"
+	try bash -c "source venv/bin/activate && env CC=/bin/false CXX=/bin/false pip install --target '$SITEPACKAGES_PATH' --download-cache '$PACKAGES_PATH' -r requirements.txt"
 
 }
 
@@ -759,7 +795,14 @@ function run_distribute() {
 	debug "Fill private directory"
 	try cp -a python-install/lib private/
 	try mkdir -p private/include/python2.7
-	try mv libs/$ARCH/libpymodules.so private/
+
+	if [ "$COPYLIBS" == "1" ]; then
+		if [ -s "libs/$ARCH/copylibs" ]; then
+			try sh -c "cat libs/$ARCH/copylibs | xargs -d'\n' cp -t private/"
+		fi
+	else
+		try mv libs/$ARCH/libpymodules.so private/
+	fi
 	try cp python-install/include/python2.7/pyconfig.h private/include/python2.7/
 
 	debug "Reduce private directory from unwanted files"
@@ -786,7 +829,11 @@ function run_distribute() {
 
 function run_biglink() {
 	push_arm
-	try $BIGLINK $LIBS_PATH/libpymodules.so $LIBLINK_PATH
+	if [ "$COPYLIBS" == "0" ]; then
+		try $BIGLINK $LIBS_PATH/libpymodules.so $LIBLINK_PATH
+	else
+		try $BIGLINK $LIBS_PATH/copylibs $LIBLINK_PATH
+	fi
 	pop_arm
 }
 
@@ -828,11 +875,16 @@ function arm_deduplicate() {
 
 
 # Do the build
-while getopts ":hvlfxm:u:d:s" opt; do
+while getopts ":hCvlfxm:u:d:s" opt; do
 	case $opt in
 		h)
 			usage
 			;;
+		C)
+			COPYLIBS=1
+			LIBLINK=${LIBLINK}-jb
+			BIGLINK=${BIGLINK}-jb
+			;;
 		l)
 			list_modules
 			;;

diff --git a/docs/source/android.rst b/docs/source/android.rst
@@ -1,11 +1,13 @@
 Python API
 ==========
 
-The Python for android project includes a Python module called "android". It
-consists of multiple parts which are mostly there to facilitate the use of the Java API.
+The Python for Android project includes a Python module called
+``android`` which consists of multiple parts that are mostly there to
+facilitate the use of the Java API.
 
-This module is not designed to be comprehensive. Most of the Java API is also accessible with PyJNIus,
-so if you can't find what you need here you can try using the Java API directly instead.
+This module is not designed to be comprehensive. Most of the Java API
+is also accessible with PyJNIus, so if you can't find what you need
+here you can try using the Java API directly instead.
 
 
 Android (``android``)
@@ -88,7 +90,7 @@ This billing module gives an access to the `In-App Billing <http://developer.and
 
 #. `Setup some In-App product <http://developer.android.com/guide/google/play/billing/billing_admin.html>`_ to buy. Let's say you've created a product with the id "org.kivy.gopremium"
 
-#. In your application, you can use the billing module like this::
+#. In your application, you can use the ``billing`` module like this::
 
 
     from android.billing import BillingService
@@ -123,7 +125,7 @@ This billing module gives an access to the `In-App Billing <http://developer.and
             # Return all the items purchased
             return self.service.get_purchased_items()
 
-#. To initiate an in-app purchase, just call the buy() method::
+#. To initiate an in-app purchase, just call the ``buy()`` method::
 
     # Note: start the service at the start, and never twice!
     bs = MyBillingService()
@@ -136,7 +138,7 @@ This billing module gives an access to the `In-App Billing <http://developer.and
 
 #. You'll receive all the notifications about the billing process in the callback.
 
-#. Last step, create your application with `--with-billing $BILLING_PUBKEY`::
+#. Last step, create your application with ``--with-billing $BILLING_PUBKEY``::
 
     ./build.py ... --with-billing $BILLING_PUBKEY
 

diff --git a/docs/source/contribute.rst b/docs/source/contribute.rst
@@ -5,16 +5,16 @@ Extending Python for android native support
 -------------------------------------------
 
 So, you want to get into python-for-android and extend what's available
-to python on android ?
+to Python on Android ?
 
 Turns out it's not very complicated, here is a little introduction on how to go
-about it. Without Pyjnius, the schema to access to Java API from Cython is::
+about it. Without Pyjnius, the schema to access the Java API from Cython is::
 
     [1] Cython -> [2] C JNI -> [3] Java
 
-Think about acceleration sensors : you want to get the acceleration values in
-python nothing is available natively, but you have a java API for that : the
-google API is available here
+Think about acceleration sensors: you want to get the acceleration
+values in Python, but nothing is available natively. Lukcily you have
+a Java API for that : the Google API is available here
 http://developer.android.com/reference/android/hardware/Sensor.html
 
 You can't use it directly, you need to do your own API to use it in python,
@@ -82,14 +82,14 @@ Jni gottchas
 Create your own recipes
 -----------------------
 
-A recipe is a script that contain the "definition" of a module to compile.
+A recipe is a script that contains the "definition" of a module to compile.
 The directory layout of a recipe for a <modulename> is something like::
 
     python-for-android/recipes/<modulename>/recipe.sh
     python-for-android/recipes/<modulename>/patches/
     python-for-android/recipes/<modulename>/patches/fix-path.patch
 
-When building, all the recipe build must go to::
+When building, all the recipe builds must go to::
 
     python-for-android/build/<modulename>/<archiveroot>
 
@@ -101,5 +101,5 @@ For example, if you want to create a recipe for sdl, do::
     sed -i 's#XXX#sdl#' sdl/recipe.sh
 
 Then, edit the sdl/recipe.sh to adjust other information (version, url) and
-complete build function.
+complete the build function.
 
diff --git a/docs/source/example_helloworld.rst b/docs/source/example_helloworld.rst
@@ -7,9 +7,9 @@ with this project.
 
 .. note::
 
-    Don't forget that Python for android is not Kivy only, and you might want
-    to use other toolkit libraries. When other toolkits will be available, this
-    documentation will be enhanced.
+    Don't forget that Python for Android is not Kivy only, and you
+    might want to use other toolkit libraries. When other toolkits
+    will be available, this documentation will be enhanced.
 
 Let's create a simple Hello world application, with one Label and one Button.
 
@@ -43,7 +43,7 @@ Let's create a simple Hello world application, with one Label and one Button.
     class HelloWorldScreen(GridLayout):
         counter = NumericProperty(0)
         def my_callback(self):
-            print 'The button have been pushed'
+            print 'The button has been pushed'
             self.counter += 1
 
     class HelloWorldApp(App):
@@ -55,15 +55,16 @@ Let's create a simple Hello world application, with one Label and one Button.
 
 #. Go to the ``python-for-android`` directory
 
-#. Create a distribute with kivy::
+#. Create a distribution with kivy::
 
     ./distribute.sh -m kivy
 
 #. Go to the newly created ``default`` distribution::
 
     cd dist/default
 
-#. Plug your android device, and ensure you can install development application
+#. Plug your android device, and ensure you can install development
+   application
 
 #. Build your hello world application in debug mode::
 
@@ -72,7 +73,7 @@ Let's create a simple Hello world application, with one Label and one Button.
 
 #. Take your device, and start the application!
 
-#. If it's goes wrong, open the logcat by doing::
+#. If something goes wrong, open the logcat by doing::
 
     adb logcat
 

diff --git a/docs/source/examples.rst b/docs/source/examples.rst
@@ -4,11 +4,12 @@ Examples
 Prebuilt VirtualBox
 -------------------
 
-A good starting point to build an APK are prebuilt VirtualBox images, where
-the Android NDK, the Android SDK and the Kivy Python-For-Android sources
-are prebuilt in an VirtualBox image. Please search the `Download Section 
-<http://kivy.org/#download>`__ for
-such an image.
+A good starting point to build an APK are prebuilt VirtualBox images,
+where the Android NDK, the Android SDK, and the Kivy
+Python-For-Android sources are prebuilt in an VirtualBox image. Please
+search the `Download Section <http://kivy.org/#download>`__ for such
+an image. You will also need to create a device filter for the Android
+USB device using the VirtualBox OS settings.
 
 .. include:: example_helloworld.rst
 .. include:: example_compass.rst

diff --git a/docs/source/faq.rst b/docs/source/faq.rst
@@ -10,9 +10,11 @@ Android. Go to :doc:`prerequisites.rst` to see which one are working.
 _sqlite3.so not found
 ---------------------
 
-We recently fixed sqlite3 compilation. In case of, you must:
+We recently fixed sqlite3 compilation. In case of this error, you
+must:
 
-* Install development headers for sqlite3 if it's not already installed. On Ubuntu:
+* Install development headers for sqlite3 if they are not already
+  installed. On Ubuntu:
 
     apt-get install libsqlite3-dev
 
@@ -26,4 +28,4 @@ We recently fixed sqlite3 compilation. In case of, you must:
     sqlite3/*
     lib-dynload/_sqlite3.so
 
-And then, sqlite3 will be compiled, and included in your APK.
+Then sqlite3 will be compiled and included in your APK.