Fixed hostpython2 recipe to ignore arch

inclement · inclement · commit b9e6e5257b6e · 2015-11-29T22:23:18.000Z
Since this is always built for the desktop, we don't need multiple targets
diff --git a/pythonforandroid/recipes/hostpython2/__init__.py b/pythonforandroid/recipes/hostpython2/__init__.py
@@ -12,24 +12,32 @@ class Hostpython2Recipe(Recipe):
 
     conflicts = ['hostpython3']
 
-    def prebuild_armeabi(self):
+    def get_build_container_dir(self, arch=None):
+        choices = self.check_recipe_choices()
+        dir_name = '-'.join([self.name] + choices)
+        return join(self.ctx.build_dir, 'other_builds', dir_name, 'desktop')
+
+    def get_build_dir(self, arch=None):
+        return join(self.get_build_container_dir(), self.name)
+
+    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'))
 
-    def build_armeabi(self):
+    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('armeabi')):
+        with current_directory(self.get_build_dir()):
 
             if exists('hostpython'):
                 info('hostpython already exists, skipping build')
-                self.ctx.hostpython = join(self.get_build_dir('armeabi'),
+                self.ctx.hostpython = join(self.get_build_dir(),
                                            'hostpython')
-                self.ctx.hostpgen = join(self.get_build_dir('armeabi'),
+                self.ctx.hostpgen = join(self.get_build_dir(),
                                            'hostpgen')
                 return
             
@@ -49,8 +57,8 @@ def build_armeabi(self):
                         'hostpython build! Exiting.')
                 exit(1)
 
-        self.ctx.hostpython = join(self.get_build_dir('armeabi'), 'hostpython')
-        self.ctx.hostpgen = join(self.get_build_dir('armeabi'), 'hostpgen')
+        self.ctx.hostpython = join(self.get_build_dir(), 'hostpython')
+        self.ctx.hostpgen = join(self.get_build_dir(), 'hostpgen')
 
 
 recipe = Hostpython2Recipe()
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -72,6 +72,8 @@ def __getattr__(self, key):
 else:
     Err_Style = Null_Style
     Err_Fore = Null_Fore
+Fore = Colo_Fore
+Style = Colo_Style
 
 user_dir = dirname(realpath(os.path.curdir))
 toolchain_dir = dirname(__file__)
@@ -1120,8 +1122,6 @@ def set_archs(self, arch_names):
             exit(1)
         info('Will compile for the following archs: {}'.format(
             ', '.join([arch.arch for arch in self.archs])))
-        exit(1)
-
 
     def prepare_bootstrap(self, bs):
         bs.ctx = self
