Index: mozilla/config/make-jars.pl
===================================================================
RCS file: /cvsroot/mozilla/config/make-jars.pl,v
retrieving revision 3.94
diff -p -u -8 -r3.94 make-jars.pl
--- mozilla/config/make-jars.pl 19 Jun 2006 22:59:18 -0000      3.94
+++ mozilla/config/make-jars.pl 24 Jun 2006 20:12:51 -0000
@@ -150,16 +150,18 @@ if (defined($::opt_o)) {
 if ($verbose) {
     print "make-jars "
         . "-v -d $chromeDir "
         . "-j $jarDir "
         . "-z $zipprog "
         . ($fileformat ? "-f $fileformat " : "")
         . ($nofilelocks ? "-l " : "")
         . ($baseFilesDir ? "-s $baseFilesDir " : "")
+        . ($autoreg == 0 ? "-a " : "")
+        . ($useExtensionManifest ? "-e " : "")
         . "\n";
 }

 my $win32 = ($^O =~ /((MS)?win32)|msys|cygwin|os2/i) ? 1 : 0;
 my $macos = ($^O =~ /MacOS|darwin/i) ? 1 : 0;
 my $unix  = !($win32 || $macos) ? 1 : 0;
 my $vms   = ($^O =~ /VMS/i) ? 1 : 0;

@@ -525,69 +527,75 @@ start:
         my $args = "";
         my $overrides = "";
         my $cwd = cwd();
         my @manifestLines;

         print "+++ making chrome $cwd  => $jarDir/$jarfile.jar\n";
         while (defined($_ = shift @gLines)) {
             if (/^\s+([\w\d.\-\_\\\/\+]+)\s*(\(\%?[\w\d.\-\_\\\/]+\))?$\s*/) {
+                print "*** first regexp in make-jars.pl: $_\n";
                 my $dest = $1;
                 my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
                 EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 0, 0);
                 $args = "$args$dest ";
                 if (!foreignPlatformFile($jarfile) && !foreignPlatformPath($dest) && $autoreg &&
                     $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
                 {
                     my $chrome_type = $1;
                     my $pkg_name = $2;
                     RegIt($chromeDir, $jarfile, $chrome_type, $pkg_name);
                 }
             } elsif (/^\+\s+([\w\d.\-\_\\\/\+]+)\s*(\(\%?[\w\d.\-\_\\\/]+\))?$\s*/) {
+                print "*** second regexp in make-jars.pl: $_\n";
                 my $dest = $1;
                 my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
                 EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 0);
                 $overrides = "$overrides$dest ";
                 if (!foreignPlatformFile($jarfile) && !foreignPlatformPath($dest) && $autoreg &&
                     $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
                 {
                     my $chrome_type = $1;
                     my $pkg_name = $2;
                     RegIt($chromeDir, $jarfile, $chrome_type, $pkg_name);
                 }
             } elsif (/^\*\+?\s+([\w\d.\-\_\\\/\+]+)\s*(\(\%?[\w\d.\-\_\\\/]+\))?$\s*/) {
+                print "*** third regexp in make-jars.pl: $_\n";
                 # preprocessed (always override)
                 my $dest = $1;
                 my $srcPath = defined($2) ? substr($2, 1, -1) : $2;
                 EnsureFileInDir("$chromeDir/$jarfile", $baseFilesDir, $dest, $srcPath, 1, 1);
                 $overrides = "$overrides$dest ";
                 if (!foreignPlatformFile($jarfile) && !foreignPlatformPath($dest) && $autoreg &&
                     $dest =~ /([\w\d.\-\_\+]+)\/([\w\d.\-\_\\\/]+)contents.rdf/)
                 {
                     my $chrome_type = $1;
                     my $pkg_name = $2;
                     RegIt($chromeDir, $jarfile, $chrome_type, $pkg_name);
                 }
             } elsif (/^\%\s+(.*)$/) {
+                print "*** fourth regexp in make-jars.pl: $_\n";
                 my $path = $1;

                 my $jarpath = $jarfile;
                 $jarpath = "chrome/".$jarfile if $useExtensionManifest;

                 if ($fileformat eq "flat" || $fileformat eq "symlink") {
                     $path =~ s|\%|$jarpath/$1|;
                 } else {
                     $path =~ s|\%|jar:$jarpath.jar!/$1|;
                 }

                 push @manifestLines, $path;
             } elsif (/^\s*$/) {
+                print "*** fifth regexp in make-jars.pl: $_\n";
                 # end with blank line
                 last;
             } else {
+                print "*** no regexp in make-jars.pl: $_\n";
                 my $manifest = "$jarDir/$jarfile.manifest";
                 my $manifest = "$jarDir/../chrome.manifest" if $useExtensionManifest;
                 UniqIt($manifest, @manifestLines);
                 JarIt($chromeDir, $jarDir, $jarfile, $args, $overrides);
                 goto start;
             }
         }
         my $manifest = "$jarDir/$jarfile.manifest";