fix for bug 136673 and bug 138764, adding version info to mozilla.exe

for the trunk and adding a program description.
r=cls, no sr= needed for build module.

config/version.mk

@@ -44,8 +44,6 @@ INCLUDED_VERSION_MK=1
 # PBI      : Private build info.  Not used currently.
 #            Guessing the best way would be to set an env var.
 # BINARY   : Binary name.  Not used currently.
-# RCINCLUDE: Another .rc file to merge with the built .rc file.
-#            Not used currently.
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 ifndef RESFILE
 RCFILE=./module.rc
@@ -60,13 +58,16 @@ endif
 ifdef MODULE
 _RC_STRING += -MODNAME $(MODULE)
 endif
+ifdef RCINCLUDE
+_RC_STRING += -RCINCLUDE $(srcdir)/$(RCINCLUDE)
+endif
 
 GARBAGE += $(RESFILE) $(RCFILE)
 
 #dummy target so $(RCFILE) doesn't become the default =P
 all::
 
-$(RCFILE):
+$(RCFILE): $(RCINCLUDE)
 	$(PERL) $(topsrcdir)/config/version_win.pl $(_RC_STRING)
 
 endif  # RESFILE

config/version_win.pl

@@ -306,52 +306,53 @@ my $insideversion=0;
 if (open(RCINCLUDE, "<$rcinclude")) 
 {
 	print RCFILE "// From included resource $rcinclude\n";
-	my $mstring="";
+#	my $mstring="";
 	while (<RCINCLUDE>) 
 	{
-		my $instr=$_;
-		chomp($instr);
-		$mstring .= "$instr\;";
+                print RCFILE $_;
+#		my $instr=$_;
+#		chomp($instr);
+#		$mstring .= "$instr\;";
 	}
 	close(RCINCLUDE);
-	$mstring =~ s/\/\*.*\*\///g;
-	my @mlines = split(/\;/,$mstring);
-	for(@mlines)
-	{
-		my ($nocomment)=split(/\/\//,$_);
-		if (defined($nocomment) && $nocomment ne "")
-		{
-			my ($firststring,$secondstring) = split(/\s+/,$nocomment);
-			if (!defined($firststring)) {$firststring="";}
-			if (!defined($secondstring)) {$secondstring="";}
-			if ($secondstring eq "VERSIONINFO") 
-			{
-if (!$quiet || $quiet ne "1") { 
-				print "$bufferstr" . "WARNING: Included RC file ($rcinclude, $module, $binary)\n";
-				print "$bufferstr" . "WARNING: contains versioning information that will be discarded\n";
-				print "$bufferstr" . "WARNING: Remove it and use relevant overrides (in module.ver)\n";
-}
-				$versionlevel = 0;
-				$insideversion = 1; 
-			}
-			if ($firststring eq "BEGIN") { $versionlevel++; }
-			if ($secondstring eq "END") 
-			{ 
-				$versionlevel--; 
-				if ($insideversion==1 && $versionlevel==0) {$versionlevel=0;}
-			}
-			my $includecheck = $firststring . $secondstring;
-			$includecheck =~ s/<|>/"/g;
-			$includecheck = lc($includecheck);
-			if ($includecheck ne "#include\"winver.h\"")
-			{
-				if ($insideversion == 0 && $versionlevel == 0)
-				{
-					print RCFILE "$nocomment\n";	
-				}
-			}
-		}
-	}
+#	$mstring =~ s/\/\*.*\*\///g;
+#	my @mlines = split(/\;/,$mstring);
+#	for(@mlines)
+#	{
+#		my ($nocomment)=split(/\/\//,$_);
+#		if (defined($nocomment) && $nocomment ne "")
+#		{
+#			my ($firststring,$secondstring) = split(/\s+/,$nocomment);
+#			if (!defined($firststring)) {$firststring="";}
+#			if (!defined($secondstring)) {$secondstring="";}
+#			if ($secondstring eq "VERSIONINFO") 
+#			{
+#if (!$quiet || $quiet ne "1") { 
+#				print "$bufferstr" . "WARNING: Included RC file ($rcinclude, $module, $binary)\n";
+#				print "$bufferstr" . "WARNING: contains versioning information that will be discarded\n";
+#				print "$bufferstr" . "WARNING: Remove it and use relevant overrides (in module.ver)\n";
+#}
+#				$versionlevel = 0;
+#				$insideversion = 1; 
+#			}
+#			if ($firststring eq "BEGIN") { $versionlevel++; }
+#			if ($secondstring eq "END") 
+#			{ 
+#				$versionlevel--; 
+#				if ($insideversion==1 && $versionlevel==0) {$versionlevel=0;}
+#			}
+#			my $includecheck = $firststring . $secondstring;
+#			$includecheck =~ s/<|>/"/g;
+#			$includecheck = lc($includecheck);
+#			if ($includecheck ne "#include\"winver.h\"")
+#			{
+#				if ($insideversion == 0 && $versionlevel == 0)
+#				{
+#					print RCFILE "$nocomment\n";	
+#				}
+#			}
+#		}
+#	}
 	
 }
 

xpfe/bootstrap/Makefile.in

@@ -167,7 +167,7 @@ LIBS += $(MOZ_GTK_LDFLAGS)
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
-RESFILE = splash.res
+RCINCLUDE = splash.rc
 DEFINES	+= -DWIN32_LEAN_AND_MEAN
 CPPSRCS += nsNativeAppSupportWin.cpp nsNativeAppSupportBase.cpp
 OS_LIBS += comctl32.lib comdlg32.lib uuid.lib shell32.lib ole32.lib oleaut32.lib version.lib winspool.lib

xpfe/bootstrap/module.ver

@@ -0,0 +1 @@
+WIN32_MODULE_DESCRIPTION=Mozilla