@@ -1705,19 +1705,58 @@ const autoScript = {
17051705 makeListOfTimeZoneNames : function ( cb ) {
17061706 overallProgress . beginTask ( 'Writing timezone names to file' )
17071707 let zoneNames = Object . keys ( zoneCfg )
1708+ let zoneNames1970 = Object . keys ( zoneCfg1970 )
1709+ let zoneNamesNow = Object . keys ( zoneCfgNow )
17081710 oceanZones . forEach ( oceanZone => {
17091711 zoneNames . push ( oceanZone . tzid )
1712+ zoneNames1970 . push ( oceanZone . tzid )
1713+ zoneNamesNow . push ( oceanZone . tzid )
17101714 } )
1715+ zoneNames . sort ( ) ;
1716+ zoneNames1970 . sort ( ) ;
1717+ zoneNamesNow . sort ( ) ;
17111718 if ( includedZones . length > 0 ) {
17121719 zoneNames = zoneNames . filter ( zoneName => includedZones . indexOf ( zoneName ) > - 1 )
1720+ zoneNames1970 = zoneNames1970 . filter ( zoneName => includedZones . indexOf ( zoneName ) > - 1 )
1721+ zoneNamesNow = zoneNamesNow . filter ( zoneName => includedZones . indexOf ( zoneName ) > - 1 )
17131722 }
17141723 if ( excludedZones . length > 0 ) {
17151724 zoneNames = zoneNames . filter ( zoneName => excludedZones . indexOf ( zoneName ) === - 1 )
1725+ zoneNames1970 = zoneNames1970 . filter ( zoneName => excludedZones . indexOf ( zoneName ) === - 1 )
1726+ zoneNamesNow = zoneNamesNow . filter ( zoneName => excludedZones . indexOf ( zoneName ) === - 1 )
17161727 }
17171728 fs . writeFile (
17181729 distDir + '/timezone-names.json' ,
17191730 JSON . stringify ( zoneNames ) ,
1720- cb
1731+ ( ) => {
1732+ if ( ! argv . skip_1970_zones ) {
1733+ fs . writeFile (
1734+ distDir + '/timezone-names-1970.json' ,
1735+ JSON . stringify ( zoneNames1970 ) ,
1736+ ( ) => {
1737+ if ( ! argv . skip_now_zones ) {
1738+ fs . writeFile (
1739+ distDir + '/timezone-names-now.json' ,
1740+ JSON . stringify ( zoneNamesNow ) ,
1741+ cb
1742+ )
1743+ } else {
1744+ cb ( )
1745+ }
1746+ }
1747+ )
1748+ } else {
1749+ if ( ! argv . skip_now_zones ) {
1750+ fs . writeFile (
1751+ distDir + '/timezone-names-now.json' ,
1752+ JSON . stringify ( zoneNamesNow ) ,
1753+ cb
1754+ )
1755+ } else {
1756+ cb ( )
1757+ }
1758+ }
1759+ }
17211760 )
17221761 } ,
17231762 analyzeChangesFromLastRelease : [ 'downloadLastRelease' , 'mergeZones' , function ( results , cb ) {
0 commit comments