AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-5039 updated tzcode patch. updated readme

Browse Source 
X-SVN-Rev: 19096
This commit is contained in:
Steven R. Loomis 2006-02-08 18:53:15 +00:00
parent a7308f4887
commit aff09b5e97
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
icu4c/source/tools/tzcode/patch-icu-tzcode
View File

@ -29,7 +29,7 @@ diff -ur ../tzcode.orig/Makefile ./Makefile
-all: tzselect zic zdump $(LIBOBJS) -all: tzselect zic zdump $(LIBOBJS)
+LS= /bin/ls +LS= /bin/ls
+SED= /bin/sed +SED= sed
+ +
+all: tzselect zic zdump $(LIBOBJS) tz2icu +all: tzselect zic zdump $(LIBOBJS) tz2icu
@ -59,9 +59,8 @@ diff -ur ../tzcode.orig/Makefile ./Makefile
# In earlier versions of this makefile, the other two directories were # In earlier versions of this makefile, the other two directories were
# subdirectories of $(TZDIR). However, this led to configuration errors. # subdirectories of $(TZDIR). However, this led to configuration errors.
# For example, with posix_right under the earlier scheme, # For example, with posix_right under the earlier scheme,
diff -ur ../tzcode.orig/zic.c ./zic.c --- zic.c.orig 2005-12-22 06:31:15.000000000 -0800
--- ../tzcode.orig/zic.c 2005-05-26 11:54:07.000000000 -0700 +++ zic.c 2006-01-19 19:34:06.000000000 -0800
+++ ./zic.c 2005-06-30 16:39:56.000000000 -0700
@@ -23,6 +23,20 @@ @@ -23,6 +23,20 @@
#define MKDIR_UMASK 0755 #define MKDIR_UMASK 0755
#endif #endif
@ -130,7 +129,7 @@ diff -ur ../tzcode.orig/zic.c ./zic.c
static unsigned char abbrinds[TZ_MAX_TYPES]; static unsigned char abbrinds[TZ_MAX_TYPES];
static char ttisstds[TZ_MAX_TYPES]; static char ttisstds[TZ_MAX_TYPES];
@@ -459,6 +496,62 @@ @@ -459,6 +496,62 @@
(void) exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
+#ifdef ICU +#ifdef ICU
@ -234,7 +233,7 @@ diff -ur ../tzcode.orig/zic.c ./zic.c
_("%s: Can't link from %s to %s: %s\n"), _("%s: Can't link from %s to %s: %s\n"),
progname, fromname, toname, e); progname, fromname, toname, e);
+#ifndef ICU_LINKS +#ifndef ICU_LINKS
(void) exit(EXIT_FAILURE); exit(EXIT_FAILURE);
+#endif +#endif
} }
} }
@ -438,7 +437,7 @@ diff -ur ../tzcode.orig/zic.c ./zic.c
const int ttisstd; const int ttisstd;
@@ -1859,12 +2082,25 @@ @@ -1859,12 +2082,25 @@
error(_("internal error - addtype called with bad ttisgmt")); error(_("internal error - addtype called with bad ttisgmt"));
(void) exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
+#ifdef ICU +#ifdef ICU
+ if (isdst != (dstoff != 0)) { + if (isdst != (dstoff != 0)) {
@ -463,7 +462,7 @@ diff -ur ../tzcode.orig/zic.c ./zic.c
ttisstd == ttisstds[i] && ttisstd == ttisstds[i] &&
ttisgmt == ttisgmts[i]) ttisgmt == ttisgmts[i])
@@ -1879,6 +2115,10 @@ @@ -1879,6 +2115,10 @@
(void) exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
gmtoffs[i] = gmtoff; gmtoffs[i] = gmtoff;
+#ifdef ICU +#ifdef ICU

6
icu4c/source/tools/tzcode/readme.txt
View File

@ -1,5 +1,5 @@
********************************************************************** **********************************************************************
* Copyright (c) 2003-2005, International Business Machines * Copyright (c) 2003-2006, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
********************************************************************** **********************************************************************
* Author: Alan Liu * Author: Alan Liu
@ -96,12 +96,12 @@ HOWTO
5. Copy the data files to the correct location in the ICU4C/ICU4J 5. Copy the data files to the correct location in the ICU4C/ICU4J
source trees: source trees:
$ cp zoneinfo.txt ../../../data/misc/ $ cp zoneinfo.txt ../../data/misc/
$ cp ZoneMetaData.java {path_to}/icu4j/src/com/ibm/icu/impl $ cp ZoneMetaData.java {path_to}/icu4j/src/com/ibm/icu/impl
6. Rebuild ICU: 6. Rebuild ICU:
$ cd ../../../ $ cd ../..
$ {*make} $ {*make}
7. Don't forget to check in the new zoneinfo.txt (from its location at 7. Don't forget to check in the new zoneinfo.txt (from its location at