Add ability to get hostpython and python version when creating our distribution files

opacam · opacam · commit 327dabd9d538 · 2019-01-27T14:34:22.000+01:00
Because this will allows us to restore the ability to compile python code to .pyo/.pyc (python2/python3)
diff --git a/pythonforandroid/bootstraps/common/build/build.py b/pythonforandroid/bootstraps/common/build/build.py
@@ -23,16 +23,24 @@
 import jinja2
 
 
-def get_bootstrap_name():
+def get_dist_info_for(key):
     try:
         with open(join(dirname(__file__), 'dist_info.json'), 'r') as fileh:
             info = json.load(fileh)
-        bootstrap = str(info["bootstrap"])
+        value = str(info[key])
     except (OSError, KeyError) as e:
-        print("BUILD FAILURE: Couldn't extract bootstrap name " +
+        print("BUILD FAILURE: Couldn't extract the key `" + key + "` " +
               "from dist_info.json: " + str(e))
         sys.exit(1)
-    return bootstrap
+    return value
+
+
+def get_hostpython():
+    return get_dist_info_for('hostpython')
+
+
+def get_bootstrap_name():
+    return get_dist_info_for('bootstrap')
 
 
 if os.name == 'nt':
@@ -44,9 +52,8 @@ def get_bootstrap_name():
 
 curdir = dirname(__file__)
 
-# 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):
+PYTHON = get_hostpython()
+if PYTHON is not None and not exists(PYTHON):
     PYTHON = None
 
 BLACKLIST_PATTERNS = [
diff --git a/pythonforandroid/distribution.py b/pythonforandroid/distribution.py
@@ -216,7 +216,9 @@ 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,
+                           'python_version': self.ctx.python_recipe.major_minor_version_string},
                           fileh)
 
 
