Merge branch 'master' of ssh://github.com/kivy/python-for-android

tito · tito · commit cee74cf05b3e · 2013-10-14T13:34:06.000+02:00
diff --git a/distribute.sh b/distribute.sh
@@ -7,7 +7,7 @@
 #------------------------------------------------------------------------------
 
 # Modules
-MODULES=$MODULES
+MODULES=
 
 # Resolve Python path
 PYTHON="$(which python2.7)"
@@ -152,15 +152,16 @@ function push_arm() {
 		PYPLATFORM="linux"
 	fi
 
-	if [ "X$ANDROIDNDKVER" == "Xr5b" ]; then
-		export TOOLCHAIN_PREFIX=arm-eabi
-		export TOOLCHAIN_VERSION=4.4.0
-	else
-		#if [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ] || [ "X$ANDROIDNDKVER" == "Xr8" ]; then
-		# assume this toolchain is the same for all the next ndk... until a new one is out.
-		export TOOLCHAIN_PREFIX=arm-linux-androideabi
-		export TOOLCHAIN_VERSION=4.4.3
-	fi
+    if [ "X$ANDROIDNDKVER" == "Xr5b" ]; then
+        export TOOLCHAIN_PREFIX=arm-eabi
+        export TOOLCHAIN_VERSION=4.4.0
+    elif [ "X${ANDROIDNDKVER:0:2}" == "Xr7" ] || [ "X${ANDROIDNDKVER:0:2}" == "Xr8" ]; then
+        export TOOLCHAIN_PREFIX=arm-linux-androideabi
+        export TOOLCHAIN_VERSION=4.4.3
+    elif  [ "X${ANDROIDNDKVER}" == "Xr9" ]; then
+            export TOOLCHAIN_PREFIX=arm-linux-androideabi
+            export TOOLCHAIN_VERSION=4.8
+    fi
 
 	export PATH="$ANDROIDNDK/toolchains/$TOOLCHAIN_PREFIX-$TOOLCHAIN_VERSION/prebuilt/$PYPLATFORM-x86/bin/:$ANDROIDNDK/toolchains/$TOOLCHAIN_PREFIX-$TOOLCHAIN_VERSION/prebuilt/$PYPLATFORM-x86_64/bin/:$ANDROIDNDK:$ANDROIDSDK/tools:$PATH"
 
@@ -358,6 +359,26 @@ function in_array() {
 }
 
 function run_source_modules() {
+	# preprocess version modules
+	needed=($MODULES)
+	while [ ${#needed[*]} -ne 0 ]; do
+
+		# pop module from the needed list
+		module=${needed[0]}
+		unset needed[0]
+		needed=( ${needed[@]} )
+
+		# is a version is specified ?
+		items=( ${module//==/ } )
+		module=${items[0]}
+		version=${items[1]}
+		if [ ! -z "$version" ]; then
+			info "Specific version detected for $module: $version"
+			eval "VERSION_$module=$version"
+		fi
+	done
+
+
 	needed=($MODULES)
 	declare -a processed
 
@@ -374,6 +395,11 @@ function run_source_modules() {
 		unset needed[0]
 		needed=( ${needed[@]} )
 
+		# split the version if exist
+		items=( ${module//==/ } )
+		module=${items[0]}
+		version=${items[1]}
+
 		# check if the module have already been declared
 		in_array $module "${processed[@]}"
 		if [ $? -ne 255 ]; then
@@ -393,6 +419,13 @@ function run_source_modules() {
 		fi
 		source $RECIPES_PATH/$module/recipe.sh
 
+		# if a version has been specified by the user, the md5 will not
+		# correspond at all. so deactivate it.
+		if [ ! -z "$version" ]; then
+			debug "Deactivate MD5 test for $module, due to specific version"
+			eval "MD5_$module="
+		fi
+
 		# append current module deps to the needed
 		deps=$(echo \$"{DEPS_$module[@]}")
 		eval deps=($deps)
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
@@ -17,6 +17,12 @@ You can include other modules (or "recipes") to compile using `-m`::
     ./distribute.sh -m "openssl kivy"
     ./distribute.sh -m "pil ffmpeg kivy"
 
+You can also specify a specific version for each package. Please note that the
+compilation might **break** if you don't use the default version. Most recipes
+have patch to fixes android issues, and might not apply if you specify a
+version. We also recommand to clean build/ before changing version.::
+
+    ./distribute.sh -m "openssl kivy==master"
 
 The list of available recipes is available at:
 https://github.com/kivy/python-for-android/tree/master/recipes
diff --git a/recipes/audiostream/recipe.sh b/recipes/audiostream/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-VERSION_audiostream=
-URL_audiostream=https://github.com/kivy/audiostream/zipball/master/audiostream.zip
+VERSION_audiostream=${VERSION_audiostream:-master}
+URL_audiostream=https://github.com/kivy/audiostream/zipball/$VERSION_audiostream/audiostream.zip
 DEPS_audiostream=(python sdl pyjnius)
 MD5_audiostream=
 BUILD_audiostream=$BUILD_PATH/audiostream/audiostream
diff --git a/recipes/cymunk/recipe.sh b/recipes/cymunk/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-VERSION_cymunk=
-URL_cymunk=http://github.com/tito/cymunk/zipball/master/cymunk.zip
+VERSION_cymunk=${VERSION_cymunk:-master}
+URL_cymunk=http://github.com/tito/cymunk/zipball/$VERSION_cymunk/cymunk.zip
 DEPS_cymunk=(python)
 MD5_cymunk=
 BUILD_cymunk=$BUILD_PATH/cymunk/$(get_directory $URL_cymunk)
diff --git a/recipes/docutils/recipe.sh b/recipes/docutils/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-VERSION_docutils=
-URL_docutils=http://prdownloads.sourceforge.net/docutils/docutils-0.9.1.tar.gz
+VERSION_docutils=${VERSION_docutils:-0.9.1}
+URL_docutils=http://prdownloads.sourceforge.net/docutils/docutils-$VERSION_docutils.tar.gz
 DEPS_docutils=(pil)
 MD5_docutils=
 BUILD_docutils=$BUILD_PATH/docutils/$(get_directory $URL_docutils)
diff --git a/recipes/ffmpeg/recipe.sh b/recipes/ffmpeg/recipe.sh
@@ -2,8 +2,8 @@
 # Recent change made ffmpeg not compatible with python-for-android yet.
 # Only h264+aac build are working.
 
-VERSION_ffmpeg=
-URL_ffmpeg=https://github.com/tito/ffmpeg-android/zipball/master/ffmpeg-android.zip
+VERSION_ffmpeg=${VERSION_ffmpeg:-master}
+URL_ffmpeg=https://github.com/tito/ffmpeg-android/zipball/$VERSION_ffmpeg/ffmpeg-android.zip
 DEPS_ffmpeg=(python sdl)
 MD5_ffmpeg=
 BUILD_ffmpeg=$BUILD_PATH/ffmpeg/ffmpeg-android
diff --git a/recipes/gevent/recipe.sh b/recipes/gevent/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_gevent=0.13.8
+VERSION_gevent=${VERSION_gevent:-0.13.8}
 URL_gevent=https://pypi.python.org/packages/source/g/gevent/gevent-$VERSION_gevent.tar.gz
 DEPS_gevent=(libevent greenlet)
 MD5_gevent=ca9dcaa7880762d8ebbc266b11252960
diff --git a/recipes/greenlet/recipe.sh b/recipes/greenlet/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_greenlet=0.4.1
+VERSION_greenlet=${VERSION_greenlet:-0.4.1}
 URL_greenlet=https://pypi.python.org/packages/source/g/greenlet/greenlet-$VERSION_greenlet.zip
 https://github.com/downloads/greenlet/greenlet/greenlet-$VERSION_greenlet.tar.gz
 DEPS_greenlet=(python)
diff --git a/recipes/kivy/recipe.sh b/recipes/kivy/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-VERSION_kivy=
-URL_kivy=https://github.com/kivy/kivy/zipball/stable/kivy-stable.zip
+VERSION_kivy=${VERSION_kivy:-stable}
+URL_kivy=https://github.com/kivy/kivy/zipball/$VERSION_kivy/kivy-$VERSION_kivy.zip
 DEPS_kivy=(pygame pyjnius android)
 MD5_kivy=
 BUILD_kivy=$BUILD_PATH/kivy/$(get_directory $URL_kivy)
diff --git a/recipes/libevent/recipe.sh b/recipes/libevent/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_libevent=2.0.21-stable
+VERSION_libevent=${VERSION_libevent:-2.0.21-stable}
 URL_libevent=https://github.com/downloads/libevent/libevent/libevent-$VERSION_libevent.tar.gz
 DEPS_libevent=(python)
 MD5_libevent=b2405cc9ebf264aa47ff615d9de527a2
diff --git a/recipes/libxml2/recipe.sh b/recipes/libxml2/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_libxml2=2.7.8
+VERSION_libxml2=${VERSION_libxml2:-2.7.8}
 URL_libxml2=ftp://xmlsoft.org/libxml2/libxml2-$VERSION_libxml2.tar.gz
 DEPS_libxml2=()
 MD5_libxml2=8127a65e8c3b08856093099b52599c86
diff --git a/recipes/libxslt/recipe.sh b/recipes/libxslt/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_libxslt=1.1.27
+VERSION_libxslt=${VERSION_libxslt:-1.1.27}
 URL_libxslt=ftp://xmlsoft.org/libxml2/libxslt-$VERSION_libxslt.tar.gz
 DEPS_libxslt=(libxml2)
 MD5_libxslt=
diff --git a/recipes/lxml/recipe.sh b/recipes/lxml/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_lxml=2.3.6
+VERSION_lxml=${VERSION_lxml:-2.3.6}
 URL_lxml=http://pypi.python.org/packages/source/l/lxml/lxml-$VERSION_lxml.tar.gz
 DEPS_lxml=(libxml2 libxslt python)
 MD5_lxml=d5d886088e78b1bdbfd66d328fc2d0bc
diff --git a/recipes/msgpack/recipe.sh b/recipes/msgpack/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_msgpack=0.3.0
+VERSION_msgpack=${VERSION_msgpack:-0.3.0}
 URL_msgpack=https://pypi.python.org/packages/source/m/msgpack-python/msgpack-python-$VERSION_msgpack.tar.gz
 DEPS_msgpack=(python setuptools)
 MD5_msgpack=10dec96c90992b0f6e38bdf0cc5a8e79
diff --git a/recipes/mysql_connector/recipe.sh b/recipes/mysql_connector/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_mysql_connector=1.0.8
+VERSION_mysql_connector=${VERSION_mysql_connector:-1.0.8}
 URL_mysql_connector=http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-$VERSION_mysql_connector.tar.gz
 DEPS_mysql_connector=(python)
 MD5_mysql_connector=1f2dd335c72684d51ee5d34f127d7ca9
diff --git a/recipes/numpy/recipe.sh b/recipes/numpy/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_numpy=1.7.1
+VERSION_numpy=${VERSION_numpy:-1.7.1}
 URL_numpy=http://pypi.python.org/packages/source/n/numpy/numpy-$VERSION_numpy.tar.gz
 DEPS_numpy=(python)
 MD5_numpy=0ab72b3b83528a7ae79c6df9042d61c6
diff --git a/recipes/openssl/recipe.sh b/recipes/openssl/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_openssl=1.0.1c
+VERSION_openssl=${VERSION_openssl:-1.0.1c}
 URL_openssl=http://www.openssl.org/source/openssl-$VERSION_openssl.tar.gz
 DEPS_openssl=()
 MD5_openssl=ae412727c8c15b67880aef7bd2999b2e
diff --git a/recipes/paramiko/recipe.sh b/recipes/paramiko/recipe.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-VERSION_paramiko=1.10.1
+
+VERSION_paramiko=${VERSION_paramiko:-1.10.1}
 DEPS_paramiko=(pycrypto python)
 URL_paramiko=http://pypi.python.org/packages/source/p/paramiko/paramiko-$VERSION_paramiko.tar.gz
 MD5_paramiko=4ba105e2d8535496fd633889396b20b7
diff --git a/recipes/pil/recipe.sh b/recipes/pil/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_pil=1.1.7
+VERSION_pil=${VERSION_pil:-1.1.7}
 URL_pil=http://effbot.org/downloads/Imaging-$VERSION_pil.tar.gz
 DEPS_pil=(png jpeg python)
 MD5_pil=fc14a54e1ce02a0225be8854bfba478e
diff --git a/recipes/pyasn1/recipe.sh b/recipes/pyasn1/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-VERSION_pyasn1=2.5
-URL_pyasn1=http://downloads.sourceforge.net/project/pyasn1/pyasn1/0.1.4/pyasn1-0.1.4.tar.gz
+VERSION_pyasn1=${VERSION_pyasn1:-0.1.4}
+URL_pyasn1=http://downloads.sourceforge.net/project/pyasn1/pyasn1/$VERSION_pyasn1/pyasn1-$VERSION_pyasn1.tar.gz
 DEPS_pyasn1=(python)
 MD5_pyasn1=
 BUILD_pyasn1=$BUILD_PATH/pyasn1/$(get_directory $URL_pyasn1)
diff --git a/recipes/pycrypto/recipe.sh b/recipes/pycrypto/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_pycrypto=2.5
+VERSION_pycrypto=${VERSION_pycrypto:-2.5}
 URL_pycrypto=http://pypi.python.org/packages/source/p/pycrypto/pycrypto-$VERSION_pycrypto.tar.gz
 DEPS_pycrypto=(openssl python)
 MD5_pycrypto=783e45d4a1a309e03ab378b00f97b291
diff --git a/recipes/pygame/recipe.sh b/recipes/pygame/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_pygame=1.9.1
+VERSION_pygame=${VERSION_pygame:-1.9.1}
 URL_pygame=http://pygame.org/ftp/pygame-$(echo $VERSION_pygame)release.tar.gz
 DEPS_pygame=(python sdl)
 MD5_pygame=1c4cdc708d17c8250a2d78ef997222fc
diff --git a/recipes/pyjnius/recipe.sh b/recipes/pyjnius/recipe.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-VERSION_pyjnius=
-URL_pyjnius=https://github.com/kivy/pyjnius/zipball/master/pyjnius-master.zip
+VERSION_pyjnius=${VERSION_pyjnius:-master}
+URL_pyjnius=https://github.com/kivy/pyjnius/zipball/$VERSION_pyjnius/pyjnius-$VERSION_pyjnius.zip
 DEPS_pyjnius=(python sdl)
 MD5_pyjnius=
 BUILD_pyjnius=$BUILD_PATH/pyjnius/$(get_directory $URL_pyjnius)
diff --git a/recipes/pylibpd/recipe.sh b/recipes/pylibpd/recipe.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-VERSION_pylibpd=
+VERSION_pylibpd=${VERSION_pylibpd:-master}
 DEPS_pylibpd=(python)
-URL_pylibpd=https://github.com/libpd/libpd/archive/master.zip
+URL_pylibpd=https://github.com/libpd/libpd/archive/$VERSION_pylibpd.zip
 MD5_pylibpd=
 BUILD_pylibpd=$BUILD_PATH/pylibpd/$(get_directory $URL_pylibpd)
 RECIPE_pylibpd=$RECIPES_PATH/pylibpd
diff --git a/recipes/pyopenssl/recipe.sh b/recipes/pyopenssl/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_pyopenssl=0.13
+VERSION_pyopenssl=${VERSION_pyopenssl:-0.13}
 URL_pyopenssl=http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-$VERSION_pyopenssl.tar.gz
 DEPS_pyopenssl=(openssl python)
 MD5_pyopenssl=767bca18a71178ca353dff9e10941929
diff --git a/recipes/pyparsing/recipe.sh b/recipes/pyparsing/recipe.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+VERSION_pyparsing=${VERSION_pyparsing:-2.0.1}
+DEPS_pyparsing=(python)
+URL_pyparsing=http://pypi.python.org/packages/source/p/pyparsing/pyparsing-$VERSION_pyparsing.tar.gz
+MD5_pyparsing=37adec94104b98591507218bc82e7c31
+BUILD_pyparsing=$BUILD_PATH/pyparsing/$(get_directory $URL_pyparsing)
+RECIPE_pyparsing=$RECIPES_PATH/pyparsing
+
+# function called for preparing source code if needed
+# (you can apply patch etc here.)
+function prebuild_pyparsing() {
+	true
+}
+
+# function called to build the source code
+function build_pyparsing() {
+
+    if [ -d "$BUILD_PATH/python-install/lib/python2.7/site-packages/pyparsing" ]; then
+		return
+	fi
+
+	cd $BUILD_pyparsing
+	push_arm
+	export EXTRA_CFLAGS="--host linux-armv"
+	try $BUILD_PATH/python-install/bin/python.host setup.py install -O2
+	pop_arm
+}
+
+# function called after all the compile have been done
+function postbuild_pyparsing() {
+	true
+}
+
diff --git a/recipes/recipe.sh.tmpl b/recipes/recipe.sh.tmpl
@@ -5,7 +5,7 @@
 error "not configure" && exit -1
 
 # version of your package
-VERSION_xxx=1.3
+VERSION_xxx=${VERSION_xxx:-1.3}
 
 # dependencies of this recipe
 DEPS_xxx=()
diff --git a/recipes/setuptools/recipe.sh b/recipes/setuptools/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_setuptools=0.6c11
+VERSION_setuptools=${VERSION_setuptools:-0.6c11}
 URL_setuptools=http://pypi.python.org/packages/source/s/setuptools/setuptools-$VERSION_setuptools.tar.gz
 DEPS_setuptools=(python)
 MD5_setuptools=7df2a529a074f613b509fb44feefe74e
diff --git a/recipes/sqlalchemy/recipe.sh b/recipes/sqlalchemy/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_sqlalchemy=0.8.2
+VERSION_sqlalchemy=${VERSION_sqlalchemy:-0.8.2}
 DEPS_sqlalchemy=(python)
 URL_sqlalchemy=https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-${VERSION_sqlalchemy}.tar.gz
 MD5_sqlalchemy=5a33fb43dea93468dbb2a6562ee80b54
@@ -29,4 +29,4 @@ function build_sqlalchemy() {
 
 function postbuild_sqlalchemy() {
 	true
-}
+}
diff --git a/recipes/twisted/recipe.sh b/recipes/twisted/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_twisted=11.1
+VERSION_twisted=${VERSION_twisted:-11.1}
 URL_twisted=http://twistedmatrix.com/Releases/Twisted/$VERSION_twisted/Twisted-$VERSION_twisted.0.tar.bz2
 DEPS_twisted=(zope)
 MD5_twisted=
diff --git a/recipes/txws/recipe.sh b/recipes/txws/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_txws=0.7
+VERSION_txws=${VERSION_txws:-0.7}
 URL_txws=http://pypi.python.org/packages/source/t/txWS/txWS-$VERSION_txws.tar.gz
 DEPS_txws=(twisted)
 MD5_txws=e8f5fb03c189d83b47b21176c7574126
diff --git a/recipes/wokkel/recipe.sh b/recipes/wokkel/recipe.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION_wokkel=0.7.0
+VERSION_wokkel=${VERSION_wokkel:-0.7.0}
 URL_wokkel=http://pypi.python.org/packages/source/w/wokkel/wokkel-$VERSION_wokkel.tar.gz
 DEPS_wokkel=(setuptools twisted)
 MD5_wokkel=fffc7bf564cf1d7d1ccaa6c5d18d6a76
diff --git a/recipes/zope/recipe.sh b/recipes/zope/recipe.sh
diff --git a/src/tools/liblink b/src/tools/liblink
