Bug 1239678 - fix dll inclusion pattern on Windows and the placement of nested dlls like browsercomps and clearkey, r=nalexander

--HG--
extra : commitid : ISG749GMW8e
extra : rebase_source : 61e8971594cf88bd55dfbe9bb03da999daeba548
extra : amend_source : bd326f18285788f7e23f3c196391a9fc3c4c9d5a

python/mozbuild/mozbuild/artifacts.py

@@ -319,7 +319,7 @@ class WinArtifactJob(ArtifactJob):
         'firefox/dependentlibs.list',
         'firefox/platform.ini',
         'firefox/application.ini',
-        'firefox/*.dll',
+        'firefox/**/*.dll',
         'firefox/*.exe',
     }
     # These are a subset of TEST_HARNESS_BINS in testing/mochitest/Makefile.in.
@@ -341,7 +341,8 @@ class WinArtifactJob(ArtifactJob):
                 if not any(mozpath.match(f.filename, p) for p in self.package_artifact_patterns):
                     continue
 
-                basename = mozpath.basename(f.filename)
+                # strip off the relative "firefox/" bit from the path:
+                basename = mozpath.relpath(f.filename, "firefox")
                 self.log(logging.INFO, 'artifact',
                     {'basename': basename},
                     'Adding {basename} to processed archive')