Bug 507897 - Remove 'WINDOWS16' (support) code everywhere; (Av1) version_win.pl, r=ted.mielczarek
authorSerge Gautherie <sgautherie.bz@free.fr>
Sat, 08 Aug 2009 11:47:09 +0200
changeset 31238 9646898394f0344c8531297637f6d06b458abb61
parent 31237 febec8184b02c9ae114ebae851d611e869b63184
child 31239 4e16b4e3932b418563c2f84b2a5d1cfa347f8c6c
push id8451
push usersgautherie.bz@free.fr
push dateSat, 08 Aug 2009 10:09:10 +0000
treeherdermozilla-central@ff9eba3f8224 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs507897
milestone1.9.2a2pre
Bug 507897 - Remove 'WINDOWS16' (support) code everywhere; (Av1) version_win.pl, r=ted.mielczarek
config/version_win.pl
js/src/config/version_win.pl
--- a/config/version_win.pl
+++ b/config/version_win.pl
@@ -70,17 +70,16 @@ sub daysFromBuildID
 # OBJDIR - Holds the object directory;
 # MODNAME - tells what the name of the module is like nsBMPModule
 # DEPTH - Holds the path to the root obj dir
 # TOPSRCDIR - Holds the path to the root mozilla dir
 # SRCDIR - Holds module.ver and source
 # BINARY - Holds the name of the binary file
 # DISPNAME - Holds the display name of the built application
 # APPVERSION - Holds the version string of the built application
-# BITS - 16 or 32 bit
 # RCINCLUDE - Holds the name of the RC File to include or ""
 # QUIET - Turns off output
 
 #Description and Comment come from module.ver
 #Bug 23560
 #http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/rc_7x2d.asp
 
 #Get next .ver file entry
@@ -99,59 +98,54 @@ sub getNextEntry
 				$value =~ s/^\s*(.*?)\s*$/$1/;
 				return ($entry,$value);
 			}
 		}
 	}
 	return undef;
 }
 
-my ($quiet,$objdir,$debug,$official,$milestone,$buildid,$module,$binary,$depth,$rcinclude,$bits,$srcdir,$fileversion,$productversion);
+my ($quiet,$objdir,$debug,$official,$milestone,$buildid,$module,$binary,$depth,$rcinclude,$srcdir,$fileversion,$productversion);
 
 GetOptions( "QUIET" => \$quiet,
 		"DEBUG=s" => \$debug,
 		"OFFICIAL=s" => \$official,
 		"MSTONE=s" => \$milestone,
 		"MODNAME=s" => \$module,
 		"BINARY=s" => \$binary,
 		"DISPNAME=s" => \$displayname,
 		"APPVERSION=s" => \$appversion,
 		"SRCDIR=s" => \$srcdir,
 		"TOPSRCDIR=s" => \$topsrcdir,
 		"DEPTH=s" => \$depth,
 		"RCINCLUDE=s" => \$rcinclude,
-		"OBJDIR=s" => \$objdir,
-		"BITS=s" => \$bits);
+		"OBJDIR=s" => \$objdir);
 if (!defined($debug)) {$debug="";}
 if (!defined($official)) {$official="";}
 if (!defined($milestone)) {$milestone="";}
 if (!defined($module)) {$module="";}
 if (!defined($binary)) {$binary="";}
 if (!defined($displayname)) {$displayname="Mozilla";}
 if (!defined($appversion)) {$appversion=$milestone;}
 if (!defined($depth)) {$depth=".";}
 if (!defined($rcinclude)) {$rcinclude="";}
 if (!defined($objdir)) {$objdir=".";}
 if (!defined($srcdir)) {$srcdir=".";}
 if (!defined($topsrcdir)) {$topsrcdir=".";}
-if (!defined($bits)) {$bits="";}
 my $mfversion = "Personal";
 my $mpversion = "Personal";
 my @fileflags = ("0");
 my $comment="";
 my $description="";
 if (!defined($module))
 {
 	$module = $binary;
 	($module) = split(/\./,$module);
 }
 
-my $fileos = "VOS__WINDOWS32";
-if ($bits eq "16") { $fileos="VOS__WINDOWS16"; }
-
 my $bufferstr="    ";
 
 my $MILESTONE_FILE = "$topsrcdir/config/milestone.txt";
 my $BUILDID_FILE = "$depth/config/buildid";
 
 #Read module.ver file
 #Version file overrides for WIN32:
 #WIN32_MODULE_COMMENT
