[Pkg-mozext-commits] [adblock-plus] 83/464: Added handling of bootstrap.js as part of the install package

[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 60c93ca25df08d6e9418bf391200686db121845b
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Sun May 9 13:12:14 2010 +0200

    Added handling of bootstrap.js as part of the install package
---
 create_xpi.pl            | 2 +-
 make_babelzilla_build.pl | 2 +-
 setupTestEnvironment.pl  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/create_xpi.pl b/create_xpi.pl
index 247725d..de158f4 100644
--- a/create_xpi.pl
+++ b/create_xpi.pl
@@ -37,7 +37,7 @@ chdir('chrome');
 $pkg->makeJAR("$pkg->{baseName}.jar", 'content', 'skin', 'locale', '-/tests', '-/mochitest', '-/.incomplete', '-/meta.properties');
 chdir('..');
 
-my @files = grep {-e $_} ('components', <modules/*.jsm>, 'defaults', 'install.rdf', 'chrome.manifest', 'icon.png');
+my @files = grep {-e $_} ('components', <modules/*.jsm>, 'defaults', 'install.rdf', 'bootstrap.js', 'chrome.manifest', 'icon.png');
 @files = grep {$_ ne "modules/TimeLine.jsm"} @files unless exists($params{devbuild});
 
 $pkg->makeXPI($xpiFile, "chrome/$pkg->{baseName}.jar", @files);
diff --git a/make_babelzilla_build.pl b/make_babelzilla_build.pl
index f89cc38..d72c689 100644
--- a/make_babelzilla_build.pl
+++ b/make_babelzilla_build.pl
@@ -28,7 +28,7 @@ chdir('chrome');
 $pkg->makeJAR("$baseName.jar", 'content', 'skin', 'locale', '-/tests', '-/mochitest', '-/.incomplete');
 chdir('..');
 
-my @files = grep {-e $_} ('components', 'modules', 'defaults', 'install.rdf', 'chrome.manifest', 'icon.png');
+my @files = grep {-e $_} ('components', 'modules', 'defaults', 'install.rdf', 'bootstrap.js', 'chrome.manifest', 'icon.png');
 
 my $targetAppNum = 0;
 $pkg->{postprocess_line} = \&postprocessInstallRDF;
diff --git a/setupTestEnvironment.pl b/setupTestEnvironment.pl
index be3463f..e446621 100644
--- a/setupTestEnvironment.pl
+++ b/setupTestEnvironment.pl
@@ -32,6 +32,7 @@ my @files = ();
 my $installManifest = fixupFile(readFile("install.rdf"));
 push @files, ["install.rdf", $installManifest];
 
+push @files, ["bootstrap.js", readFile("bootstrap.js")] if -f "bootstrap.js";
 push @files, ["icon.png", readFile("icon.png")] if -f "icon.png";
 
 my $cleanManifest = $installManifest;

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