Support the exclusion of entire paths when creating package files. Rename create_xpi.py to create_zip.py (EFForg#14440)

Hainish · web-flow · commit c3a990d26084 · 2018-01-25T17:08:24.000-08:00
diff --git a/.build_exclusions b/.build_exclusions
@@ -16,3 +16,4 @@ webextension/chrome-resources/update-from-chrome-svn.sh
 .eslintrc.json
 webextension/.eslintrc.json
 .eslintignore
+node_modules
diff --git a/make.sh b/make.sh
@@ -109,7 +109,8 @@ trap 'rm -f "$pub" "$sig" "$zip"' EXIT
 
 # zip up the crx dir
 cwd=$(pwd -P)
-(cd "$dir" && ../../utils/create_xpi.py -n "$cwd/$zip" -x "../../.build_exclusions" .)
+(cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .)
+echo >&2 "CWS crx package has sha1sum: `sha1sum "$cwd/$zip"`"
 
 # signature
 openssl sha1 -sha1 -binary -sign "$key" < "$zip" > "$sig"
@@ -147,7 +148,7 @@ dir=pkg/xpi-amo
 zip="$name.zip"
 
 cwd=$(pwd -P)
-(cd "$dir" && ../../utils/create_xpi.py -n "$cwd/$zip" -x "../../.build_exclusions" .)
+(cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .)
 echo >&2 "AMO xpi package has sha1sum: `sha1sum "$cwd/$zip"`"
 
 cp $zip $xpi_amo
@@ -160,7 +161,7 @@ dir=pkg/xpi-eff
 zip="$name.zip"
 
 cwd=$(pwd -P)
-(cd "$dir" && ../../utils/create_xpi.py -n "$cwd/$zip" -x "../../.build_exclusions" .)
+(cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .)
 echo >&2 "EFF xpi package has sha1sum: `sha1sum "$cwd/$zip"`"
 
 cp $zip $xpi_eff
diff --git a/utils/create_zip.py b/utils/create_zip.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python2.7
 
-# Uses the Python zip implementation to create deterministic XPI's
+# Uses the Python zip implementation to create deterministic zip's
 # Author: Yan Zhu, yan@mit.edu
 
 """
-Usage: python create_xpi.py -x <exclusions> -n <name of zipped file> <directory>
+Usage: python create_zip.py -x <exclusions> -n <name of zipped file> <directory>
 """
 
 import argparse
@@ -13,20 +13,20 @@
 import zipfile_deterministic as zipfile
 
 parser = argparse.ArgumentParser(
-    description="Deterministic XPI file creator.")
+    description="Deterministic zip file creator.")
 parser.add_argument("-x", type=str, nargs="?",
     dest="exclusions", metavar="File with file pattern exclusions",
     default=".build_exclusions", help="Excluded file patterns.")
 parser.add_argument("-n", type=str,
-    dest="xpiname", help="Name of target XPI file.")
+    dest="zipname", help="Name of target zip file.")
 parser.add_argument("directory", type=str,
     help="Directory to compress.")
 
 args = parser.parse_args()
 
 compress = zipfile.ZIP_DEFLATED
 
-xpiFile = zipfile.ZipFile(args.xpiname, mode='w', compression=compress)
+createdZipFile = zipfile.ZipFile(args.zipname, mode='w', compression=compress)
 
 f = open(args.exclusions)
 
@@ -37,5 +37,5 @@
     exclusions.extend(glob.glob(line.strip()))
 exclusions = map(lambda x: './'+x, exclusions)
 
-xpiFile.write_from_directory(".", exclusions, compress_type=compress)
-xpiFile.close()
+createdZipFile.write_from_directory(".", exclusions, compress_type=compress)
+createdZipFile.close()
diff --git a/utils/zipfile_deterministic.py b/utils/zipfile_deterministic.py
@@ -1146,10 +1146,14 @@ def write_from_directory(self, directory, exclusions=None,
         """
         file_dict = {}
         for root,subfolders,files in os.walk(directory):
-            for fi in files:
-                filename = os.path.join(root, fi)
-                if filename not in exclusions:
-                    file_dict.update({standardize_filename(filename): filename})
+            path_fragments = root.split(os.sep)
+            path_nested = [os.path.join(*path_fragments[:x + 1]) for x, _ in enumerate(path_fragments)]
+
+            if not set(path_nested) & set(exclusions):
+                for fi in files:
+                    filename = os.path.join(root, fi)
+                    if filename not in exclusions:
+                        file_dict.update({standardize_filename(filename): filename})
         for new_filename, old_filename in sorted(file_dict.items()):
             self.write(old_filename, compress_type=compress_type, date_time=date_time)
 
