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

…splay Adblock Plus icon even if the extension is disabled

chrome.manifest

@@ -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

create_xpi.pl

@@ -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");

make_babelzilla_build.pl

@@ -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;

setupTestEnvironment.pl

@@ -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;