Fixed dist selection to account for ndk_api

inclement · inclement · commit dbf98152a20e · 2018-11-06T21:25:43.000Z
diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -102,11 +102,9 @@ def prepare_build_dir(self):
                 fileh.write('target=android-{}'.format(self.ctx.android_api))
 
     def prepare_dist_dir(self, name):
-        # self.dist_dir = self.get_dist_dir(name)
         ensure_dir(self.dist_dir)
 
     def run_distribute(self):
-        # TODO: Move this to Distribution.save_info
         self.distribution.save_info(self.dist_dir)
 
     @classmethod
diff --git a/pythonforandroid/distribution.py b/pythonforandroid/distribution.py
@@ -3,7 +3,7 @@
 import json
 
 from pythonforandroid.logger import (info, info_notify, warning,
-                                     Err_Style, Err_Fore)
+                                     Err_Style, Err_Fore, error)
 from pythonforandroid.util import current_directory
 
 
@@ -21,6 +21,7 @@ class Distribution(object):
     needs_build = False  # Whether the dist needs compiling
     url = None
     dist_dir = None  # Where the dist dir ultimately is. Should not be None.
+    ndk_api = None
 
     archs = []
     '''The arch targets that the dist is built for.'''
@@ -42,6 +43,7 @@ def __repr__(self):
 
     @classmethod
     def get_distribution(cls, ctx, name=None, recipes=[],
+                         ndk_api=None,
                          force_build=False,
                          extra_dist_dirs=[],
                          require_perfect_match=False):
@@ -76,13 +78,19 @@ def get_distribution(cls, ctx, name=None, recipes=[],
 
         possible_dists = existing_dists
 
+        name_match_dist = None
+
         # 0) Check if a dist with that name already exists
         if name is not None and name:
             possible_dists = [d for d in possible_dists if d.name == name]
+            if possible_dists:
+                name_match_dist = possible_dists[0]
 
         # 1) Check if any existing dists meet the requirements
         _possible_dists = []
         for dist in possible_dists:
+            if ndk_api is not None and dist.ndk_api != ndk_api:
+                continue
             for recipe in recipes:
                 if recipe not in dist.recipes:
                     break
@@ -97,10 +105,12 @@ def get_distribution(cls, ctx, name=None, recipes=[],
         else:
             info('No existing dists meet the given requirements!')
 
-        # If any dist has perfect recipes, return it
+        # If any dist has perfect recipes and ndk API, return it
         for dist in possible_dists:
             if force_build:
                 continue
+            if ndk_api is not None and dist.ndk_api != ndk_api:
+                continue
             if (set(dist.recipes) == set(recipes) or
                 (set(recipes).issubset(set(dist.recipes)) and
                  not require_perfect_match)):
@@ -110,34 +120,22 @@ def get_distribution(cls, ctx, name=None, recipes=[],
 
         assert len(possible_dists) < 2
 
-        if not name and possible_dists:
-            info('Asked for dist with name {} with recipes ({}), but a dist '
-                 'with this name already exists and has incompatible recipes '
-                 '({})'.format(name, ', '.join(recipes),
-                               ', '.join(possible_dists[0].recipes)))
-            info('No compatible dist found, so exiting.')
+        # If there was a name match but we didn't already choose it,
+        # then the existing dist is incompatible with the requested
+        # configuration and the build cannot continue
+        if name_match_dist is not None:
+            error('Asked for dist with name {name} with recipes ({req_recipes}) and '
+                  'NDK API {req_ndk_api}, but a dist '
+                  'with this name already exists and has either incompatible recipes '
+                  '({dist_recipes}) or NDK API {dist_ndk_api}'.format(
+                      name=name,
+                      req_ndk_api=ndk_api,
+                      dist_ndk_api=name_match_dist.ndk_api,
+                      req_recipes=', '.join(recipes),
+                      dist_recipes=', '.join(name_match_dist.recipes)))
+            error('No compatible dist found, so exiting.')
             exit(1)
 
-        # # 2) Check if any downloadable dists meet the requirements
-
-        # online_dists = [('testsdl2', ['hostpython2', 'sdl2_image',
-        #                               'sdl2_mixer', 'sdl2_ttf',
-        #                               'python2', 'sdl2',
-        #                               'pyjniussdl2', 'kivysdl2'],
-        #                  'https://github.com/inclement/sdl2-example-dist/archive/master.zip'),
-        #                  ]
-        # _possible_dists = []
-        # for dist_name, dist_recipes, dist_url in online_dists:
-        #     for recipe in recipes:
-        #         if recipe not in dist_recipes:
-        #             break
-        #     else:
-        #         dist = Distribution(ctx)
-        #         dist.name = dist_name
-        #         dist.url = dist_url
-        #         _possible_dists.append(dist)
-        # # if _possible_dists
-
         # If we got this far, we need to build a new dist
         dist = Distribution(ctx)
         dist.needs_build = True
@@ -152,6 +150,7 @@ def get_distribution(cls, ctx, name=None, recipes=[],
         dist.name = name
         dist.dist_dir = join(ctx.dist_dir, dist.name)
         dist.recipes = recipes
+        dist.ndk_api = ctx.ndk_api
 
         return dist
 
@@ -179,6 +178,7 @@ def get_distributions(cls, ctx, extra_dist_dirs=[]):
                 dist.recipes = dist_info['recipes']
                 if 'archs' in dist_info:
                     dist.archs = dist_info['archs']
+                dist.ndk_api = dist_info['ndk_api']
                 dists.append(dist)
         return dists
 
@@ -200,10 +200,12 @@ def save_info(self, dirn):
 def pretty_log_dists(dists, log_func=info):
     infos = []
     for dist in dists:
-        infos.append('{Fore.GREEN}{Style.BRIGHT}{name}{Style.RESET_ALL}: '
+        ndk_api = 'unknown' if dist.ndk_api is None else dist.ndk_api
+        infos.append('{Fore.GREEN}{Style.BRIGHT}{name}{Style.RESET_ALL}: min API {ndk_api}, '
                      'includes recipes ({Fore.GREEN}{recipes}'
                      '{Style.RESET_ALL}), built for archs ({Fore.BLUE}'
                      '{archs}{Style.RESET_ALL})'.format(
+                         ndk_api=ndk_api,
                          name=dist.name, recipes=', '.join(dist.recipes),
                          archs=', '.join(dist.archs) if dist.archs else 'UNKNOWN',
                          Fore=Err_Fore, Style=Err_Style))
diff --git a/pythonforandroid/toolchain.py b/pythonforandroid/toolchain.py
@@ -155,6 +155,7 @@ def dist_from_args(ctx, args):
     return Distribution.get_distribution(
         ctx,
         name=args.dist_name,
+        ndk_api=args.ndk_api,
         recipes=split_argument_list(args.requirements),
         require_perfect_match=args.require_perfect_match)
 
