Merge pull request kivy#21 from phlax/setuptools

tito · tito · commit 9f6f0620b848 · 2012-03-15T09:08:37.000-07:00
Integrating setuptools
diff --git a/distribute.sh b/distribute.sh
@@ -516,7 +516,6 @@ function run_distribute() {
 	try rm -rf distutils/tests
 	try rm -rf email/test
 	try rm -rf bsddb/test
-	try rm -rf distutils
 	try rm -rf config/libpython*.a
 	try rm -rf config/python.o
 	try rm -rf curses
diff --git a/recipes/setuptools/recipe.sh b/recipes/setuptools/recipe.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+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
+BUILD_setuptools=$BUILD_PATH/setuptools/$(get_directory $URL_setuptools)
+RECIPE_setuptools=$RECIPES_PATH/setuptools
+
+function prebuild_setuptools() {
+	true
+}
+
+function build_setuptools() {
+
+	if [ -d "$BUILD_PATH/python-install/lib/python2.7/site-packages/setuptools" ]; then
+		return
+	fi
+
+	cd $BUILD_setuptools
+
+	push_arm
+	# build setuptools for android
+        try $BUILD_hostpython/hostpython setup.py install -O2 --root=$BUILD_PATH/python-install --install-lib=lib/python2.7/site-packages
+
+	# build setuptools for python-for-android
+        try $BUILD_hostpython/hostpython setup.py install -O2 --root=$BUILD_hostpython --install-lib=Lib/site-packages
+	pop_arm
+}
+
+function postbuild_setuptools() {
+	true
+}
diff --git a/recipes/twisted/recipe.sh b/recipes/twisted/recipe.sh
@@ -23,12 +23,15 @@ function build_twisted() {
 	export LDFLAGS="$LDFLAGS -L$LIBS_PATH"
 	export LDSHARED="$LIBLINK"
 
+	export PYTHONPATH=$BUILD_hostpython/Lib/site-packages
+
 	# fake try to be able to cythonize generated files
 	$BUILD_PATH/python-install/bin/python.host setup.py build_ext
 	try find . -iname '*.pyx' -exec cython {} \;
 	try $BUILD_PATH/python-install/bin/python.host setup.py build_ext -v
 	try find build/lib.* -name "*.o" -exec $STRIP {} \;
-	try $BUILD_PATH/python-install/bin/python.host setup.py install -O2
+
+        try $BUILD_hostpython/hostpython setup.py install -O2 --root=$BUILD_PATH/python-install --install-lib=lib/python2.7/site-packages
 
 	try rm -rf $BUILD_PATH/python-install/lib/python*/site-packages/twisted/test
 	try rm -rf $BUILD_PATH/python-install/lib/python*/site-packages/twisted/*/test
diff --git a/recipes/zope/recipe.sh b/recipes/zope/recipe.sh
@@ -13,7 +13,7 @@ function prebuild_zope() {
 
 function build_zope() {
 
-	if [ -d "$BUILD_PATH/python-install/lib/python2.7/site-packages/zope" ]; then
+	if [ -d "$BUILD_PATH/python-install/lib/python2.7/site-packages/zope/interface" ]; then
 		return
 	fi
 
@@ -23,8 +23,10 @@ function build_zope() {
 
 	export LDFLAGS="$LDFLAGS -L$LIBS_PATH"
 	export LDSHARED="$LIBLINK"
+	export PYTHONPATH=$BUILD_hostpython/Lib/site-packages
+
+        try $BUILD_hostpython/hostpython setup.py install -O2 --root=$BUILD_PATH/python-install --install-lib=lib/python2.7/site-packages
 
-	try $BUILD_PATH/python-install/bin/python.host setup.py install -O2
 	try rm -rf $BUILD_PATH/python-install/lib/python*/site-packages/zope/interface/tests
 	try rm -rf $BUILD_PATH/python-install/lib/python*/site-packages/zope/interface/*.txt
 
