Override product version with app version number in app .exe file.

Bug 286825, attachment 190279.  r=benjamin@smedbergs.us,
sr=bryner@brianryner.com, a=chase@mozilla.org

browser/app/module.ver

@@ -1,7 +1,7 @@
 WIN32_MODULE_COMPANYNAME=Mozilla
 WIN32_MODULE_COPYRIGHT=©Firefox and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
-WIN32_MODULE_FILEVERSION=1,0,0,0
-WIN32_MODULE_FILEVERSION_STRING=1.0
+WIN32_MODULE_PRODUCTVERSION=1,0,0,0
+WIN32_MODULE_PRODUCTVERSION_STRING=1.0+
 WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation.
 WIN32_MODULE_DESCRIPTION=Firefox
 WIN32_MODULE_PRODUCTNAME=Firefox

config/version_win.pl

@@ -152,6 +152,8 @@ my $BUILDID_FILE = "$depth/config/build_number";
 #WIN32_MODULE_TRADEMARKS
 #WIN32_MODULE_ORIGINAL_FILENAME
 #WIN32_MODULE_PRODUCTNAME
+#WIN32_MODULE_PRODUCTVERSION
+#WIN32_MODULE_PRODUCTVERSION_STRING
 
 #Override values obtained from the .ver file
 my $override_comment;
@@ -164,6 +166,8 @@ my $override_copyright;
 my $override_trademarks;
 my $override_filename;
 my $override_productname;
+my $override_productversion;
+my $override_mpversion;
 if (open(VERFILE, "<$srcdir/module.ver")) 
 {
 
@@ -180,6 +184,8 @@ if (open(VERFILE, "<$srcdir/module.ver"))
 		if ($a eq "WIN32_MODULE_TRADEMARKS") { $override_trademarks = $b; }
 		if ($a eq "WIN32_MODULE_ORIGINAL_FILENAME") { $override_filename = $b; }
 		if ($a eq "WIN32_MODULE_PRODUCTNAME") { $override_productname = $b; }
+		if ($a eq "WIN32_MODULE_PRODUCTVERSION") { $override_productversion = $b; }
+		if ($a eq "WIN32_MODULE_PRODUCTVERSION_STRING") { $override_mpversion = $b; }
 		($a,$b) = getNextEntry();
 	}
 	close(VERFILE)
@@ -266,6 +272,8 @@ if (defined($override_copyright)){$override_copyright =~ s/\@MOZ_APP_DISPLAYNAME
 if (defined($override_trademarks)){$override_trademarks =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $trademarks=$override_trademarks;}
 if (defined($override_filename)){$binary=$override_filename;}
 if (defined($override_productname)){$override_productname =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $productname=$override_productname;}
+if (defined($override_productversion)){$productversion=$override_productversion;}
+if (defined($override_mpversion)){$mpversion=$override_mpversion;}
 
 
 #Override section

mail/app/module.ver

@@ -1,8 +1,8 @@
 WIN32_MODULE_DESCRIPTION=Mozilla Thunderbird
 WIN32_MODULE_PRODUCTNAME=Thunderbird
 WIN32_MODULE_NAME=Thunderbird
-WIN32_MODULE_FILEVERSION=1,0,0,0
-WIN32_MODULE_FILEVERSION_STRING=1.0+
+WIN32_MODULE_PRODUCTVERSION=1,0,0,0
+WIN32_MODULE_PRODUCTVERSION_STRING=1.0+
 WIN32_MODULE_COPYRIGHT=©Thunderbird and Mozilla Developers, according to the MPL 1.1/GPL 2.0/LGPL 2.1 licenses, as applicable.
 WIN32_MODULE_COMPANYNAME=Mozilla.org
 WIN32_MODULE_TRADEMARKS=Mozilla