add pure-python modules support into distribute -m

tito · tito · commit 82da05c75495 · 2013-10-17T10:07:03.000+02:00
diff --git a/distribute.sh b/distribute.sh
@@ -33,6 +33,7 @@ DIST_PATH="$ROOT_PATH/dist/default"
 export LIBLINK_PATH="$BUILD_PATH/objects"
 export LIBLINK="$ROOT_PATH/src/tools/liblink"
 export BIGLINK="$ROOT_PATH/src/tools/biglink"
+export PIP="pip-2.7"
 
 MD5SUM=$(which md5sum)
 if [ "X$MD5SUM" == "X" ]; then
@@ -381,6 +382,7 @@ function run_source_modules() {
 
 	needed=($MODULES)
 	declare -a processed
+	declare -a pymodules
 
 	fn_deps='.deps'
 	fn_optional_deps='.optional-deps'
@@ -392,6 +394,7 @@ function run_source_modules() {
 
 		# pop module from the needed list
 		module=${needed[0]}
+		original_module=${needed[0]}
 		unset needed[0]
 		needed=( ${needed[@]} )
 
@@ -414,8 +417,9 @@ function run_source_modules() {
 		debug "Read $module recipe"
 		recipe=$RECIPES_PATH/$module/recipe.sh
 		if [ ! -f $recipe ]; then
-			error "Recipe $module does not exist"
-			exit -1
+			error "Recipe $module does not exist, adding the module as pure-python package"
+			pymodules+=($original_module)
+			continue;
 		fi
 		source $RECIPES_PATH/$module/recipe.sh
 
@@ -446,6 +450,10 @@ function run_source_modules() {
 	MODULES="$($PYTHON tools/depsort.py --optional $fn_optional_deps < $fn_deps)"
 
 	info "Modules changed to $MODULES"
+
+	PYMODULES="${pymodules[@]}"
+
+	info "Pure-Python modules changed to $PYMODULES"
 }
 
 function run_get_packages() {
@@ -589,6 +597,40 @@ function run_postbuild() {
 	done
 }
 
+function run_pymodules_install() {
+	info "Run pymodules install"
+	if [ "X$PYMODULES" == "X" ]; then
+		debug "No pymodules to install"
+		return
+	fi
+
+	cd "$BUILD_PATH"
+
+	debug "We want to install: $PYMODULES"
+
+	debug "Check if $VIRTUALENV and $PIP are present"
+	for tool in $VIRTUALENV $PIP; do
+		which $tool &>/dev/null
+		if [ $? -ne 0 ]; then
+			error "Tool $tool is missing"
+			exit -1
+		fi
+	done
+	
+	debug "Check if virtualenv is existing"
+	if [ ! -d venv ]; then
+		debug "Installing virtualenv"
+		try $VIRTUALENV --python=python2.7 venv
+	fi
+
+	debug "Create a requirement file for pure-python modules"
+	try echo "$PYMODULES" | try sed 's/\ /\n/g' > requirements.txt
+
+	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 '$BUILD_PATH/python-install/lib/python2.7/site-packages' --download-cache '$PACKAGES_PATH' -r requirements.txt"
+
+}
+
 function run_distribute() {
 	info "Run distribute"
 
@@ -669,6 +711,7 @@ function run() {
 	run_build
 	run_biglink
 	run_postbuild
+	run_pymodules_install
 	run_distribute
 	info "All done !"
 }
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -41,16 +41,16 @@
 
 # General information about the project.
 project = u'Python for Android'
-copyright = u'2012, Mathieu Virbel'
+copyright = u'2012/2013, Kivy organisation'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0'
+release = '1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/source/usage.rst b/docs/source/usage.rst
@@ -27,6 +27,13 @@ version. We also recommand to clean build/ before changing version.::
 The list of available recipes is available at:
 https://github.com/kivy/python-for-android/tree/master/recipes
 
+From python-for-android 1.1, you can now specify pure-python package into the
+-m. It will use virtualenv and pip to install pure-python modules into the
+distribution. Please note that compiler are deactivated, and will break any
+module who try to compile something. If compilation is needed, write a recipe::
+
+    ./distribute.sh -m "requests pygments kivy"
+
 .. note::
 
    Recipes download a defined version of their needed package from the
