ICU-66108.tar.gz

[apple/icu.git] / icuSources / tools / tzcode / Makefile.in

diff --git a/icuSources/tools/tzcode/Makefile.in b/icuSources/tools/tzcode/Makefile.in
index bf1299cb30e7510ec675fbd2d5a9fa635fa4a578..485a23eab4d131ef235d28bce760bfcc2f06b1f7 100644 (file)
--- a/icuSources/tools/tzcode/Makefile.in
+++ b/icuSources/tools/tzcode/Makefile.in
@@ -18,6 +18,28 @@ ifeq ($(TZCODE),)
 TZCODE = $(firstword $(wildcard ./tzcode*.tar.gz) $(wildcard $(srcdir)/tzcode*.tar.gz))
 endif
 
+
+PRIMARY_YDATA= africa antarctica asia australasia \
+               europe northamerica southamerica
+YDATA=         $(PRIMARY_YDATA) pacificnew etcetera factory backward
+NDATA=         systemv
+SDATA=         solar87 solar88 solar89
+#TDATA=                $(YDATA) $(NDATA) $(SDATA)
+TDATA=         $(YDATA) $(NDATA)
+YEARISTYPE=     ./yearistype
+
+TZDIR=zoneinfo
+
+CFLAGS+=-D_POSIX_C_SOURCE=200112L
+CPPFLAGS+= -DTZDIR=\"$(TZDIR)\" 
+
+# more data
+XDATA=zone.tab yearistype.sh leapseconds iso3166.tab
+ICUDATA=ZoneMetaData.java icu_zone.txt tz2icu zoneinfo64.txt zoneinfo.txt
+
+VANGUARD_DIR= ./vanguard
+
+# For TZ DB/ICU comparison
 TZORIG=./tzorig
 TZORIG_TZDIR=./tzorig/tzdir
 TZORIG_ABS := $(shell pwd)/tzorig
@@ -72,6 +94,12 @@ tzorig:      $(TZCODE) $(TZDATA)
        mkdir $(TZORIG_TZDIR)
        gunzip -d < $(TZDATA) | ( cd $@ ; tar xf - )
        gunzip -d < $(TZCODE) | ( cd $@ ; tar xf - )
+       if test -e $(TZORIG)/ziguard.awk; then \
+               for tzfile in $(TDATA) ; do \
+                       mv $(TZORIG)/$$tzfile $(TZORIG)/$$tzfile.bak && \
+                       awk -v DATAFORM=rearguard -f $(TZORIG)/ziguard.awk $(TZORIG)/$$tzfile.bak > $(TZORIG)/$$tzfile; \
+               done; \
+       fi;
        -mv $(TZORIG)/zdump.c $(TZORIG)/zdump.c.orig
        cp $(srcdir)/zdump.c $(TZORIG)/zdump.c
        -mv $(TZORIG)/factory $(TZORIG)/factory.orig
@@ -79,12 +107,12 @@ tzorig:    $(TZCODE) $(TZDATA)
        -mv $(TZORIG)/zishrink.awk $(TZORIG)/zishrink.awk.orig
        sed -e '/if (line ~ \/^R SystemV \/) return/s/^/#/' $(TZORIG)/zishrink.awk.orig > $(TZORIG)/zishrink.awk
        -mv $(TZORIG)/Makefile $(TZORIG)/Makefile.orig
-       sed -e "s/BACKWARD=\$$(BACKWARD)/BACKWARD='\$$(BACKWARD)'/" $(TZORIG)/Makefile.orig > $(TZORIG)/Makefile
+       sed -e "s/^BACKWARD=.*/BACKWARD= backward pacificnew/" $(TZORIG)/Makefile.orig > $(TZORIG)/Makefile
        $(MAKE) -C $@ $(TZORIG_OPTS) zdump zones
 
 $(ZDUMPOUT): tzorig
        ( cd $(TZORIG) ; ./zdump$(EXEEXT) $(ZDUMP_OPTS) )
-
+       find $(ZDUMPOUT) -name '*--ICU' -exec sh -c 'mv "$${0}" $${0%--ICU}' {} \;
 
 dump-out: $(ZDUMPOUT) $(ICUZDUMPOUT)
 
@@ -105,24 +133,6 @@ $(ICUZDUMPOUT): $(ICUZDUMPEXEC)
 #
 
 
-PRIMARY_YDATA= africa antarctica asia australasia \
-               europe northamerica southamerica
-YDATA=         $(PRIMARY_YDATA) pacificnew etcetera factory backward
-NDATA=         systemv
-SDATA=         solar87 solar88 solar89
-#TDATA=                $(YDATA) $(NDATA) $(SDATA)
-TDATA=         $(YDATA) $(NDATA)
-YEARISTYPE=     ./yearistype
-
-TZDIR=zoneinfo
-
-CFLAGS+=-D_POSIX_C_SOURCE
-CPPFLAGS+= -DTZDIR=\"$(TZDIR)\" 
-
-# more data
-XDATA=zone.tab yearistype.sh leapseconds iso3166.tab
-ICUDATA=ZoneMetaData.java icu_zone.txt tz2icu zoneinfo64.txt zoneinfo.txt
-
 # create modified CXXFLAGS without -fXXX, -Wxxxx (the settings for these don't work for tz2icu)
 TZCODE_CXXFLAGS=$(patsubst -W%,,$(patsubst -f%,,$(CXXFLAGS)))
 
@@ -144,7 +154,14 @@ $(ICUZDUMPOBJ):    $(srcdir)/icuzdump.cpp
 $(TDATA): tdatamarker
 
 tdatamarker: $(TZDATA)
+       mkdir $(VANGUARD_DIR)
        gunzip -d < $(TZDATA) | tar xf - --exclude=Makefile
+       if test -e ziguard.awk; then \
+               for tzfile in $(TDATA) ; do \
+                       mv $$tzfile $(VANGUARD_DIR)/$$tzfile && \
+                       awk -v DATAFORM=rearguard -f ziguard.awk $(VANGUARD_DIR)/$$tzfile > $$tzfile; \
+               done; \
+       fi;
        touch $@
 
 yearistype.sh: | $(TDATA)
@@ -168,10 +185,11 @@ clean:
                @echo ICU specific cleanup:
                -rm -f $(ICUDATA)
                -rm -rf $(TZDIR)
+               -rm -rf $(VANGUARD_DIR)
                -$(RMV) $(ICUZDUMPTARG) tzorig ./zdumpout/ ./icuzdumpout/
 ifneq ($(TZDATA),)
                -rm -rf `gunzip -d < $(TZDATA) | tar tf - --exclude=Makefile | grep -o '[^ ]*$$' | tr '\n' ' '`
-               -rm tdatamarker
+               -rm -f tdatamarker
 endif
 
 checkclean: