Made bootstraps use dependency-dependent build dir

inclement · inclement · commit 6af2ae7742e4 · 2016-01-10T21:23:13.000Z
diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -53,8 +53,27 @@ def dist_dir(self):
     def jni_dir(self):
         return self.name + self.jni_subdir
 
+    def check_recipe_choices(self):
+        '''Checks what recipes are being built to see which of the alternative
+        and optional dependencies are being used,
+        and returns a list of these.'''
+        recipes = []
+        built_recipes = self.ctx.recipe_build_order
+        for recipe in self.recipe_depends:
+            if isinstance(recipe, (tuple, list)):
+                for alternative in recipe:
+                    if alternative in built_recipes:
+                        recipes.append(alternative)
+                        break
+        return sorted(recipes)
+
+    def get_build_dir_name(self):
+        choices = self.check_recipe_choices()
+        dir_name = '-'.join([self.name] + choices)
+        return dir_name
+
     def get_build_dir(self):
-        return join(self.ctx.build_dir, 'bootstrap_builds', self.name)
+        return join(self.ctx.build_dir, 'bootstrap_builds', self.get_build_dir_name())
 
     def get_dist_dir(self, name):
         return join(self.ctx.dist_dir, name)
diff --git a/pythonforandroid/build.py b/pythonforandroid/build.py
@@ -518,7 +518,6 @@ def build_recipes(build_order, python_modules, ctx):
         info_notify(
             ('The requirements ({}) were not found as recipes, they will be '
              'installed with pip.').format(', '.join(python_modules)))
-    ctx.recipe_build_order = build_order
 
     recipes = [Recipe.get_recipe(name, ctx) for name in build_order]
 
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -127,6 +127,7 @@ def build_dist_from_args(ctx, dist, args):
     bs = Bootstrap.get_bootstrap(args.bootstrap, ctx)
     build_order, python_modules, bs \
         = get_recipe_order_and_bootstrap(ctx, dist.recipes, bs)
+    ctx.recipe_build_order = build_order
 
     info('The selected bootstrap is {}'.format(bs.name))
     info_main('# Creating dist with {} bootstrap'.format(bs.name))
