Permalink
Browse files

abp 2145: Moved icon location to allow current Firefox nighlies to di…

…splay Adblock Plus icon even if the extension is disabled
  • Loading branch information...
lovelywcm committed Jul 19, 2010
1 parent 62c3390 commit 2e8e4e3fc2b9e59d6bf6630f097d67358cfe171c
View
@@ -22,3 +22,7 @@ category net-channel-event-sinks AUPComponent @mozilla.org/autoproxy;1
# Hack to prevent .Net Framework Assistant from messing up the browser
override chrome://dotnetassistant/content/bootstrap.xul data:text/xml,<nada/>
# Hack to make icon.png available as adblockplus.png in the skin
skin autoproxy_icon classic/1.0 ./
override chrome://autoproxy/skin/autoproxy.png chrome://autoproxy_icon/skin/icon.png
View
@@ -40,7 +40,7 @@
$pkg->makeJAR("$baseName.jar", 'content', 'skin', 'locale', '-/tests', '-/mochitest', '-/.incomplete');
chdir('..');
my @files = grep {-e $_} ('components', 'defaults', '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");
File renamed without changes.
View
@@ -32,7 +32,7 @@ sub Packager::fixLocales() {}
$pkg->makeJAR("$baseName.jar", 'content', 'skin', 'locale', '-/tests', '-/mochitest', '-/.incomplete');
chdir('..');
my @files = grep {-e $_} ('components', 'defaults', 'install.rdf', 'chrome.manifest');
my @files = grep {-e $_} ('components', 'defaults', 'install.rdf', 'chrome.manifest', 'icon.png');
my $targetAppNum = 0;
$pkg->{postprocess_line} = \&postprocessInstallRDF;
View
@@ -33,6 +33,8 @@
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;

0 comments on commit 2e8e4e3

Please sign in to comment.