restore pyo compilation and prevent py to be copied (works for python2, will fail with python3)

tito · tito · commit d1a00142a39f · 2019-01-08T17:51:48.000+01:00
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -24,9 +24,16 @@
 # Try to find a host version of Python that matches our ARM version.
 PYTHON = join(curdir, 'python-install', 'bin', 'python.host')
 if not exists(PYTHON):
-    print('Could not find hostpython, will not compile to .pyo '
-          '(this is normal with python2 and python3)')
     PYTHON = None
+    # try to check dist_info.json
+    with open(join(curdir, 'dist_info.json'), 'r') as fd:
+        dist_info = json.load(fd)
+    PYTHON = dist_info.get('hostpython')
+    if PYTHON:
+        print('Found hostpython in dist_info.json (at {})'.format(PYTHON))
+    else:
+        print('Could not find hostpython, will not compile to .pyo '
+            '(this is normal with python2 and python3)')
 
 BLACKLIST_PATTERNS = [
     # code versionning
@@ -36,6 +43,7 @@
     '^*.svn/*',
 
     # pyc/py
+    '*.py',
     '*.pyc',
 
     # temp files
diff --git a/pythonforandroid/distribution.py b/pythonforandroid/distribution.py
@@ -205,7 +205,8 @@ def save_info(self, dirn):
                            'bootstrap': self.ctx.bootstrap.name,
                            'archs': [arch.arch for arch in self.ctx.archs],
                            'ndk_api': self.ctx.ndk_api,
-                           'recipes': self.ctx.recipe_build_order + self.ctx.python_modules},
+                           'recipes': self.ctx.recipe_build_order + self.ctx.python_modules,
+                           'hostpython': self.ctx.hostpython},
                           fileh)
 
 
