diff options
| author | Tom Tromey <tromey@gcc.gnu.org> | 2005-09-23 21:31:04 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-09-23 21:31:04 +0000 |
| commit | 1ea63ef8be1cc54dd0de9d82c684713a1dcf1e06 (patch) | |
| tree | 3ca4b2e68dc14c3128b9c781d23f1d0b1f2bee49 /libjava/classpath/scripts/timezones.pl | |
| parent | 9b044d19517541c95681d35a92dbc81e6e21d94f (diff) | |
| download | gcc-1ea63ef8be1cc54dd0de9d82c684713a1dcf1e06.zip gcc-1ea63ef8be1cc54dd0de9d82c684713a1dcf1e06.tar.gz gcc-1ea63ef8be1cc54dd0de9d82c684713a1dcf1e06.tar.bz2 | |
Imported Classpath 0.18.
* sources.am, Makefile.in: Updated.
* Makefile.am (nat_source_files): Removed natProxy.cc.
* java/lang/reflect/natProxy.cc: Removed.
* gnu/classpath/jdwp/VMFrame.java,
gnu/classpath/jdwp/VMIdManager.java,
gnu/classpath/jdwp/VMVirtualMachine.java,
java/lang/reflect/VMProxy.java: New files.
2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com>
* scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC
list.
2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/java/net/DefaultContentHandlerFactory.java (getContent):
Remove ClasspathToolkit references.
2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com>
* gnu/awt/xlib/XCanvasPeer.java: Add new peer methods.
* gnu/awt/xlib/XFramePeer.java: Likewise.
* gnu/awt/xlib/XGraphicsConfiguration.java: Likewise.
2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com>
* Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c. Add
classpath/native/jawt/jawt.c.
* Makefile.in: Regenerate.
* jawt.c: Remove file.
* include/Makefile.am (tool_include__HEADERS): Remove jawt.h and
jawt_md.h. Add ../classpath/include/jawt.h and
../classpath/include/jawt_md.h.
* include/Makefile.in: Regenerate.
* include/jawt.h: Regenerate.
* include/jawt_md.h: Regenerate.
From-SVN: r104586
Diffstat (limited to 'libjava/classpath/scripts/timezones.pl')
| -rwxr-xr-x | libjava/classpath/scripts/timezones.pl | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/libjava/classpath/scripts/timezones.pl b/libjava/classpath/scripts/timezones.pl index 47f7137..142ea4b 100755 --- a/libjava/classpath/scripts/timezones.pl +++ b/libjava/classpath/scripts/timezones.pl @@ -43,7 +43,7 @@ sub parseOffset($) { } # parse the time of form +/-hh:mm:ss[swguz] (:ss is optional) and return it -# in milliseconds since midnight in local standard time +# in milliseconds since midnight in local wall time my $timezonename; sub parseTime($$$) { my ($rawoffset, $stdoffset, $time) = @_; @@ -55,11 +55,11 @@ sub parseTime($$$) { if ($1 eq "-") { $millis = -$millis; } + # Normally millis is in wall time, adjust for utc and standard time. if ($6 =~ /[guz]/) { - $millis += $rawoffset; - } elsif ($6 =~ /w/) { - print STDERR "$timezonename not in standard time\n" if $stdoffset; - $millis -= $stdoffset; + $millis += $rawoffset + $stdoffset; + } elsif ($6 =~ /s/) { + $millis += $stdoffset; } return $millis; } @@ -155,7 +155,7 @@ sub parseRule($$$) { $time += 24*3600*1000; $dayoffset--; } - while ($time >= 24*3600*1000) { + while ($time > 24*3600*1000) { $time -= 24*3600*1000; $dayoffset++; } @@ -331,7 +331,7 @@ for (@timezones) { $rawoffset = makePretty($rawoffset); if ($rule eq "-") { print <<EOF - tz = new SimpleTimeZone($rawoffset, \"$name\"); + tz = new SimpleTimeZone($rawoffset, \"$name\"); EOF } else { my ($endmonth, $endday, $endtime) = @{$rule->[0]}; @@ -341,24 +341,24 @@ EOF my $savings = $rule->[2]; if ($savings == 3600 * 1000) { print <<EOF - tz = new SimpleTimeZone - ($rawoffset, \"$name\", - $startmonth, $startday, $starttime, - $endmonth, $endday, $endtime); + tz = new SimpleTimeZone + ($rawoffset, \"$name\", + $startmonth, $startday, $starttime, + $endmonth, $endday, $endtime); EOF } else { $savings = makePretty($savings); print <<EOF - tz = new SimpleTimeZone - ($rawoffset, \"$name\", - $startmonth, $startday, $starttime, - $endmonth, $endday, $endtime, $savings); + tz = new SimpleTimeZone + ($rawoffset, \"$name\", + $startmonth, $startday, $starttime, + $endmonth, $endday, $endtime, $savings); EOF } } for (@aliases) { print <<EOF - timezones.put(\"$_\", tz); + timezones0.put(\"$_\", tz); EOF } } |