[Pkg-mozext-commits] [adblock-plus] 79/464: Deal with the new time line code, remove the entire module 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 dbc236579a79161fb7d7600a00a55aeaa74b82bc
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri Apr 30 17:57:59 2010 +0200

    Deal with the new time line code, remove the entire module from release builds
---
 create_xpi.pl | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/create_xpi.pl b/create_xpi.pl
index 8004e6a..adf63f9 100644
--- a/create_xpi.pl
+++ b/create_xpi.pl
@@ -37,7 +37,8 @@ chdir('chrome');
 $pkg->makeJAR("$pkg->{baseName}.jar", 'content', 'skin', 'locale', '-/tests', '-/mochitest', '-/.incomplete', '-/meta.properties');
 chdir('..');
 
-my @files = grep {-e $_} ('components', 'modules', 'defaults', 'install.rdf', 'chrome.manifest', 'icon.png');
+my @files = grep {-e $_} ('components', <modules/*.jsm>, 'defaults', 'install.rdf', 'chrome.manifest', 'icon.png');
+ at files = grep {$_ ne "modules/TimeLine.jsm"} @files unless exists($params{devbuild});
 
 $pkg->makeXPI($xpiFile, "chrome/$pkg->{baseName}.jar", @files);
 unlink("chrome/$pkg->{baseName}.jar");
@@ -46,7 +47,8 @@ sub removeTimeLine
 {
   my ($file, $line) = @_;
 
-  return "\n" if $file =~ /\.jsm?$/ && $line =~ /\btimeLine\.(\w+)\(/;
+  return "\n" if $file =~ /\.jsm?$/ && $line =~ /\b[tT]imeLine\.(\w+)\(/;
+  return "\n" if $file =~ /\.jsm?$/ && $line =~ /Cu\.import\([^()]*\bTimeLine\.jsm\"\)/;
 
   return $line;
 }

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