[Pkg-mozext-commits] [adblock-plus] 378/464: Chrome packager: Don't make converted JS files part of the build

David Prévot taffit at moszumanska.debian.org
Tue Jul 22 20:44:35 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 7799cdb4e0d28f3a83e8284677958477569164e9
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed May 8 13:05:52 2013 +0200

    Chrome packager: Don't make converted JS files part of the build
    
    --HG--
    extra : rebase_source : 46ae1dd345c9b45007a53ad01f6fb51cd66b0052
---
 packagerChrome.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packagerChrome.py b/packagerChrome.py
index 60cf62a..875c361 100644
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -147,6 +147,11 @@ def convertJS(params, files):
     except ValueError:
       pass
 
+    # Source files of the conversion shouldn't be part of the build
+    for sourceFile in sourceFiles:
+      if sourceFile in files:
+        del files[sourceFile]
+
     sourceFiles = map(lambda f: os.path.abspath(os.path.join(baseDir, f)), sourceFiles)
     files[file] = doRewrite(sourceFiles, args)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git



More information about the Pkg-mozext-commits mailing list