diff --git a/tztable.h b/tztable.h --- a/tztable.h +++ b/tztable.h @@ -9,7 +9,6 @@ "Asia/Yerevan", "Africa/Luanda", "Antarctica/McMurdo", - "Antarctica/South_Pole", "Antarctica/Rothera", "Antarctica/Palmer", "Antarctica/Mawson", @@ -18,6 +17,7 @@ "Antarctica/Vostok", "Antarctica/DumontDUrville", "Antarctica/Syowa", + "Antarctica/Troll", "America/Argentina/Buenos_Aires", "America/Argentina/Cordoba", "America/Argentina/Salta", @@ -89,7 +89,6 @@ "America/Moncton", "America/Goose_Bay", "America/Blanc-Sablon", - "America/Montreal", "America/Toronto", "America/Nipigon", "America/Thunder_Bay", @@ -123,10 +122,7 @@ "Pacific/Easter", "Africa/Douala", "Asia/Shanghai", - "Asia/Harbin", - "Asia/Chongqing", "Asia/Urumqi", - "Asia/Kashgar", "America/Bogota", "America/Costa_Rica", "America/Havana", @@ -290,6 +286,7 @@ "Pacific/Marquesas", "Pacific/Gambier", "Pacific/Port_Moresby", + "Pacific/Bougainville", "Asia/Manila", "Asia/Karachi", "Europe/Warsaw", @@ -309,6 +306,7 @@ "Europe/Belgrade", "Europe/Kaliningrad", "Europe/Moscow", + "Europe/Simferopol", "Europe/Volgograd", "Europe/Samara", "Asia/Yekaterinburg", @@ -317,12 +315,14 @@ "Asia/Novokuznetsk", "Asia/Krasnoyarsk", "Asia/Irkutsk", + "Asia/Chita", "Asia/Yakutsk", "Asia/Khandyga", "Asia/Vladivostok", "Asia/Sakhalin", "Asia/Ust-Nera", "Asia/Magadan", + "Asia/Srednekolymsk", "Asia/Kamchatka", "Asia/Anadyr", "Africa/Kigali", @@ -366,7 +366,6 @@ "Europe/Kiev", "Europe/Uzhgorod", "Europe/Zaporozhye", - "Europe/Simferopol", "Africa/Kampala", "Pacific/Johnston", "Pacific/Midway", @@ -390,16 +389,15 @@ "America/North_Dakota/Beulah", "America/Denver", "America/Boise", - "America/Shiprock", "America/Phoenix", "America/Los_Angeles", + "America/Metlakatla", "America/Anchorage", "America/Juneau", "America/Sitka", "America/Yakutat", "America/Nome", "America/Adak", - "America/Metlakatla", "Pacific/Honolulu", "America/Montevideo", "Asia/Samarkand", @@ -417,7 +415,117 @@ "Indian/Mayotte", "Africa/Johannesburg", "Africa/Lusaka", - "Africa/Harare" + "Africa/Harare", + "Africa/Asmera", + "Africa/Timbuktu", + "America/Argentina/ComodRivadavia", + "America/Atka", + "America/Buenos_Aires", + "America/Catamarca", + "America/Coral_Harbour", + "America/Cordoba", + "America/Ensenada", + "America/Fort_Wayne", + "America/Indianapolis", + "America/Jujuy", + "America/Knox_IN", + "America/Louisville", + "America/Mendoza", + "America/Porto_Acre", + "America/Rosario", + "America/Virgin", + "Asia/Ashkhabad", + "Asia/Chungking", + "Asia/Dacca", + "Asia/Katmandu", + "Asia/Calcutta", + "Asia/Macao", + "Asia/Tel_Aviv", + "Asia/Saigon", + "Asia/Thimbu", + "Asia/Ujung_Pandang", + "Asia/Ulan_Bator", + "Atlantic/Faeroe", + "Atlantic/Jan_Mayen", + "Australia/ACT", + "Australia/Canberra", + "Australia/LHI", + "Australia/NSW", + "Australia/North", + "Australia/Queensland", + "Australia/South", + "Australia/Tasmania", + "Australia/Victoria", + "Australia/West", + "Australia/Yancowinna", + "Brazil/Acre", + "Brazil/DeNoronha", + "Brazil/East", + "Brazil/West", + "Canada/Atlantic", + "Canada/Central", + "Canada/East-Saskatchewan", + "Canada/Eastern", + "Canada/Mountain", + "Canada/Newfoundland", + "Canada/Pacific", + "Canada/Saskatchewan", + "Canada/Yukon", + "Chile/Continental", + "Chile/EasterIsland", + "Cuba", + "Egypt", + "Eire", + "Europe/Belfast", + "Europe/Tiraspol", + "GB", + "GB-Eire", + "GMT+0", + "GMT-0", + "GMT0", + "Greenwich", + "Hongkong", + "Iceland", + "Iran", + "Israel", + "Jamaica", + "Japan", + "Kwajalein", + "Libya", + "Mexico/BajaNorte", + "Mexico/BajaSur", + "Mexico/General", + "NZ", + "NZ-CHAT", + "Navajo", + "PRC", + "Pacific/Samoa", + "Pacific/Yap", + "Pacific/Truk", + "Pacific/Ponape", + "Poland", + "Portugal", + "ROC", + "ROK", + "Singapore", + "Turkey", + "UCT", + "US/Alaska", + "US/Aleutian", + "US/Arizona", + "US/Central", + "US/East-Indiana", + "US/Eastern", + "US/Hawaii", + "US/Indiana-Starke", + "US/Michigan", + "US/Mountain", + "US/Pacific", + "US/Samoa", + "UTC", + "Universal", + "W-SU", + "Zulu" }; static const long unsigned int numOlsonTimezones = sizeof olsonTimezones / sizeof *olsonTimezones; diff --git a/utils/zonetabconversion.py b/utils/zonetabconversion.py --- a/utils/zonetabconversion.py +++ b/utils/zonetabconversion.py @@ -21,9 +21,24 @@ tztable.write(",\n \"") tztable.write(tz) tztable.write("\"") - +zonefile.close() + +#add more for the backward file +backward = open("/usr/share/libtimezonemap/backward", "r") +for line in backward: + if line.startswith('#'): + continue + else: + tzs = line.split(None) + if len(tzs) > 2: + tz = tzs[2] + print tz + tztable.write(",\n \"") + tztable.write(tz) + tztable.write("\"") +backward.close() + tztable.write("\n};\n") tztable.write("\n") -tztable.write("static const int numOlsonTimezones = sizeof olsonTimezones / sizeof *olsonTimezones;\n") +tztable.write("static const long unsigned int numOlsonTimezones = sizeof olsonTimezones / sizeof *olsonTimezones;\n") tztable.write("\n") -