Restructured dist_info.json creation

inclement · inclement · commit d2435d69e9ec · 2018-11-06T21:25:43.000Z
diff --git a/pythonforandroid/bootstrap.py b/pythonforandroid/bootstrap.py
@@ -107,15 +107,7 @@ def prepare_dist_dir(self, name):
 
     def run_distribute(self):
         # TODO: Move this to Distribution.save_info
-        with current_directory(self.dist_dir):
-            info('Saving distribution info')
-            with open('dist_info.json', 'w') as fileh:
-                json.dump({'dist_name': self.ctx.dist_name,
-                           'bootstrap': self.ctx.bootstrap.name,
-                           'archs': [arch.arch for arch in self.ctx.archs],
-                           'ndk_api': self.ctx.ndk_api,
-                           'recipes': self.ctx.recipe_build_order + self.ctx.python_modules},
-                          fileh)
+        self.distribution.save_info(self.dist_dir)
 
     @classmethod
     def list_bootstraps(cls):
diff --git a/pythonforandroid/bootstraps/sdl2/__init__.py b/pythonforandroid/bootstraps/sdl2/__init__.py
@@ -63,14 +63,13 @@ def run_distribute(self):
 
             site_packages_dir = self.ctx.python_recipe.create_python_bundle(
                 join(self.dist_dir, python_bundle_dir), arch)
-                # TODO: Also set site_packages_dir again so fry_eggs can work
 
             if 'sqlite3' not in self.ctx.recipe_build_order:
                 with open('blacklist.txt', 'a') as fileh:
                     fileh.write('\nsqlite3/*\nlib-dynload/_sqlite3.so\n')
 
         self.strip_libraries(arch)
-        self.fry_eggs(site_packages_dir)  # TODO uncomment this and make it work with python3
+        self.fry_eggs(site_packages_dir)
         super(SDL2GradleBootstrap, self).run_distribute()
 
 
diff --git a/pythonforandroid/distribution.py b/pythonforandroid/distribution.py
@@ -182,29 +182,19 @@ def get_distributions(cls, ctx, extra_dist_dirs=[]):
                 dists.append(dist)
         return dists
 
-    # def save_info(self):
-    #     '''
-    #     Save information about the distribution in its dist_dir.
-    #     '''
-    #     with current_directory(self.dist_dir):
-    #         info('Saving distribution info')
-    #         with open('dist_info.json', 'w') as fileh:
-    #             json.dump({'dist_name': self.name,
-    #                        'archs': [arch.arch for arch in self.ctx.archs],
-    #                        'ndk_api': self.ctx.ndk_api,
-    #                        'recipes': self.ctx.recipe_build_order},
-    #                       fileh)
-
-    # def load_info(self):
-    #     '''Load information about the dist from the info file that p4a
-    #     automatically creates.'''
-    #     with current_directory(self.dist_dir):
-    #         filen = 'dist_info.json'
-    #         if not exists(filen):
-    #             return None
-    #         with open('dist_info.json', 'r') as fileh:
-    #             dist_info = json.load(fileh)
-    #     return dist_info
+    def save_info(self, dirn):
+        '''
+        Save information about the distribution in its dist_dir.
+        '''
+        with current_directory(dirn):
+            info('Saving distribution info')
+            with open('dist_info.json', 'w') as fileh:
+                json.dump({'dist_name': self.ctx.dist_name,
+                           'bootstrap': self.ctx.bootstrap.name,
+                           'archs': [arch.arch for arch in self.ctx.archs],
+                           'ndk_api': self.ctx.ndk_api,
+                           'recipes': self.ctx.recipe_build_order + self.ctx.python_modules},
+                          fileh)
 
 
 def pretty_log_dists(dists, log_func=info):
