[Pkg-mozext-commits] [adblock-plus] 252/464: Updated code to remove TimeLine from release builds

[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 e6cf888981edbcad08249a3bdff5b32c41aaea52
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Thu Jun 28 10:37:38 2012 +0200

    Updated code to remove TimeLine from release builds
---
 packager.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packager.py b/packager.py
index 18b81d1..1e654d6 100644
--- a/packager.py
+++ b/packager.py
@@ -60,7 +60,7 @@ def getIgnoredFiles(params):
   if not params['limitMetadata']:
     result.append('meta.properties')
   if params['releaseBuild']:
-    result.append('TimeLine.jsm')
+    result.append('timeline.js')
   return result
 
 def isValidLocale(localesDir, dir, includeIncomplete=False):
@@ -109,10 +109,10 @@ def processFile(path, data, params):
     replacement = '\n'.join(map(lambda locale: r'\1%s\2%s\3' % (locale, locale), params['locales']))
     data = re.sub(localesRegExp, replacement, data)
 
-  if params['releaseBuild'] and path.endswith('.jsm'):
+  if params['releaseBuild'] and path.endswith('.js'):
     # Remove timeline calls from release builds
     timelineRegExp1 = re.compile(r'^.*\b[tT]imeLine\.(\w+)\(.*', re.M)
-    timelineRegExp2 = re.compile(r'^.*Cu\.import\([^()]*\bTimeLine\.jsm\"\).*', re.M)
+    timelineRegExp2 = re.compile(r'^.*\brequire\(\"timeline\"\).*', re.M)
     data = re.sub(timelineRegExp1, '', data)
     data = re.sub(timelineRegExp2, '', data)
 

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