Merge branch 'master' into macosx

tito · tito · commit f970c7ab8316 · 2012-08-01T19:43:25.000+02:00
Conflicts:
	distribute.sh
	recipes/hostpython/recipe.sh
diff --git a/distribute.sh b/distribute.sh
@@ -124,8 +124,8 @@ function push_arm() {
 	#export OFLAG="-Os"
 	#export OFLAG="-O2"
 
-	export CFLAGS="-mandroid $OFLAG -fomit-frame-pointer --sysroot $NDKPLATFORM -fPIC"
-	if [ $ARCH == "armeabi-v7a" ]; then
+	export CFLAGS="-mandroid $OFLAG -fomit-frame-pointer --sysroot $NDKPLATFORM"
+	if [ "X$ARCH" == "Xarmeabi-v7a" ]; then
 		CFLAGS+=" -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -mthumb"
 	fi
 	export CXXFLAGS="$CFLAGS"
diff --git a/docs/source/prerequisites.rst b/docs/source/prerequisites.rst
@@ -1,6 +1,10 @@
 Prerequisites
 =============
 
+.. note::
+    There is a VirtualBox Image we provide with the prerequisites along with
+    Android SDK and NDK preinstalled to ease your installation woes. You can download it from `here <http://www.google.com/url?sa=D&q=https://docs.google.com/file/d/0B1WO07-OL50_VDNESDRUaDhXSmM/edit&usg=AFQjCNGrsg0SU8EMgAcLHWxbjSe8KM2kyA>`__.
+
 .. warning::
 
     The current version is tested only on Ubuntu oneiric (11.10) and precise
@@ -58,5 +62,5 @@ After installing them, export both installation path, NDK version and API to use
 
 Also, you must configure you're PATH to add the ``android`` binary::
 
-    export PATH=/path/to/android-ndk:/path/to/android-sdk-linux/tools:$PATH
+    export PATH=$ANDROIDNDK:$ANDROIDSDK/tools:$PATH
 
diff --git a/recipes/hostpython/recipe.sh b/recipes/hostpython/recipe.sh
@@ -24,13 +24,16 @@ function build_hostpython() {
 
     try ./configure
     try make -j5
-    try mv python.exe hostpython
     try mv Parser/pgen hostpgen
-    #try mkdir -p ../prebuilt/Python-$PYVERSION/lib
-    #try cp hostpython ../prebuilt/Python-$PYVERSION/
-    #try cp hostpgen ../prebuilt/Python-$PYVERSION/
-    #try cp build/lib.*/*.so ../prebuilt/Python-$PYVERSION/lib/
-    #try cd ..
+
+	if [ -f python.exe ]; then
+		try mv python.exe hostpython
+	elif [ -f python ]; then
+		try mv python hostpython
+	else
+		error "Unable to found the python executable?"
+		exit 1
+	fi
 }
 
 function postbuild_hostpython() {
