Bug 507897 - Remove 'WINDOWS16' (support) code everywhere; (Av1) vers…

…ion_win.pl, r=ted.mielczarek
sailfishos · Aug 8, 2009 · 57bea23 · 57bea23
1 parent 789aea1
commit 57bea23
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/config/version_win.pl b/config/version_win.pl
@@ -75,7 +75,6 @@ sub daysFromBuildID
 # 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
 
@@ -104,7 +103,7 @@ sub getNextEntry
 	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,
@@ -118,8 +117,7 @@ sub getNextEntry
 		"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="";}
@@ -132,7 +130,6 @@ sub getNextEntry
 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");
@@ -144,9 +141,6 @@ sub getNextEntry
 	($module) = split(/\./,$module);
 }
 
-my $fileos = "VOS__WINDOWS32";
-if ($bits eq "16") { $fileos="VOS__WINDOWS16"; }
-
 my $bufferstr="    ";
 
 my $MILESTONE_FILE = "$topsrcdir/config/milestone.txt";
@@ -410,7 +404,7 @@ sub getNextEntry
  PRODUCTVERSION $productversion
  FILEFLAGSMASK 0x3fL
  FILEFLAGS $fileflags
- FILEOS $fileos
+ FILEOS VOS__WINDOWS32
  FILETYPE VFT_DLL
  FILESUBTYPE 0x0L
 BEGIN

diff --git a/js/src/config/version_win.pl b/js/src/config/version_win.pl
@@ -75,7 +75,6 @@ sub daysFromBuildID
 # 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
 
@@ -104,7 +103,7 @@ sub getNextEntry
 	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,
@@ -118,8 +117,7 @@ sub getNextEntry
 		"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="";}
@@ -132,7 +130,6 @@ sub getNextEntry
 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");
@@ -144,9 +141,6 @@ sub getNextEntry
 	($module) = split(/\./,$module);
 }
 
-my $fileos = "VOS__WINDOWS32";
-if ($bits eq "16") { $fileos="VOS__WINDOWS16"; }
-
 my $bufferstr="    ";
 
 my $MILESTONE_FILE = "$topsrcdir/config/milestone.txt";
@@ -410,7 +404,7 @@ sub getNextEntry
  PRODUCTVERSION $productversion
  FILEFLAGSMASK 0x3fL
  FILEFLAGS $fileflags
- FILEOS $fileos
+ FILEOS VOS__WINDOWS32
  FILETYPE VFT_DLL
  FILESUBTYPE 0x0L
 BEGIN