[Pkg-mozext-commits] [adblock-plus] 346/464: Made build tools dependent on JSHydra instead of requiring extensions to be dependent on it

[David Prévot]

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

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

commit 531f7a97238daa9240b152df8dcb6f315436652f
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Thu Dec 27 16:49:02 2012 +0100

    Made build tools dependent on JSHydra instead of requiring extensions to be dependent on it
---
 .hgsub            |  1 +
 .hgsubstate       |  1 +
 packagerChrome.py | 52 +++++++++++++++++++++-------------------------------
 3 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/.hgsub b/.hgsub
new file mode 100644
index 0000000..458058a
--- /dev/null
+++ b/.hgsub
@@ -0,0 +1 @@
+jshydra = ../jshydra
diff --git a/.hgsubstate b/.hgsubstate
new file mode 100644
index 0000000..68eaeed
--- /dev/null
+++ b/.hgsubstate
@@ -0,0 +1 @@
+136d7aabdc24115088193394cc827170e0d65c46 jshydra
diff --git a/packagerChrome.py b/packagerChrome.py
index 16d2495..653f323 100644
--- a/packagerChrome.py
+++ b/packagerChrome.py
@@ -142,38 +142,28 @@ def readFile(params, files, path):
     files[name] = data
 
 def convertJS(params, files):
+  from jshydra.abp_rewrite import doRewrite
   baseDir = params['baseDir']
-  hydraDir = os.path.join(baseDir, 'jshydra')
-  sys.path.append(hydraDir)
-  try:
-    if 'abp_rewrite' in sys.modules:
-      import abp_rewrite
-      reload(abp_rewrite.utils)
-      reload(abp_rewrite)
-    else:
-      import abp_rewrite
-
-    for file, sources in params['metadata'].items('convert_js'):
-      dirsep = file.find('/')
-      if dirsep >= 0:
-        # Not a top-level file, make sure it is inside an included director
-        dirname = file[0:dirsep]
-        if os.path.join(baseDir, dirname) not in getPackageFiles(params):
-          continue
-
-      sourceFiles = re.split(r'\s+', sources)
-      args = []
-      try:
-        argsStart = sourceFiles.index('--arg')
-        args = sourceFiles[argsStart + 1:]
-        sourceFiles = sourceFiles[0:argsStart]
-      except ValueError:
-        pass
-
-      sourceFiles = map(lambda f: os.path.abspath(os.path.join(baseDir, f)), sourceFiles)
-      files[file] = abp_rewrite.doRewrite(sourceFiles, args)
-  finally:
-    sys.path.remove(hydraDir)
+
+  for file, sources in params['metadata'].items('convert_js'):
+    dirsep = file.find('/')
+    if dirsep >= 0:
+      # Not a top-level file, make sure it is inside an included directory
+      dirname = file[0:dirsep]
+      if os.path.join(baseDir, dirname) not in getPackageFiles(params):
+        continue
+
+    sourceFiles = re.split(r'\s+', sources)
+    args = []
+    try:
+      argsStart = sourceFiles.index('--arg')
+      args = sourceFiles[argsStart + 1:]
+      sourceFiles = sourceFiles[0:argsStart]
+    except ValueError:
+      pass
+
+    sourceFiles = map(lambda f: os.path.abspath(os.path.join(baseDir, f)), sourceFiles)
+    files[file] = doRewrite(sourceFiles, args)
 
 def packFiles(files):
   buffer = StringIO()

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