[tz] [PATCH] Don't put leapseconds.awk in tzdata tarball.
Paul Eggert
eggert at cs.ucla.edu
Mon Aug 11 19:34:10 UTC 2014
Thanks for those suggestions. I attempted to implement them by pushing
the attached patch into the experimental version.
-------------- next part --------------
From f02ca7c6ef5f8af7ed869e925092430be4083261 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert at cs.ucla.edu>
Date: Mon, 11 Aug 2014 12:32:48 -0700
Subject: [PATCH] Shift the load a little between the two tarballs.
(Thanks to Alan Barrett for the suggestion.)
* Makefile (SOURCES): Move workman.sh here, from $(MISC).
(COMMON): Move NEWS here, from $(DOCS).
(tzdata$(VERSION).tar.gz): Move $(MISC) here, from
tzcode$(VERSION).tar.gz.
* NEWS: Document the above.
---
Makefile | 13 +++++++------
NEWS | 11 +++++++++++
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 0c3263c..285ad22 100644
--- a/Makefile
+++ b/Makefile
@@ -325,16 +325,17 @@ LIBOBJS= localtime.o asctime.o difftime.o
HEADERS= tzfile.h private.h
NONLIBSRCS= zic.c zdump.c scheck.c ialloc.c
NEWUCBSRCS= date.c strftime.c
-SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) tzselect.ksh
+SOURCES= $(HEADERS) $(LIBSRCS) $(NONLIBSRCS) $(NEWUCBSRCS) \
+ tzselect.ksh workman.sh
MANS= newctime.3 newstrftime.3 newtzset.3 time2posix.3 \
tzfile.5 tzselect.8 zic.8 zdump.8
MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.txt \
time2posix.3.txt \
tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
date.1.txt
-COMMON= Makefile README
+COMMON= Makefile README NEWS
WEB_PAGES= tz-art.htm tz-link.htm
-DOCS= NEWS Theory $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
+DOCS= Theory $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
PRIMARY_YDATA= africa antarctica asia australasia \
europe northamerica southamerica
YDATA= $(PRIMARY_YDATA) pacificnew etcetera backward
@@ -346,7 +347,7 @@ LEAP_DEPS= leapseconds.awk leap-seconds.list
DATA= $(YDATA) $(NDATA) $(TABDATA) \
leap-seconds.list yearistype.sh
AWK_SCRIPTS= checktab.awk leapseconds.awk
-MISC= $(AWK_SCRIPTS) workman.sh zoneinfo2tdf.pl
+MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl
ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC)
# And for the benefit of csh users on systems that assume the user
@@ -581,12 +582,12 @@ tarballs: tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
tzcode$(VERSION).tar.gz: set-timestamps.out
LC_ALL=C && export LC_ALL && \
tar $(TARFLAGS) -cf - \
- $(COMMON) $(DOCS) $(SOURCES) $(MISC) | \
+ $(COMMON) $(DOCS) $(SOURCES) | \
gzip $(GZIPFLAGS) > $@
tzdata$(VERSION).tar.gz: set-timestamps.out
LC_ALL=C && export LC_ALL && \
- tar $(TARFLAGS) -cf - $(COMMON) $(DATA) | \
+ tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
gzip $(GZIPFLAGS) > $@
signatures: tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc
diff --git a/NEWS b/NEWS
index 1b674d9..9155581 100644
--- a/NEWS
+++ b/NEWS
@@ -19,6 +19,17 @@ Unreleased, experimental changes
Asia/Dakha ended DST on 2009-12-31 at 24:00, not 23:59.
+ Changes affecting distribution tarballs
+
+ The files checktab.awk and zoneinfo2tdf.pl are now distributed in
+ the tzdata tarball instead of the tzcode tarball, since they help
+ maintain the data. The NEWS file is now also distributed in the
+ tzdata tarball, since it contains news for data too. (Thanks to
+ Alan Barrett for pointing this out.) Also, the leapseconds.awk
+ file is no longer distributed in the tzcode tarball, since it
+ belongs in the tzdata tarball (where 2014f inadvertently also
+ distributed it).
+
Changes affecting documentation and commentary
tz-link.htm describes Windows Runtime etc. (Thanks to Matt Johnson.)
--
1.9.1
More information about the tz
mailing list