Fixed pygame dist for new python-install path etc

inclement · inclement · commit 1c27f313f297 · 2015-10-04T14:33:36.000+01:00
diff --git a/pythonforandroid/bootstraps/pygame/__init__.py b/pythonforandroid/bootstraps/pygame/__init__.py
@@ -40,18 +40,20 @@ def run_distribute(self):
             info('Copying python distribution')
             hostpython = sh.Command(self.ctx.hostpython)
             # AND: This *doesn't* need to be in arm env?
-            shprint(hostpython, '-OO', '-m', 'compileall', join(self.ctx.build_dir, 'python-install'))
+            shprint(hostpython, '-OO', '-m', 'compileall', self.ctx.get_python_install_dir())
             if not exists('python-install'):
-                shprint(sh.cp, '-a', join(self.ctx.build_dir, 'python-install'), '.')
+                shprint(sh.cp, '-a', self.ctx.get_python_install_dir(), './python-install')
 
             info('Copying libs')
             # AND: Hardcoding armeabi - naughty!
             shprint(sh.mkdir, '-p', join('libs', 'armeabi'))
-            for lib in glob.glob(join(self.ctx.libs_dir, '*')):
+            for lib in glob.glob(join(self.build_dir, 'libs', 'armeabi', '*')):
+                shprint(sh.cp, '-a', lib, join('libs', 'armeabi'))
+            for lib in glob.glob(join(self.ctx.get_libs_dir('armeabi'), '*')):
                 shprint(sh.cp, '-a', lib, join('libs', 'armeabi'))
 
             info('Copying java files')
-            for filename in glob.glob(join(self.ctx.build_dir, 'java', '*')):
+            for filename in glob.glob(self.ctx.javaclass_dir):
                 shprint(sh.cp, '-a', filename, 'src')
 
             info('Filling private directory')
diff --git a/pythonforandroid/bootstraps/pygame/build/jni/application/Android.mk b/pythonforandroid/bootstraps/pygame/build/jni/application/Android.mk
@@ -18,7 +18,8 @@ LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
 				-I$(LOCAL_PATH)/../jpeg \
 				-I$(LOCAL_PATH)/../intl \
 				-I$(LOCAL_PATH)/.. \
-				-I$(LOCAL_PATH)/../../../../python-install/include/python2.7
+                -I$(LOCAL_PATH)/../../../../other_builds/python2/armeabi/python2/python-install/include/python2.7
+				# -I$(LOCAL_PATH)/../../../../python-install/include/python2.7
 				# -I$(LOCAL_PATH)/../../../build/python-install/include/python2.7
 
 
@@ -38,7 +39,7 @@ LOCAL_STATIC_LIBRARIES := jpeg png
 LOCAL_LDLIBS := -lpython2.7 -lGLESv1_CM -ldl -llog -lz
 
 # AND: Another hardcoded path that should be templated
-LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../../python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
+LOCAL_LDFLAGS += -L$(LOCAL_PATH)/../../../../other_builds/python2/armeabi/python2/python-install/lib $(APPLICATION_ADDITIONAL_LDFLAGS)
 
 LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \
 	for f in $(LOCAL_PATH)/../../libs/$ARCH/*.so ; do \
diff --git a/pythonforandroid/recipes/vispy/__init__.py b/pythonforandroid/recipes/vispy/__init__.py
@@ -10,6 +10,8 @@ class VispyRecipe(PythonRecipe):
     url = 'https://github.com/vispy/vispy/archive/v{version}.tar.gz'
     # version = 'campagnola-scenegraph-update'
     # url = 'https://github.com/campagnola/vispy/archive/scenegraph-update.zip'
+    # version = '???'
+    # url = 'https://github.com/inclement/vispy/archive/Eric89GXL-arcball.zip'
 
     depends = ['python2', 'numpy', 'pysdl2']
 
