From: Apple Date: Wed, 7 Jun 2017 22:37:09 +0000 (+0000) Subject: ICU-57165.0.1.tar.gz X-Git-Tag: macos-10125^0 X-Git-Url: https://git.saurik.com/apple/icu.git/commitdiff_plain/277af7082f210d5fa7e37ce63392ac8568371616 ICU-57165.0.1.tar.gz --- diff --git a/icuSources/data/misc/metaZones.txt b/icuSources/data/misc/metaZones.txt index d821314d..5af96ba9 100644 --- a/icuSources/data/misc/metaZones.txt +++ b/icuSources/data/misc/metaZones.txt @@ -2248,7 +2248,7 @@ metaZones:table(nofallback){ { "Chile", "1970-01-01 00:00", - "2017-05-14 03:00", + "2016-12-03 23:00", } } "America:Rainy_River"{ @@ -2582,7 +2582,7 @@ metaZones:table(nofallback){ { "Chile", "1982-05-01 03:00", - "2017-05-14 03:00", + "2016-12-03 23:00", } } "Antarctica:Rothera"{ @@ -3460,6 +3460,11 @@ metaZones:table(nofallback){ "America_Eastern", } } + "Etc:GMT"{ + { + "GMT", + } + } "Europe:Amsterdam"{ { "Europe_Central", diff --git a/icuSources/data/misc/windowsZones.txt b/icuSources/data/misc/windowsZones.txt index 4606b168..fdad2a66 100644 --- a/icuSources/data/misc/windowsZones.txt +++ b/icuSources/data/misc/windowsZones.txt @@ -457,7 +457,6 @@ windowsZones:table(nofallback){ } "Pacific SA Standard Time"{ 001{"America/Santiago"} - AQ{"Antarctica/Palmer"} CL{"America/Santiago"} } "Pacific Standard Time (Mexico)"{ @@ -504,11 +503,12 @@ windowsZones:table(nofallback){ } "SA Eastern Standard Time"{ 001{"America/Cayenne"} - AQ{"Antarctica/Rothera"} + AQ{"Antarctica/Rothera Antarctica/Palmer"} BR{ "America/Fortaleza America/Belem America/Maceio America/Recife Americ" "a/Santarem" } + CL{"America/Punta_Arenas"} FK{"Atlantic/Stanley"} GF{"America/Cayenne"} SR{"America/Paramaribo"} @@ -648,6 +648,7 @@ windowsZones:table(nofallback){ } "Turkey Standard Time"{ 001{"Europe/Istanbul"} + CY{"Asia/Famagusta"} TR{"Europe/Istanbul"} } "Turks And Caicos Standard Time"{ @@ -668,7 +669,7 @@ windowsZones:table(nofallback){ "UTC"{ 001{"Etc/GMT"} GL{"America/Danmarkshavn"} - ZZ{"Etc/GMT"} + ZZ{"Etc/GMT Etc/UTC"} } "UTC+12"{ 001{"Etc/GMT-12"} diff --git a/icuSources/data/misc/zoneinfo64.txt b/icuSources/data/misc/zoneinfo64.txt index 592959c0..872958f9 100644 --- a/icuSources/data/misc/zoneinfo64.txt +++ b/icuSources/data/misc/zoneinfo64.txt @@ -3,17 +3,17 @@ // License & terms of use: http://www.unicode.org/copyright.html#License //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Wed Feb 1 17:54:01 2017 +// Build date: Mon Mar 20 17:49:58 2017 // tz database: ftp://ftp.iana.org/tz/ -// tz version: 2016ja -// ICU version: 58.1 +// tz version: 2017b +// ICU version: 59.1 //--------------------------------------------------------- // >> !!! >> THIS IS A MACHINE-GENERATED FILE << !!! << // >> !!! >>> DO NOT EDIT <<< !!! << //--------------------------------------------------------- zoneinfo64:table(nofallback) { - TZVersion { "2016ja" } + TZVersion { "2017b" } Zones:array { /* ACT */ :int { 354 } //Z#0 /* AET */ :int { 366 } //Z#1 @@ -132,7 +132,7 @@ zoneinfo64:table(nofallback) { /* Africa/Mbabane */ :int { 30 } //Z#45 /* Africa/Mogadishu */ :int { 48 } //Z#46 /* Africa/Monrovia */ :table { - trans:intvector { -1604359012, 73529070 } + trans:intvector { -1604359012, 63593070 } typeOffsets:intvector { -2588, 0, -2670, 0, 0, 0 } typeMap:bin { "0102" } } //Z#47 @@ -940,9 +940,12 @@ zoneinfo64:table(nofallback) { } //Z#184 /* America/Port-au-Prince */ :table { transPre32:intvector { -1, 1770463056 } - trans:intvector { -1670483460, 421218000, 436334400, 452062800, 467784000, 483512400, 499233600, 514962000, 530683200, 546411600, 562132800, 576050400, 594194400, 607500000, 625644000, 638949600, 657093600, 671004000, 688543200, 702453600, 719992800, 733903200, 752047200, 765352800, 783496800, 796802400, 814946400, 828856800, 846396000, 860306400, 877845600, 1112504400, 1130644800, 1143954000, 1162094400, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600 } + trans:intvector { -1670483460, 421218000, 436334400, 452062800, 467784000, 483512400, 499233600, 514962000, 530683200, 546411600, 562132800, 576050400, 594194400, 607500000, 625644000, 638949600, 657093600, 671004000, 688543200, 702453600, 719992800, 733903200, 752047200, 765352800, 783496800, 796802400, 814946400, 828856800, 846396000, 860306400, 877845600, 1112504400, 1130644800, 1143954000, 1162094400, 1331449200, 1352008800, 1362898800, 1383458400, 1394348400, 1414908000, 1425798000, 1446357600, 1489302000, 1509861600 } typeOffsets:intvector { -17360, 0, -18000, 0, -18000, 3600, -17340, 0 } - typeMap:bin { "0301020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + typeMap:bin { "03010201020102010201020102010201020102010201020102010201020102010201020102010201020102010201" } + finalRule { "Haiti" } + finalRaw:int { -18000 } + finalYear:int { 2018 } } //Z#185 /* America/Port_of_Spain */ :table { trans:intvector { -1825098836 } @@ -1317,12 +1320,9 @@ zoneinfo64:table(nofallback) { typeMap:bin { "010304030403040304030403040304030403040304030201030403040304030403040304030403040304030403040304030403040304030403040304030403050103" } } //Z#256 /* Asia/Choibalsan */ :table { - trans:intvector { -2032933080, 252435600, 417974400, 433778400, 449593200, 465314400, 481042800, 496764000, 512492400, 528213600, 543942000, 559663200, 575391600, 591112800, 606841200, 622562400, 638290800, 654616800, 670345200, 686066400, 701794800, 717516000, 733244400, 748965600, 764694000, 780415200, 796143600, 811864800, 828198000, 843919200, 859647600, 875368800, 891097200, 906818400, 988390800, 1001692800, 1017421200, 1033142400, 1048870800, 1064592000, 1080320400, 1096041600, 1111770000, 1127491200, 1143219600, 1159545600, 1206889200, 1427479200, 1443193200 } + trans:intvector { -2032933080, 252435600, 417974400, 433778400, 449593200, 465314400, 481042800, 496764000, 512492400, 528213600, 543942000, 559663200, 575391600, 591112800, 606841200, 622562400, 638290800, 654616800, 670345200, 686066400, 701794800, 717516000, 733244400, 748965600, 764694000, 780415200, 796143600, 811864800, 828198000, 843919200, 859647600, 875368800, 891097200, 906818400, 988390800, 1001692800, 1017421200, 1033142400, 1048870800, 1064592000, 1080320400, 1096041600, 1111770000, 1127491200, 1143219600, 1159545600, 1206889200, 1427479200, 1443193200, 1458928800, 1474642800 } typeOffsets:intvector { 27480, 0, 25200, 0, 28800, 0, 28800, 3600, 32400, 0, 32400, 3600 } - typeMap:bin { "01020504050405040504050405040504050405040504050405040504050405040504050405040504050405040504020302" } - finalRule { "Mongol" } - finalRaw:int { 28800 } - finalYear:int { 2016 } + typeMap:bin { "010205040504050405040504050405040504050405040504050405040504050405040504050405040504050405040203020302" } } //Z#257 /* Asia/Chongqing */ :int { 313 } //Z#258 /* Asia/Chungking */ :int { 313 } //Z#259 @@ -1401,12 +1401,9 @@ zoneinfo64:table(nofallback) { links:intvector { 272, 510 } } //Z#272 /* Asia/Hovd */ :table { - trans:intvector { -2032927596, 252439200, 417978000, 433785600, 449600400, 465321600, 481050000, 496771200, 512499600, 528220800, 543949200, 559670400, 575398800, 591120000, 606848400, 622569600, 638298000, 654624000, 670352400, 686073600, 701802000, 717523200, 733251600, 748972800, 764701200, 780422400, 796150800, 811872000, 828205200, 843926400, 859654800, 875376000, 891104400, 906825600, 988398000, 1001700000, 1017428400, 1033149600, 1048878000, 1064599200, 1080327600, 1096048800, 1111777200, 1127498400, 1143226800, 1159552800, 1427482800, 1443196800 } + trans:intvector { -2032927596, 252439200, 417978000, 433785600, 449600400, 465321600, 481050000, 496771200, 512499600, 528220800, 543949200, 559670400, 575398800, 591120000, 606848400, 622569600, 638298000, 654624000, 670352400, 686073600, 701802000, 717523200, 733251600, 748972800, 764701200, 780422400, 796150800, 811872000, 828205200, 843926400, 859654800, 875376000, 891104400, 906825600, 988398000, 1001700000, 1017428400, 1033149600, 1048878000, 1064599200, 1080327600, 1096048800, 1111777200, 1127498400, 1143226800, 1159552800, 1427482800, 1443196800, 1458932400, 1474646400 } typeOffsets:intvector { 21996, 0, 21600, 0, 25200, 0, 25200, 3600 } - typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } - finalRule { "Mongol" } - finalRaw:int { 25200 } - finalYear:int { 2016 } + typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } } //Z#273 /* Asia/Irkutsk */ :table { trans:intvector { -1575874625, -1247554800, 354902400, 370710000, 386438400, 402246000, 417974400, 433782000, 449596800, 465328800, 481053600, 496778400, 512503200, 528228000, 543952800, 559677600, 575402400, 591127200, 606852000, 622576800, 638301600, 654631200, 670356000, 686084400, 695761200, 701805600, 717530400, 733255200, 748980000, 764704800, 780429600, 796154400, 811879200, 828208800, 846352800, 859658400, 877802400, 891108000, 909252000, 922557600, 941306400, 954007200, 972756000, 985456800, 1004205600, 1017511200, 1035655200, 1048960800, 1067104800, 1080410400, 1099159200, 1111860000, 1130608800, 1143309600, 1162058400, 1174759200, 1193508000, 1206813600, 1224957600, 1238263200, 1256407200, 1269712800, 1288461600, 1301162400, 1414256400 } @@ -1654,12 +1651,9 @@ zoneinfo64:table(nofallback) { } //Z#324 /* Asia/Ujung_Pandang */ :int { 294 } //Z#325 /* Asia/Ulaanbaatar */ :table { - trans:intvector { -2032931252, 252435600, 417974400, 433782000, 449596800, 465318000, 481046400, 496767600, 512496000, 528217200, 543945600, 559666800, 575395200, 591116400, 606844800, 622566000, 638294400, 654620400, 670348800, 686070000, 701798400, 717519600, 733248000, 748969200, 764697600, 780418800, 796147200, 811868400, 828201600, 843922800, 859651200, 875372400, 891100800, 906822000, 988394400, 1001696400, 1017424800, 1033146000, 1048874400, 1064595600, 1080324000, 1096045200, 1111773600, 1127494800, 1143223200, 1159549200, 1427479200, 1443193200 } + trans:intvector { -2032931252, 252435600, 417974400, 433782000, 449596800, 465318000, 481046400, 496767600, 512496000, 528217200, 543945600, 559666800, 575395200, 591116400, 606844800, 622566000, 638294400, 654620400, 670348800, 686070000, 701798400, 717519600, 733248000, 748969200, 764697600, 780418800, 796147200, 811868400, 828201600, 843922800, 859651200, 875372400, 891100800, 906822000, 988394400, 1001696400, 1017424800, 1033146000, 1048874400, 1064595600, 1080324000, 1096045200, 1111773600, 1127494800, 1143223200, 1159549200, 1427479200, 1443193200, 1458928800, 1474642800 } typeOffsets:intvector { 25652, 0, 25200, 0, 28800, 0, 28800, 3600 } - typeMap:bin { "010203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } - finalRule { "Mongol" } - finalRaw:int { 28800 } - finalYear:int { 2016 } + typeMap:bin { "0102030203020302030203020302030203020302030203020302030203020302030203020302030203020302030203020302" } links:intvector { 326, 327 } } //Z#326 /* Asia/Ulan_Bator */ :int { 326 } //Z#327 @@ -3112,26 +3106,26 @@ zoneinfo64:table(nofallback) { Fiji:intvector { 10, 1, -1, 7200, 0, 0, 15, -1, 10800, 0, 3600 } //_#12 + Haiti:intvector { + 2, 8, -1, 7200, 0, 10, 1, -1, 7200, 0, 3600 + } //_#13 Iran:intvector { 2, 21, 0, 0, 0, 8, 21, 0, 0, 0, 3600 - } //_#13 + } //_#14 Jordan:intvector { 2, -31, -5, 86400, 0, 9, -31, -6, 0, 1, 3600 - } //_#14 + } //_#15 LH:intvector { 9, 1, -1, 7200, 0, 3, 1, -1, 7200, 0, 1800 - } //_#15 + } //_#16 Lebanon:intvector { 2, -31, -1, 0, 0, 9, -31, -1, 0, 0, 3600 - } //_#16 + } //_#17 Mexico:intvector { 3, 1, -1, 7200, 0, 9, -31, -1, 7200, 0, 3600 - } //_#17 + } //_#18 Moldova:intvector { 2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600 - } //_#18 - Mongol:intvector { - 2, -31, -7, 7200, 0, 8, -30, -7, 0, 0, 3600 } //_#19 Morocco:intvector { 2, -31, -1, 7200, 0, 9, -31, -1, 10800, 0, 3600 diff --git a/icuSources/tools/tzcode/icuregions b/icuSources/tools/tzcode/icuregions index 92d3eb68..91d5b373 100644 --- a/icuSources/tools/tzcode/icuregions +++ b/icuSources/tools/tzcode/icuregions @@ -12,4 +12,5 @@ Africa/Asmera ER America/Montreal CA Europe/Simferopol UA +Pacific/Johnston UM diff --git a/makefile b/makefile index ca5b4fa4..01d4bda8 100644 --- a/makefile +++ b/makefile @@ -733,13 +733,13 @@ DATA_LOOKUP_DIR=/usr/share/icu/ DATA_LOOKUP_DIR_BUILDHOST=/usr/share/icu/ # Timezone data file(s) -# ICU will look for /var/db/timezone/icutz/icutz44l.dat +# ICU will look for /var/db/icutz/icutz44l.dat # If directory or file is not present, the timesone data in # current data file e.g. /usr/share/icu/icudt56l.dat will be used. # Currently we are not conditionalizing the definition of # TZDATA_LOOKUP_DIR as in # ifeq "$(BUILD_TYPE)" "DEVICE" -# TZDATA_LOOKUP_DIR = /var/db/timezone/icutz +# TZDATA_LOOKUP_DIR = /var/db/icutz # else # ... # since the code stats the path for TZDATA_LOOKUP_DIR and does @@ -747,7 +747,7 @@ DATA_LOOKUP_DIR_BUILDHOST=/usr/share/icu/ # as TZDATA_LOOKUP_DIR = /usr/share/icutz when not needed... # TZDATA_LOOKUP_DIR is passed to compiler as U_TIMEZONE_FILES_DIR # TZDATA_PACKAGE is passed to compiler as U_TIMEZONE_PACKAGE -TZDATA_LOOKUP_DIR = /var/db/timezone/icutz +TZDATA_LOOKUP_DIR = /var/db/icutz TZDATA_PACKAGE = icutz44l TZDATA_FORMAT_STRING = "44l" TZDATA_FORMAT_FILE = icutzformat.txt