Merge pull request kivy#944 from inclement/compile_pyo_with_sdl2

inclement · web-flow · commit 8d7b91b92d8d · 2016-12-01T22:57:09.000Z
Compile pyo with sdl2
diff --git a/pythonforandroid/bootstraps/sdl2/build/build.py b/pythonforandroid/bootstraps/sdl2/build/build.py
@@ -28,6 +28,9 @@
 
 # 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 python3)')
+    PYTHON = None
 
 BLACKLIST_PATTERNS = [
     # code versionning
@@ -38,13 +41,14 @@
 
     # pyc/py
     '*.pyc',
-    # '*.py',  # AND: Need to fix this to add it back
 
     # temp files
     '~',
     '*.bak',
     '*.swp',
 ]
+if PYTHON is not None:
+    BLACKLIST_PATTERNS.append('*.py')
 
 WHITELIST_PATTERNS = []
 
@@ -202,9 +206,9 @@ def compile_dir(dfn):
     '''
     Compile *.py in directory `dfn` to *.pyo
     '''
-
-    return  # AND: Currently leaving out the compile to pyo step because it's somehow broken
     # -OO = strip docstrings
+    if PYTHON is None:
+        return
     subprocess.call([PYTHON, '-OO', '-m', 'compileall', '-f', dfn])
 
 
@@ -370,7 +374,7 @@ def make_package(args):
 
 
 def parse_args(args=None):
-    global BLACKLIST_PATTERNS, WHITELIST_PATTERNS
+    global BLACKLIST_PATTERNS, WHITELIST_PATTERNS, PYTHON
     default_android_api = 12
     import argparse
     ap = argparse.ArgumentParser(description='''\
@@ -455,6 +459,8 @@ def parse_args(args=None):
                          'NAME:PATH_TO_PY[:foreground]')
     ap.add_argument('--add-source', dest='extra_source_dirs', action='append',
                     help='Include additional source dirs in Java build')
+    ap.add_argument('--no-compile-pyo', dest='no_compile_pyo', action='store_true',
+                    help='Do not optimise .py files to .pyo.')
 
     if args is None:
         args = sys.argv[1:]
@@ -480,6 +486,10 @@ def parse_args(args=None):
     if args.services is None:
         args.services = []
 
+    if args.no_compile_pyo:
+        PYTHON = None
+        BLACKLIST_PATTERNS.remove('*.py')
+
     if args.blacklist:
         with open(args.blacklist) as fd:
             patterns = [x.strip() for x in fd.read().splitlines()
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonActivity.java
@@ -82,6 +82,7 @@ protected void onCreate(Bundle savedInstanceState) {
         SDLActivity.nativeSetEnv("ANDROID_ENTRYPOINT", "main.pyo");
         SDLActivity.nativeSetEnv("PYTHONHOME", app_root_dir);
         SDLActivity.nativeSetEnv("PYTHONPATH", app_root_dir + ":" + app_root_dir + "/lib");
+        SDLActivity.nativeSetEnv("PYTHONOPTIMIZE", "2");
 
         try {
             Log.v(TAG, "Access to our meta-data...");
