Просмотр исходного кода

Rename time.tab to zone1970.tab.

* Makefile (ZONETABLES): Rename from TIMETABLES.  All uses changed.
* zone1970.tab: Rename from time.tab.  All uses changed.
Paul Eggert 11 лет назад
Родитель
Сommit
4c73ed617f
8 измененных файлов с 19 добавлено и 19 удалено
  1. 7 7
      Makefile
  2. 2 2
      NEWS
  3. 2 2
      Theory
  4. 1 1
      checktab.awk
  5. 1 1
      tzselect.8
  6. 1 1
      tzselect.ksh
  7. 4 4
      zone.tab
  8. 1 1
      zone1970.tab

+ 7 - 7
Makefile

@@ -340,8 +340,8 @@ PRIMARY_YDATA=	africa antarctica asia australasia \
 YDATA=		$(PRIMARY_YDATA) pacificnew etcetera backward
 NDATA=		systemv factory
 TDATA=		$(YDATA) $(NDATA)
-TIMETABLES=	time.tab zone.tab
-TABDATA=	iso3166.tab $(TIMETABLES) leapseconds
+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
@@ -365,7 +365,7 @@ install:	all $(DATA) $(REDO) $(MANS)
 			$(DESTDIR)$(MANDIR)/man8
 		$(ZIC) -y $(YEARISTYPE) \
 			-d $(DESTDIR)$(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES)
-		cp -f iso3166.tab $(TIMETABLES) $(DESTDIR)$(TZDIR)/.
+		cp -f iso3166.tab $(ZONETABLES) $(DESTDIR)$(TZDIR)/.
 		cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
 		cp libtz.a $(DESTDIR)$(LIBDIR)/.
 		$(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
@@ -460,11 +460,11 @@ check_character_set: $(ENCHILADA)
 			zone.tab leapseconds $(LEAP_DEPS) yearistype.sh && \
 		test $$(grep -Ecv $(SAFE_SHARP_LINE) Makefile) -eq 1 && \
 		! grep -Env $(NONSYM_LINE) README NEWS Theory $(MANS) date.1 \
-			time.tab && \
+			zone1970.tab && \
 		! grep -Env $(VALID_LINE) $(ENCHILADA)
 
-check_tables:	checktab.awk $(PRIMARY_YDATA) $(TIMETABLES)
-		for tab in $(TIMETABLES); do \
+check_tables:	checktab.awk $(PRIMARY_YDATA) $(ZONETABLES)
+		for tab in $(ZONETABLES); do \
 		  $(AWK) -f checktab.awk -v zone_table=$$tab $(PRIMARY_YDATA) \
 		    || exit; \
 		done
@@ -546,7 +546,7 @@ check_public:	$(ENCHILADA)
 # Check that the code works under various alternative
 # implementations of time_t.
 check_time_t_alternatives:
-		zones=`$(AWK) '/^[^#]/ { print $$3 }' <time.tab` && \
+		zones=`$(AWK) '/^[^#]/ { print $$3 }' <zone1970.tab` && \
 		for type in $(TIME_T_ALTERNATIVES); do \
 		  mkdir -p tzpublic/$$type && \
 		  make clean_misc && \

+ 2 - 2
NEWS

@@ -121,7 +121,7 @@ Unreleased, experimental changes
 
   Changes affecting data format
 
-    A new file 'time.tab' supersedes 'zone.tab' in the installed data.
+    A new file 'zone1970.tab' supersedes 'zone.tab' in the installed data.
     The new file's extended format allows multiple country codes per zone.
     The older file is still installed but is deprecated; its format is
     not changing and it will still be distributed for a while, but new
@@ -133,7 +133,7 @@ Unreleased, experimental changes
 
     The file 'iso3166.tab' is planned to switch from ASCII to UTF-8.
     It is still ASCII now, but commentary about the switch has been added.
-    The new file 'time.tab' already uses UTF-8.
+    The new file 'zone1970.tab' already uses UTF-8.
 
   Changes affecting code
 

+ 2 - 2
Theory

@@ -455,10 +455,10 @@ in decreasing order of importance:
 	If a name is changed, put its old spelling in the 'backward' file.
 		This means old spellings will continue to work.
 
-The file 'time.tab' lists geographical locations used to name time
+The file 'zone1970.tab' lists geographical locations used to name time
 zone rule files.  It is intended to be an exhaustive list of names
 for geographic regions as described above; this is a subset of the
-names in the data.  Although a 'time.tab' location's longitude
+names in the data.  Although a 'zone1970.tab' location's longitude
 corresponds to its LMT offset with one hour for every 15 degrees east
 longitude, this relationship is not exact.
 

+ 1 - 1
checktab.awk

@@ -6,7 +6,7 @@ BEGIN {
 	FS = "\t"
 
 	if (!iso_table) iso_table = "iso3166.tab"
-	if (!zone_table) zone_table = "time.tab"
+	if (!zone_table) zone_table = "zone1970.tab"
 	if (!want_warnings) want_warnings = -1
 
 	# A special (and we hope temporary) case.

+ 1 - 1
tzselect.8

@@ -94,7 +94,7 @@ Name of the directory containing time zone data files (default:
 \f2TZDIR\fP\f3/iso3166.tab\fP
 Table of ISO 3166 2-letter country codes and country names.
 .TP
-\f2TZDIR\fP\f3/time.tab\fP
+\f2TZDIR\fP\f3/zone1970.tab\fP
 Table of country codes, latitude and longitude, zone names, and
 descriptive comments.
 .TP

+ 1 - 1
tzselect.ksh

@@ -46,7 +46,7 @@ REPORT_BUGS_TO=tz@iana.org
 
 coord=
 location_limit=10
-zonetabtype=time
+zonetabtype=zone1970
 
 usage="Usage: tzselect [--version] [--help] [-c COORD] [-n LIMIT]
 Select a time zone interactively.

+ 4 - 4
zone.tab

@@ -3,10 +3,10 @@
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# From Paul Eggert (2014-07-18):
+# From Paul Eggert (2014-07-31):
 # This file is intended as a backward-compatibility aid for older programs.
-# New programs should use time.tab.  This file is like time.tab (see
-# time.tab's comments), but with the following additional restrictions:
+# New programs should use zone1970.tab.  This file is like zone1970.tab (see
+# zone1970.tab's comments), but with the following additional restrictions:
 #
 # 1.  This file contains only ASCII characters.
 # 2.  The first data column contains exactly one country code.
@@ -14,7 +14,7 @@
 # Because of (2), each row stands for an area that is the intersection
 # of a region identified by a country code and of a zone where civil
 # clocks have agreed since 1970; this is a narrower definition than
-# that of time.tab.
+# that of zone1970.tab.
 #
 # This table is intended as an aid for users, to help them select time
 # zone data appropriate for their practical needs.  It is not intended

+ 1 - 1
time.tab → zone1970.tab

@@ -2,7 +2,7 @@
 #
 # This file is in the public domain.
 #
-# From Paul Eggert (2014-07-18):
+# From Paul Eggert (2014-07-31):
 # This file contains a table where each row stands for a zone where
 # civil time stamps have agreed since 1970.  Columns are separated by
 # a single tab.  Lines beginning with '#' are comments.  All text uses