Fixed (a) not deleting installed-chrome.txt (bugscape bug 2428), (b) made MOZ_DISABLE_JAR_PACKAGING work again, and (c) created dist/bin/chrome directory in add-chrome.pl -- breaking objdir builds. r=mcafee

config/Makefile.in

@@ -95,8 +95,8 @@ nsBuildID.h: build_number
 	$(PERL) $(srcdir)/aboutime.pl $@ build_number
 
 # clear record of installed chrome on complete rebuild
-install::
-	$(RM) $(DIST)/bin/chrome/installed-chrome.txt
+#install::
+#	$(RM) $(DIST)/bin/chrome/installed-chrome.txt
 
 FORCE:
 

config/add-chrome.pl

@@ -1,12 +1,14 @@
 #!/perl
 
-my $installedChromeFile = $ARGV[0];
-my $chromeType = $ARGV[1];
-my $pkgName = $ARGV[2];
-my $jarFileName = $ARGV[3];
-my $disableJarPackaging = $ARGV[4];
+use File::Path;
 
-#print "add-chrome $installedChromeFile $chromeType $pkgName $jarFileName $disableJarPackaging\n";
+my $installedChromeFile = $ARGV[0];
+my $disableJarPackaging = $ARGV[1];
+my $chromeType = $ARGV[2];
+my $pkgName = $ARGV[3];
+my $jarFileName = $ARGV[4];
+
+#print "add-chrome $installedChromeFile $disableJarPackaging $chromeType $pkgName $jarFileName\n";
 
 if ($jarFileName =~ /(.*)\.jar/) {
     $jarFileName = $1;
@@ -35,6 +37,12 @@ if (open(FILE, "<$installedChromeFile")) {
     close(FILE) || die "error: can't close $installedChromeFile: $!";
 }
 
+my $dir = $installedChromeFile;
+if ("$dir" =~ /([\w\d.\-\\\/]+)[\\\/]([\w\d.\-]+)/) {
+    $dir = $1;
+}
+mkpath($dir, 0, 0755);
+
 open(FILE, ">>$installedChromeFile") || die "can't open $installedChromeFile: $!";
 print FILE "$line\n";
 close(FILE) || die "error: can't close $installedChromeFile: $!";

config/makefile.win

@@ -110,7 +110,7 @@ install:: master.ini
 	$(MAKE_INSTALL) master.ini $(DIST)\bin\
 !endif
 
-install::
-	$(RM) $(DIST)\bin\chrome\installed-chrome.txt
+#install::
+#	$(RM) $(DIST)\bin\chrome\installed-chrome.txt
 
 FORCE::

config/rules.mak

@@ -600,7 +600,11 @@ chrome::
 
 !endif
 
-REGCHROME = @perl $(DEPTH)\config\add-chrome.pl $(DIST)\bin\chrome\installed-chrome.txt
+!ifdef MOZ_DISABLE_JAR_PACKAGING
+REGCHROME = @perl $(DEPTH)\config\add-chrome.pl $(DIST)\bin\chrome\installed-chrome.txt 1
+!else
+REGCHROME = @perl $(DEPTH)\config\add-chrome.pl $(DIST)\bin\chrome\installed-chrome.txt 0
+!endif
 
 regchrome:
 

config/rules.mk

@@ -1139,7 +1139,11 @@ chrome::
 
 install:: chrome
 
-REGCHROME = $(PERL) $(topsrcdir)/config/add-chrome.pl $(DIST)/bin/chrome/installed-chrome.txt
+ifdef MOZ_DISABLE_JAR_PACKAGING
+REGCHROME = $(PERL) $(topsrcdir)/config/add-chrome.pl $(DIST)/bin/chrome/installed-chrome.txt 1
+else
+REGCHROME = $(PERL) $(topsrcdir)/config/add-chrome.pl $(DIST)/bin/chrome/installed-chrome.txt 0
+endif
 
 ##############################################################################