From 6ee3ed34c151c4f0d4537f00f406955fb237b45d Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <marco@localhost.localdomain>
Date: Fri, 22 Aug 2008 13:03:01 +0000
Subject: Warn about files missing from the MANIFEST.

---
(limited to 'src')

diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py
index b8f87a7..0ee78c9 100644
--- a/src/sugar/activity/bundlebuilder.py
+++ b/src/sugar/activity/bundlebuilder.py
@@ -118,6 +118,12 @@ class Packager(object):
         if not os.path.exists(self.config.dist_dir):
             os.mkdir(self.config.dist_dir)
 
+    def _list_files(self):
+        ignore_dirs = ['dist', '.git']
+        ignore_files = ['.gitignore', 'MANIFEST', '*.pyc', '*~', '*.bak']
+        
+        return list_files(self.config.source_dir, ignore_dirs, ignore_files)
+
 class BuildPackager(Packager):
     def get_files(self):
         files = self.config.bundle.get_files()
@@ -128,20 +134,22 @@ class BuildPackager(Packager):
             files = self.config.bundle.get_files()
 
         return files
-    
-    def _list_useful_files(self):
-        ignore_dirs = ['dist', '.git']
-        ignore_files = ['.gitignore', 'MANIFEST', '*.pyc', '*~', '*.bak']
-        
-        return list_files(self.config.source_dir, ignore_dirs, ignore_files)
+
+    def _check_manifest(self):
+        missing_files = []
+
+        allfiles = self._list_files()        
+        for path in allfiles:
+            if path not in self.config.bundle.manifest:
+                missing_files.append(path)
+
+        return missing_files
         
     def fix_manifest(self):
         manifest = self.config.bundle.manifest
         
-        allfiles = self._list_useful_files()        
-        for path in allfiles:
-            if path not in manifest:
-                manifest.append(path)
+        for path in self._check_manifest():
+            manifest.append(path)
         
         f = open(os.path.join(self.config.source_dir, "MANIFEST"), "wb")
         for line in manifest:
@@ -157,15 +165,22 @@ class XOPackager(BuildPackager):
         bundle_zip = zipfile.ZipFile(self.package_path, 'w',
                                      zipfile.ZIP_DEFLATED)
         
+        missing_files = self._check_manifest()
+        if missing_files:
+            logging.warn('These files are not included in the manifest ' \
+                         'and will not be present in the bundle:\n\n' +
+                         '\n'.join(missing_files) +
+                         '\n\nUse fix_manifest if you want to add them.')
+
         for f in self.get_files():
             bundle_zip.write(os.path.join(self.config.source_dir, f),
                              os.path.join(self.config.bundle_root_dir, f))
 
         bundle_zip.close()
 
-class SourcePackager(BuildPackager):
+class SourcePackager(Packager):
     def __init__(self, config):
-        BuildPackager.__init__(self, config)
+        Packager.__init__(self, config)
         self.package_path = os.path.join(self.config.dist_dir,
                                          self.config.tar_name)
 
@@ -174,7 +189,7 @@ class SourcePackager(BuildPackager):
                                   cwd=self.config.source_dir)
         if git_ls.wait():
             # Fall back to filtered list
-            return self._list_useful_files()
+            return self._list_files()
         
         return [path.strip() for path in git_ls.stdout.readlines()]
 
@@ -191,6 +206,7 @@ setup.py build               - build generated files \n\
 setup.py dev                 - setup for development \n\
 setup.py dist_xo             - create a xo bundle package \n\
 setup.py dist_source         - create a tar source package \n\
+setup.py fix_manifest        - add missing files to the manifest \n\
 setup.py install   [dirname] - install the bundle \n\
 setup.py uninstall [dirname] - uninstall the bundle \n\
 setup.py genpot              - generate the gettext pot file \n\
@@ -218,6 +234,13 @@ def cmd_dist_xo(config, options, args):
     packager = XOPackager(config)
     packager.package()
 
+def cmd_fix_manifest(config, options, args):
+    builder = Builder(config)
+    builder.build()
+
+    packager = XOPackager(config)
+    packager.fix_manifest()
+
 def cmd_dist(config, options, args):
     logging.warn("dist deprecated, use dist_xo.")
     cmd_dist_xo(config, options, args)
--
cgit v0.9.1