[dist] Check p4a version when reusing dist

And in case that we detect a mismatch version we will force to delete all the previous build folders to start from scratch

Note: In case that we want to export a created dist we will omit the removal, unless we need to rebuild the dist.

Author: opacam

pythonforandroid/distribution.py

@@ -20,6 +20,7 @@ class Distribution(object):
 
     name = None  # A name identifying the dist. May not be None.
     needs_build = False  # Whether the dist needs compiling
+    needs_clean_build = False  # Whether the build needs a full clean
     url = None
     dist_dir = None  # Where the dist dir ultimately is. Should not be None.
     ndk_api = None
@@ -129,6 +130,11 @@ def get_distribution(cls, ctx, name=None, recipes=[],
                  not require_perfect_match)):
                 info_notify('{} has compatible recipes, using this one'
                             .format(dist.name))
+                if dist.p4a_version != __version__:
+                    # We build this dist with a different version of p4a, so
+                    # we mark it as a dist that requires a clean build environ
+                    # (to avoid old cached builds issues)
+                    dist.needs_clean_build = True
                 return dist
 
         assert len(possible_dists) < 2
@@ -209,7 +215,9 @@ def get_distributions(cls, ctx, extra_dist_dirs=[]):
                 dist.dist_dir = folder
                 dist.needs_build = False
                 dist.recipes = dist_info['recipes']
-                for entry in {'archs', 'ndk_api', 'android_api'}:
+                for entry in {
+                    'archs', 'ndk_api', 'android_api', 'p4a_version'
+                }:
                     setattr(dist, entry, dist_info.get(entry, None))
                     if entry not in dist_info:
                         warning(

pythonforandroid/toolchain.py

@@ -144,6 +144,22 @@ def wrapper_func(self, args):
                                       user_android_api=self.android_api,
                                       user_ndk_api=self.ndk_api)
         dist = self._dist
+        export_dist = func.__name__ == 'export_dist'
+        if all([dist.needs_build, dist.needs_clean_build, not export_dist]):
+            warning(
+                '\n{separator}\n'
+                '* Detected new p4a version: {new_version}\n'
+                '* Selected dist was made using version: {dist_version}\n'
+                '* So We will remove all cached builds, to ensure a '
+                'successful build!!\n\n'
+                '* Note: the downloaded packages will not be removed.\n'
+                '{separator}'.format(
+                    separator='*' * 72,
+                    new_version=__version__,
+                    dist_version=dist.p4a_version
+                )
+            )
+            self.clean_builds(args)
         if dist.needs_build:
             if dist.folder_exists():  # possible if the dist is being replaced
                 dist.delete()