[dist] Add an arch suffix to our dists

So we avoid to overwrite them when arch changes (which is probably what we want)

Author: opacam

pythonforandroid/distribution.py

@@ -99,7 +99,9 @@ def get_distribution(cls, ctx, name=None, recipes=[],
 
         # 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]
+            possible_dists = [
+                d for d in possible_dists if d.name.startswith(name)
+            ]
             if possible_dists:
                 name_match_dist = possible_dists[0]
 
@@ -224,7 +226,10 @@ def get_distribution(cls, ctx, name=None, recipes=[],
                 i += 1
             name = filen.format(i)
 
-        dist.name = name
+        # we add a suffix to our dist name, so we avoid to
+        # overwrite them when building for different arch
+        suffix_arch = f"_{{{'·'.join([arch.arch for arch in ctx.archs])}}}"
+        dist.name = name + suffix_arch
         dist.dist_dir = join(ctx.dist_dir, dist.name)
         dist.recipes = recipes_with_version
         dist.archs = req_archs

pythonforandroid/toolchain.py

@@ -1106,13 +1106,12 @@ def apk(self, args):
             else:
                 raise BuildInterruptingException('Couldn\'t find the built APK')
 
-        info_main('# Found APK file: {}'.format(apk_file))
+        info_main(f'# Found APK file: {apk_file}')
         if apk_add_version:
             info('# Add version number to APK')
-            apk_name, apk_suffix = basename(apk_file).split("-", 1)
-            apk_file_dest = "{}-{}-{}".format(
-                apk_name, build_args.version, apk_suffix)
-            info('# APK renamed to {}'.format(apk_file_dest))
+            apk_name, apk_suffix = basename(apk_file).split("_{", 1)
+            apk_file_dest = f'{apk_name}-{build_args.version}-{{{apk_suffix}'
+            info(f'# APK renamed to {apk_file_dest}')
             shprint(sh.cp, apk_file, apk_file_dest)
         else:
             shprint(sh.cp, apk_file, './')

tests/test_bootstrap.py

@@ -84,7 +84,9 @@ def test_attributes(self):
 
         # test dist_dir success
         self.setUp_distribution_with_bootstrap(bs)
-        self.assertTrue(bs.dist_dir.endswith("dists/test_prj"))
+        self.assertTrue(bs.dist_dir.endswith(
+            "dists/test_prj_{armeabi·armeabi-v7a·x86·x86_64·arm64-v8a}")
+        )
 
     def test_build_dist_dirs(self):
         """A test which will initialize a bootstrap and will check if the

tests/test_distribution.py

@@ -73,7 +73,9 @@ def test_properties(self):
         distribution = self.ctx.bootstrap.distribution
         self.assertEqual(self.ctx, distribution.ctx)
         expected_repr = (
-            "<Distribution: name test_prj with recipes (python3, kivy)>"
+            "<Distribution: name "
+            "test_prj_{armeabi·armeabi-v7a·x86·x86_64·arm64-v8a} "
+            "with recipes (python3, kivy)>"
         )
         self.assertEqual(distribution.__str__(), expected_repr)
         self.assertEqual(distribution.__repr__(), expected_repr)
@@ -114,7 +116,10 @@ def test_get_distribution_no_name(self, mock_exists):
         mock_exists.return_value = False
         self.ctx.bootstrap = Bootstrap().get_bootstrap("sdl2", self.ctx)
         dist = Distribution.get_distribution(self.ctx)
-        self.assertEqual(dist.name, "unnamed_dist_1")
+        self.assertEqual(
+            dist.name,
+            "unnamed_dist_1_{armeabi·armeabi-v7a·x86·x86_64·arm64-v8a}"
+        )
 
     @mock.patch("pythonforandroid.util.chdir")
     @mock.patch("pythonforandroid.distribution.open", create=True)