Changed python3crystax to work with python3.6

inclement · inclement · commit 6b31b13cc4c7 · 2017-02-12T19:47:16.000Z
diff --git a/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonUtil.java b/pythonforandroid/bootstraps/sdl2/build/src/org/kivy/android/PythonUtil.java
@@ -16,24 +16,30 @@ protected static String[] getLibraries() {
             "SDL2_ttf",
             "python2.7",
             "python3.5m",
+            "python3.6m",
             "main"
         };
     }
 
 	public static void loadLibraries(File filesDir) {
 
         String filesDirPath = filesDir.getAbsolutePath();
-        boolean skippedPython = false;
+        boolean foundPython = false;
 
 		for (String lib : getLibraries()) {
 		    try {
                 System.loadLibrary(lib);
+                if (lib.startsWith("python")) {
+                    foundPython = true;
+                }
             } catch(UnsatisfiedLinkError e) {
-                if (lib.startsWith("python") && !skippedPython) {
-                    skippedPython = true;
-                    continue;
+                // If this is the last possible libpython
+                // load, and it has failed, give a more
+                // general error
+                if (lib.startsWith("python3.6") && !foundPython) {
+                    throw new java.lang.RuntimeException("Could not load any libpythonXXX.so");
                 }
-                throw e;
+                continue;
             }
         }
 
@@ -52,5 +58,5 @@ public static void loadLibraries(File filesDir) {
         }
 
         Log.v(TAG, "Loaded everything!");
-	}
+    }
 }
diff --git a/pythonforandroid/recipe.py b/pythonforandroid/recipe.py
@@ -818,7 +818,6 @@ def install_python_package(self, arch, name=None, env=None, is_dir=True):
 
         with current_directory(self.get_build_dir(arch.arch)):
             hostpython = sh.Command(self.hostpython_location)
-            # hostpython = sh.Command('python3.5')
 
 
             if self.ctx.python_recipe.from_crystax:
@@ -986,15 +985,13 @@ def build_cython_components(self, arch):
             site_packages_dirs = command(
                 '-c', 'import site; print("\\n".join(site.getsitepackages()))')
             site_packages_dirs = site_packages_dirs.stdout.decode('utf-8').split('\n')
-            # env['PYTHONPATH'] = '/usr/lib/python3.5/site-packages/:/usr/lib/python3.5'
             if 'PYTHONPATH' in env:
                 env['PYTHONPATH'] = env + ':{}'.format(':'.join(site_packages_dirs))
             else:
                 env['PYTHONPATH'] = ':'.join(site_packages_dirs)
 
         with current_directory(self.get_build_dir(arch.arch)):
             hostpython = sh.Command(self.ctx.hostpython)
-            # hostpython = sh.Command('python3.5')
             shprint(hostpython, '-c', 'import sys; print(sys.path)', _env=env)
             print('cwd is', realpath(curdir))
             info('Trying first build of {} to get cython files: this is '
@@ -1089,12 +1086,14 @@ def get_recipe_env(self, arch, with_flags_in_cc=True):
                      self.ctx.python_recipe.version, 'include',
                      'python')) + env['CFLAGS']
 
-            # Temporarily hardcode the -lpython3.5 as this does not
+            # Temporarily hardcode the -lpython3.x as this does not
             # get applied automatically in some environments.  This
             # will need generalising, along with the other hardcoded
             # py3.5 references, to support other python3 or crystax
             # python versions.
-            env['LDFLAGS'] = env['LDFLAGS'] + ' -lpython3.5m'
+            python3_version = self.ctx.python_recipe.version
+            python3_version = '.'.join(python3_version.split('.')[:2])
+            env['LDFLAGS'] = env['LDFLAGS'] + ' -lpython{}m'.format(python3_version)
 
         return env
 
