[Pkg-mozext-commits] [adblock-plus-element-hiding-helper] 177/483: Copied changed build scripts from Adblock Plus to other extensions

[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-element-hiding-helper.

commit d53431707d03f072da7900b957b485536ac46057
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Fri Aug 28 14:45:44 2009 +0200

    Copied changed build scripts from Adblock Plus to other extensions
---
 create_xpi.pl           | 4 ++--
 setupTestEnvironment.pl | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/create_xpi.pl b/create_xpi.pl
index bf4bd9a..3d4ed2e 100644
--- a/create_xpi.pl
+++ b/create_xpi.pl
@@ -40,7 +40,7 @@ chdir('chrome');
 $pkg->makeJAR("$baseName.jar", 'content', 'skin', 'locale', '-/tests', '-/mochitest', '-/.incomplete');
 chdir('..');
 
-my @files = grep {-e $_} ('components', 'defaults', 'install.js', 'install.rdf', 'chrome.manifest');
+my @files = grep {-e $_} ('components', 'defaults', 'install.rdf', 'chrome.manifest', 'icon.png');
 
 $pkg->makeXPI($xpiFile, "chrome/$baseName.jar", @files);
 unlink("chrome/$baseName.jar");
@@ -49,7 +49,7 @@ sub removeTimeLine
 {
   my ($file, $line) = @_;
 
-  return "\n" if $file =~ /\.js$/ && $line =~ /\btimeLine\.log\(/;
+  return "\n" if $file =~ /\.js$/ && $line =~ /\btimeLine\.(\w+)\(/;
 
   return $line;
 }
diff --git a/setupTestEnvironment.pl b/setupTestEnvironment.pl
index 53b31b7..551e3b3 100644
--- a/setupTestEnvironment.pl
+++ b/setupTestEnvironment.pl
@@ -33,6 +33,8 @@ my @files = ();
 my $installManifest = fixupFile(readFile("install.rdf"));
 push @files, ["install.rdf", $installManifest];
 
+push @files, ["icon.png", readFile("icon.png")] if -f "icon.png";
+
 my $cleanManifest = $installManifest;
 $cleanManifest =~ s/<(\w+:)?targetApplication>.*?<\/\1targetApplication>//gs;
 $cleanManifest =~ s/<(\w+:)?requires>.*?<\/\1requires>//gs;

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