[Pkg-mozext-commits] [adblock-plus] 77/464: Added support for JavaScript modules

[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 86b17bf034bda9d0ccf533decfa2b016f12a1415
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Wed Apr 28 19:59:09 2010 +0200

    Added support for JavaScript modules
---
 Packager.pm              | 4 ++--
 create_xpi.pl            | 4 ++--
 make_babelzilla_build.pl | 2 +-
 setupTestEnvironment.pl  | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Packager.pm b/Packager.pm
index 6e05b55..aeb0b16 100644
--- a/Packager.pm
+++ b/Packager.pm
@@ -182,8 +182,8 @@ sub cp
     }
   }
 
-  my $textMode = ($fromFile =~ /\.(manifest|xul|js|xml|xhtml|rdf|dtd|properties|css)$/);
-  my $extendedTextMode = ($fromFile =~ /\.(?:js|rdf|manifest)$/);
+  my $textMode = ($fromFile =~ /\.(manifest|xul|jsm?|xml|xhtml|rdf|dtd|properties|css)$/);
+  my $extendedTextMode = ($fromFile =~ /\.(?:jsm?|rdf|manifest)$/);
 
   open(local *FROM, $fromFile) or return;
   open(local *TO, ">$toFile") or return;
diff --git a/create_xpi.pl b/create_xpi.pl
index ba5a106..8004e6a 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', 'defaults', 'install.rdf', 'chrome.manifest', 'icon.png');
+my @files = grep {-e $_} ('components', 'modules', 'defaults', 'install.rdf', 'chrome.manifest', 'icon.png');
 
 $pkg->makeXPI($xpiFile, "chrome/$pkg->{baseName}.jar", @files);
 unlink("chrome/$pkg->{baseName}.jar");
@@ -46,7 +46,7 @@ sub removeTimeLine
 {
   my ($file, $line) = @_;
 
-  return "\n" if $file =~ /\.js$/ && $line =~ /\btimeLine\.(\w+)\(/;
+  return "\n" if $file =~ /\.jsm?$/ && $line =~ /\btimeLine\.(\w+)\(/;
 
   return $line;
 }
diff --git a/make_babelzilla_build.pl b/make_babelzilla_build.pl
index be617ba..f89cc38 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', 'defaults', 'install.rdf', 'chrome.manifest', 'icon.png');
+my @files = grep {-e $_} ('components', 'modules', 'defaults', 'install.rdf', 'chrome.manifest', 'icon.png');
 
 my $targetAppNum = 0;
 $pkg->{postprocess_line} = \&postprocessInstallRDF;
diff --git a/setupTestEnvironment.pl b/setupTestEnvironment.pl
index fcd619b..be3463f 100644
--- a/setupTestEnvironment.pl
+++ b/setupTestEnvironment.pl
@@ -47,6 +47,7 @@ $baseURL =~ s/\\/\//g;
 $baseURL = "file:///$baseURL";
 $chromeManifest =~ s~jar:chrome/\w+\.jar!~$baseURL/chrome~g;
 $chromeManifest =~ s~^\s*resource\s+\S+\s+~$&$baseURL/~gmi;
+$chromeManifest =~ s~^(\s*content\s+\S+\s+)(\w+/)~$1$baseURL/$2~gmi;
 $chromeManifest =~ s~^content ~content   mochikit $baseURL/chrome/content/mochitest/\n$&~m if -d "chrome/content/mochitest";
 
 push @files, ["chrome.manifest", $chromeManifest];

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