/[jscoverage]/trunk/js/config/version_win.pl
ViewVC logotype

Diff of /trunk/js/config/version_win.pl

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 399 by siliconforks, Tue Dec 9 03:37:47 2008 UTC revision 460 by siliconforks, Sat Sep 26 23:15:22 2009 UTC
# Line 54  Line 54 
54      $d || die("Unrecognized buildid string.");      $d || die("Unrecognized buildid string.");
55    
56      my $secondstodays = 60 * 60 * 24;      my $secondstodays = 60 * 60 * 24;
57      return (POSIX::mktime(00, 00, 00, $d, $m, $y - 1900) -      return (POSIX::mktime(00, 00, 00, $d, $m - 1, $y - 1900) -
58              POSIX::mktime(00, 00, 00, 01, 01, 100)) / $secondstodays;              POSIX::mktime(00, 00, 00, 01, 00, 100)) / $secondstodays;
59  }  }
60    
61  #Creates version resource file  #Creates version resource file
# Line 74  Line 74 
74  # SRCDIR - Holds module.ver and source  # SRCDIR - Holds module.ver and source
75  # BINARY - Holds the name of the binary file  # BINARY - Holds the name of the binary file
76  # DISPNAME - Holds the display name of the built application  # DISPNAME - Holds the display name of the built application
77    # APPVERSION - Holds the version string of the built application
78  # BITS - 16 or 32 bit  # BITS - 16 or 32 bit
79  # RCINCLUDE - Holds the name of the RC File to include or ""  # RCINCLUDE - Holds the name of the RC File to include or ""
80  # QUIET - Turns off output  # QUIET - Turns off output
# Line 112  Line 113 
113                  "MODNAME=s" => \$module,                  "MODNAME=s" => \$module,
114                  "BINARY=s" => \$binary,                  "BINARY=s" => \$binary,
115                  "DISPNAME=s" => \$displayname,                  "DISPNAME=s" => \$displayname,
116                    "APPVERSION=s" => \$appversion,
117                  "SRCDIR=s" => \$srcdir,                  "SRCDIR=s" => \$srcdir,
118                  "TOPSRCDIR=s" => \$topsrcdir,                  "TOPSRCDIR=s" => \$topsrcdir,
119                  "DEPTH=s" => \$depth,                  "DEPTH=s" => \$depth,
# Line 124  Line 126 
126  if (!defined($module)) {$module="";}  if (!defined($module)) {$module="";}
127  if (!defined($binary)) {$binary="";}  if (!defined($binary)) {$binary="";}
128  if (!defined($displayname)) {$displayname="Mozilla";}  if (!defined($displayname)) {$displayname="Mozilla";}
129    if (!defined($appversion)) {$appversion=$milestone;}
130  if (!defined($depth)) {$depth=".";}  if (!defined($depth)) {$depth=".";}
131  if (!defined($rcinclude)) {$rcinclude="";}  if (!defined($rcinclude)) {$rcinclude="";}
132  if (!defined($objdir)) {$objdir=".";}  if (!defined($objdir)) {$objdir=".";}
# Line 226  Line 229 
229  }  }
230    
231  $mfversion = $mpversion = $milestone;  $mfversion = $mpversion = $milestone;
232    if ($appversion eq "") {
233      $appversion = $milestone;
234    }
235    
236  if ($debug eq "1")  if ($debug eq "1")
237  {  {
# Line 252  Line 258 
258  }  }
259  $fileversion = $productversion="$mstone[0],$mstone[1],$mstone[2],$daycount";  $fileversion = $productversion="$mstone[0],$mstone[1],$mstone[2],$daycount";
260    
261    my @appver = split(/\./,$appversion);
262    for ($j = 1; $j < 4; $j++)
263    {
264        if (!$appver[$j]) {
265            $appver[$j] = "0";
266        }
267        else {
268            $appver[$j] =~s/\D.*$//;
269        }
270    }
271    my $winappversion = "$appver[0],$appver[1],$appver[2],$appver[3]";
272    
273  my $copyright = "License: MPL 1.1/GPL 2.0/LGPL 2.1";  my $copyright = "License: MPL 1.1/GPL 2.0/LGPL 2.1";
274  my $company = "Mozilla Foundation";  my $company = "Mozilla Foundation";
275  my $trademarks = "Mozilla";  my $trademarks = "Mozilla";
# Line 260  Line 278 
278    
279  if (defined($override_comment)){$override_comment =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $comment=$override_comment;}  if (defined($override_comment)){$override_comment =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $comment=$override_comment;}
280  if (defined($override_description)){$override_description =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $description=$override_description;}  if (defined($override_description)){$override_description =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $description=$override_description;}
281  if (defined($override_fileversion)){$fileversion=$override_fileversion;}  if (defined($override_fileversion)){$override_fileversion =~ s/\@MOZ_APP_WINVERSION\@/$winappversion/g; $fileversion=$override_fileversion;}
282  if (defined($override_mfversion)){$mfversion=$override_mfversion;}  if (defined($override_mfversion)){$override_mfversion =~ s/\@MOZ_APP_VERSION\@/$appversion/g; $mfversion=$override_mfversion;}
283  if (defined($override_company)){$company=$override_company;}  if (defined($override_company)){$company=$override_company;}
284  if (defined($override_module)){$override_module =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $module=$override_module;}  if (defined($override_module)){$override_module =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $module=$override_module;}
285  if (defined($override_copyright)){$override_copyright =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $copyright=$override_copyright;}  if (defined($override_copyright)){$override_copyright =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $copyright=$override_copyright;}
286  if (defined($override_trademarks)){$override_trademarks =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $trademarks=$override_trademarks;}  if (defined($override_trademarks)){$override_trademarks =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $trademarks=$override_trademarks;}
287  if (defined($override_filename)){$binary=$override_filename;}  if (defined($override_filename)){$binary=$override_filename;}
288  if (defined($override_productname)){$override_productname =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $productname=$override_productname;}  if (defined($override_productname)){$override_productname =~ s/\@MOZ_APP_DISPLAYNAME\@/$displayname/g; $productname=$override_productname;}
289  if (defined($override_productversion)){$productversion=$override_productversion;}  if (defined($override_productversion)){$override_productversion =~ s/\@MOZ_APP_WINVERSION\@/$winappversion/g; $productversion=$override_productversion;}
290  if (defined($override_mpversion)){$mpversion=$override_mpversion;}  if (defined($override_mpversion)){$override_mpversion =~ s/\@MOZ_APP_VERSION\@/$appversion/g; $mpversion=$override_mpversion;}
291    
292    
293  #Override section  #Override section
Legend:
Removed from v.399  
changed lines
  Added in v.460
  ViewVC Help
Powered by ViewVC 1.1.24