@@ -405,17 +399,17 @@ print RCFILE qq{
 // Version
 //
 
 1 VERSIONINFO
  FILEVERSION    $fileversion
  PRODUCTVERSION $productversion
  FILEFLAGSMASK 0x3fL
  FILEFLAGS $fileflags
- FILEOS $fileos
+ FILEOS VOS__WINDOWS32
  FILETYPE VFT_DLL
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "000004b0"
         BEGIN
             VALUE "Comments", "$comment"
--- a/js/src/config/version_win.pl
+++ b/js/src/config/version_win.pl
@@ -70,17 +70,16 @@ sub daysFromBuildID
 # OBJDIR - Holds the object directory;
 # MODNAME - tells what the name of the module is like nsBMPModule
 # DEPTH - Holds the path to the root obj dir
 # TOPSRCDIR - Holds the path to the root mozilla dir
 # SRCDIR - Holds module.ver and source
 # BINARY - Holds the name of the binary file
 # DISPNAME - Holds the display name of the built application
 # APPVERSION - Holds the version string of the built application
-# BITS - 16 or 32 bit
 # RCINCLUDE - Holds the name of the RC File to include or ""
 # QUIET - Turns off output
 
 #Description and Comment come from module.ver
 #Bug 23560
 #http://msdn.microsoft.com/library/default.asp?url=/library/en-us/winui/rc_7x2d.asp
 
 #Get next .ver file entry
@@ -99,59 +98,54 @@ sub getNextEntry
 				$value =~ s/^\s*(.*?)\s*$/$1/;
 				return ($entry,$value);
 			}
 		}
 	}
 	return undef;
 }
 
-my ($quiet,$objdir,$debug,$official,$milestone,$buildid,$module,$binary,$depth,$rcinclude,$bits,$srcdir,$fileversion,$productversion);
+my ($quiet,$objdir,$debug,$official,$milestone,$buildid,$module,$binary,$depth,$rcinclude,$srcdir,$fileversion,$productversion);
 
 GetOptions( "QUIET" => \$quiet,
 		"DEBUG=s" => \$debug,
 		"OFFICIAL=s" => \$official,
 		"MSTONE=s" => \$milestone,
 		"MODNAME=s" => \$module,
 		"BINARY=s" => \$binary,
 		"DISPNAME=s" => \$displayname,
 		"APPVERSION=s" => \$appversion,
 		"SRCDIR=s" => \$srcdir,
 		"TOPSRCDIR=s" => \$topsrcdir,
 		"DEPTH=s" => \$depth,
 		"RCINCLUDE=s" => \$rcinclude,
-		"OBJDIR=s" => \$objdir,
-		"BITS=s" => \$bits);
+		"OBJDIR=s" => \$objdir);
 if (!defined($debug)) {$debug="";}
 if (!defined($official)) {$official="";}
 if (!defined($milestone)) {$milestone="";}
 if (!defined($module)) {$module="";}
 if (!defined($binary)) {$binary="";}
 if (!defined($displayname)) {$displayname="Mozilla";}
 if (!defined($appversion)) {$appversion=$milestone;}
 if (!defined($depth)) {$depth=".";}
 if (!defined($rcinclude)) {$rcinclude="";}
 if (!defined($objdir)) {$objdir=".";}
 if (!defined($srcdir)) {$srcdir=".";}
 if (!defined($topsrcdir)) {$topsrcdir=".";}
-if (!defined($bits)) {$bits="";}
 my $mfversion = "Personal";
 my $mpversion = "Personal";
 my @fileflags = ("0");
 my $comment="";
 my $description="";
 if (!defined($module))
 {
 	$module = $binary;
 	($module) = split(/\./,$module);
 }
 
-my $fileos = "VOS__WINDOWS32";
-if ($bits eq "16") { $fileos="VOS__WINDOWS16"; }
-
 my $bufferstr="    ";
 
 my $MILESTONE_FILE = "$topsrcdir/config/milestone.txt";
 my $BUILDID_FILE = "$depth/config/buildid";
 
 #Read module.ver file
 #Version file overrides for WIN32:
 #WIN32_MODULE_COMMENT
@@ -405,17 +399,17 @@ print RCFILE qq{
 // Version
 //
 
 1 VERSIONINFO
  FILEVERSION    $fileversion
  PRODUCTVERSION $productversion
  FILEFLAGSMASK 0x3fL
  FILEFLAGS $fileflags
- FILEOS $fileos
+ FILEOS VOS__WINDOWS32
  FILETYPE VFT_DLL
  FILESUBTYPE 0x0L
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
         BLOCK "000004b0"
         BEGIN
             VALUE "Comments", "$comment"