[hostpython] Fix build for MacOS 🍎

opacam · opacam · commit 6d26d07b597d · 2019-08-02T17:08:38.000+02:00
It turns out that the generated binary for MacOS and Cygwin is not `python`...it's `python.exe` Also: - add attribute `HostPythonRecipe.python_bin` (in here we decide if we are in mac platform or not) - implement `HostPythonRecipe.should_build` to refactor a little See also: https://github.com/python/cpython/blob/3.7/README.rst#build-instructions
diff --git a/pythonforandroid/python.py b/pythonforandroid/python.py
@@ -16,6 +16,7 @@
 from pythonforandroid.util import (
     current_directory, ensure_dir, walk_valid_filens,
     BuildInterruptingException, build_platform)
+from pythonforandroid.patching import is_darwin
 
 
 class GuestPythonRecipe(TargetPythonRecipe):
@@ -382,6 +383,22 @@ class HostPythonRecipe(Recipe):
     '''The default url to download our host python recipe. This url will
     change depending on the python version set in attribute :attr:`version`.'''
 
+    @property
+    def python_bin(self):
+        if is_darwin():
+            return 'python.exe'
+        return 'python'
+
+    def should_build(self, arch):
+        python_bin = join(
+            self.get_build_dir(arch.arch), self.build_subdir, self.python_bin
+        )
+        if exists(python_bin):
+            # no need to build, but we must set:
+            self.ctx.hostpython = python_bin
+            return False
+        return True
+
     def get_build_container_dir(self, arch=None):
         choices = self.check_recipe_choices()
         dir_name = '-'.join([self.name] + choices)
@@ -404,22 +421,18 @@ def build_arch(self, arch):
         build_dir = join(recipe_build_dir, self.build_subdir)
         ensure_dir(build_dir)
 
-        if not exists(join(build_dir, 'python')):
-            with current_directory(recipe_build_dir):
-                # Configure the build
-                with current_directory(build_dir):
-                    if not exists('config.status'):
-                        shprint(
-                            sh.Command(join(recipe_build_dir, 'configure')))
+        with current_directory(recipe_build_dir):
+            # Configure the build
+            with current_directory(build_dir):
+                if not exists('config.status'):
+                    shprint(
+                        sh.Command(join(recipe_build_dir, 'configure')))
 
-                # Create the Setup file. This copying from Setup.dist
-                # seems to be the normal and expected procedure.
-                shprint(sh.cp, join('Modules', 'Setup.dist'),
-                        join(build_dir, 'Modules', 'Setup'))
+            # Create the Setup file. This copying from Setup.dist
+            # seems to be the normal and expected procedure.
+            shprint(sh.cp, join('Modules', 'Setup.dist'),
+                    join(build_dir, 'Modules', 'Setup'))
 
-                shprint(sh.make, '-j', str(cpu_count()), '-C', build_dir)
-        else:
-            info('Skipping {name} ({version}) build, as it has already '
-                 'been completed'.format(name=self.name, version=self.version))
+            shprint(sh.make, '-j', str(cpu_count()), '-C', build_dir)
 
-        self.ctx.hostpython = join(build_dir, 'python')
+        self.ctx.hostpython = join(build_dir, self.python_bin)
