Added arch argument to should_build

inclement · inclement · commit 91b6e07055a4 · 2015-12-05T17:48:27.000Z
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -20,7 +20,6 @@ def run_distribute(self):
             with open('local.properties', 'w') as fileh:
                 fileh.write('sdk.dir={}'.format(self.ctx.sdk_dir))
 
-        # AND: Hardcoding armeabi - naughty!
         arch = self.ctx.archs[0]
         if len(self.ctx.archs) > 1:
             raise ValueError('built for more than one arch, but bootstrap cannot handle that yet')
diff --git a/pythonforandroid/recipes/freetype/__init__.py b/pythonforandroid/recipes/freetype/__init__.py
@@ -12,8 +12,8 @@ class FreetypeRecipe(Recipe):
 
     depends = ['harfbuzz']
 
-    def should_build(self):
-        if exists(join(self.get_build_dir('armeabi'), 'objs', '.libs', 'libfreetype.so')):
+    def should_build(self, arch):
+        if exists(join(self.get_build_dir(arch.arch), 'objs', '.libs', 'libfreetype.so')):
             return False
         return True
 
diff --git a/pythonforandroid/recipes/harfbuzz/__init__.py b/pythonforandroid/recipes/harfbuzz/__init__.py
@@ -10,8 +10,8 @@ class HarfbuzzRecipe(Recipe):
     version = '0.9.40'
     url = 'http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-{version}.tar.bz2'
 
-    def should_build(self):
-        if exists(join(self.get_build_dir('armeabi'), 'src', '.libs', 'libharfbuzz.so')):
+    def should_build(self, arch):
+        if exists(join(self.get_build_dir(arch.arch), 'src', '.libs', 'libharfbuzz.so')):
             return False
         return True
 
diff --git a/pythonforandroid/recipes/hostpython2/__init__.py b/pythonforandroid/recipes/hostpython2/__init__.py
@@ -23,14 +23,9 @@ def get_build_dir(self, arch=None):
     def prebuild_arch(self, arch):
         # Override hostpython Setup?
         shprint(sh.cp, join(self.get_recipe_dir(), 'Setup'),
-                join(self.get_build_dir('armeabi'), 'Modules', 'Setup'))
+                join(self.get_build_dir(), 'Modules', 'Setup'))
 
     def build_arch(self, arch):
-        # AND: Should use an i386 recipe system
-        warning('Running hostpython build. Arch is armeabi! '
-                'This is naughty, need to fix the Arch system!')
-
-        # AND: Fix armeabi again
         with current_directory(self.get_build_dir()):
 
             if exists('hostpython'):
diff --git a/pythonforandroid/recipes/openssl/__init__.py b/pythonforandroid/recipes/openssl/__init__.py
@@ -8,8 +8,8 @@ class OpenSSLRecipe(Recipe):
     version = '1.0.2d'
     url = 'https://www.openssl.org/source/openssl-{version}.tar.gz'
 
-    def should_build(self):
-        return not exists(join(self.get_build_dir('armeabi'), 'libssl.a'))
+    def should_build(self, arch):
+        return not exists(join(self.get_build_dir(arch.arch), 'libssl.a'))
 
     def build_arch(self, arch):
         env = self.get_recipe_env(arch)
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -2042,7 +2042,7 @@ def prebuild_arch(self, arch):
         else:
             info('{} has no {}, skipping'.format(self.name, prebuild))
 
-    def should_build(self):
+    def should_build(self, arch):
         '''Should perform any necessary test and return True only if it needs
         building again.
 
@@ -2211,7 +2211,7 @@ def hostpython_location(self):
                 'hostpython')
         return self.ctx.hostpython
 
-    def should_build(self):
+    def should_build(self, arch):
         # AND: This should be different for each arch and use some
         # kind of data store to know what has been built in a given
         # python env
@@ -2417,7 +2417,7 @@ def build_recipes(build_order, python_modules, ctx):
         info_main('# Building recipes')
         for recipe in recipes:
             info_main('Building {} for {}'.format(recipe.name, arch.arch))
-            if recipe.should_build():
+            if recipe.should_build(arch):
                 recipe.build_arch(arch)
             else:
                 info('{} said it is already built, skipping'
