allowing install.rdf files to be included if they are not in the root

ZER0 · Jun 20, 2014 · 734132b · 734132b
1 parent 53f02b0
commit 734132b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -6,5 +6,6 @@
       "xulrunner", "firefox", "browser"
     ],
     "loader": "lib/sdk/loader/cuddlefish.js",
-    "license": "MPL 2.0"
+    "license": "MPL 2.0",
+    "unpack": true
 }
diff --git a/python-lib/cuddlefish/xpi.py b/python-lib/cuddlefish/xpi.py
@@ -24,8 +24,9 @@ def mkzipdir(zf, path):
 def build_xpi(template_root_dir, manifest, xpi_path,
               harness_options, limit_to=None, extra_harness_options={},
               bundle_sdk=True, pkgdir=""):
-    IGNORED_FILES = [".hgignore", ".DS_Store", "install.rdf",
+    IGNORED_FILES = [".hgignore", ".DS_Store",
                      "application.ini", xpi_path]
+    IGNORED_TOP_LVL_FILES = ["install.rdf"]
 
     files_to_copy = {} # maps zipfile path to local-disk abspath
     dirs_to_create = set() # zipfile paths, no trailing slash
@@ -71,6 +72,8 @@ def build_xpi(template_root_dir, manifest, xpi_path,
               files_to_copy[str(arcpath)] = str(abspath)
 
     for dirpath, dirnames, filenames in os.walk(template_root_dir):
+        if template_root_dir == dirpath:
+            filenames = list(filter_filenames(filenames, IGNORED_TOP_LVL_FILES))
         filenames = list(filter_filenames(filenames, IGNORED_FILES))
         dirnames[:] = filter_dirnames(dirnames)
         for dirname in dirnames: