[PATCH] Don't put leapseconds.awk in tzdata tarball.
This harmless bug was introduced in release 2014f, which distributed leapseconds.awk in both the code and the data tarballs. It's code, so it should be in the code tarball. * Makefile (DATA): Omit leapseconds.awk. (check_character_set): Omit redundant check of $(LEAP_DEPS). --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ee02f73..03ee556 100644 --- a/Makefile +++ b/Makefile @@ -344,7 +344,7 @@ ZONETABLES= zone1970.tab zone.tab TABDATA= iso3166.tab leapseconds $(ZONETABLES) LEAP_DEPS= leapseconds.awk leap-seconds.list DATA= $(YDATA) $(NDATA) $(TABDATA) \ - $(LEAP_DEPS) yearistype.sh + leap-seconds.list yearistype.sh AWK_SCRIPTS= checktab.awk leapseconds.awk MISC= $(AWK_SCRIPTS) workman.sh zoneinfo2tdf.pl ENCHILADA= $(COMMON) $(DOCS) $(SOURCES) $(DATA) $(MISC) @@ -457,7 +457,7 @@ check_character_set: $(ENCHILADA) ! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \ $(MISC) $(SOURCES) $(WEB_PAGES) && \ ! grep -Env $(SAFE_SHARP_LINE) $(YDATA) $(NDATA) iso3166.tab \ - zone.tab leapseconds $(LEAP_DEPS) yearistype.sh && \ + zone.tab leapseconds yearistype.sh && \ test $$(grep -Ecv $(SAFE_SHARP_LINE) Makefile) -eq 1 && \ ! grep -Env $(NONSYM_LINE) README NEWS Theory $(MANS) date.1 \ zone1970.tab && \ -- 1.9.1
On Sat, 09 Aug 2014, Paul Eggert wrote:
This harmless bug was introduced in release 2014f, which distributed leapseconds.awk in both the code and the data tarballs. It's code, so it should be in the code tarball.
I'd prefer to let tzdata contain all zic inputs, and all scripts used to help maintain the zic inputs. If leapseconds.awk is not in tzdata then it's unnecessarily difficult to re-generate leapseconds from leap-seconds.list, or to verify that leapseconds and leap-seconds.list are in sync. The question should not be "is it code?", but rather "is it necessary or useful to people who use tzdata but don't use tzcode?" I think that tzcode should contain all code that's intended to be installed on a target system, but it's not necessary for it to contain scripts that are intended to be used only by maintainers, and not installed for use by end users. While we are talking about what belongs in each tarball, I'd also like to ask that the NEWS file be included in tzdata. --apb (Alan Barrett)
Thanks for those suggestions. I attempted to implement them by pushing the attached patch into the experimental version.
participants (2)
-
Alan Barrett -
Paul Eggert