ICU-66108.tar.gz

[apple/icu.git] / icuSources / data / build.xml

diff --git a/icuSources/data/build.xml b/icuSources/data/build.xml
index f47f7dd7c7ec4e2e1722273516105ae74ccca1bd..9d0fa70bfb9802be7facebef05cf1fa8cd19b4ec 100644 (file)
--- a/icuSources/data/build.xml
+++ b/icuSources/data/build.xml
@@ -1,11 +1,15 @@
 <!DOCTYPE project [
     <!ENTITY icu-config SYSTEM "./icu-config.xml">
     <!ENTITY icu-locale-deprecates SYSTEM "./icu-locale-deprecates.xml">
 <!DOCTYPE project [
     <!ENTITY icu-config SYSTEM "./icu-config.xml">
     <!ENTITY icu-locale-deprecates SYSTEM "./icu-locale-deprecates.xml">

+    <!ENTITY icu-coll-deprecates SYSTEM "./icu-coll-deprecates.xml">
+    <!ENTITY icu-rbnf-deprecates SYSTEM "./icu-rbnf-deprecates.xml">

 ]>
 <!--
 /*
 ]>
 <!--
 /*

+* Copyright (C) 2016 and later: Unicode, Inc. and others.
+* License & terms of use: http://www.unicode.org/copyright.html

 *******************************************************************************
 *******************************************************************************

-* Copyright (C) 2005-2010, International Business Machines Corporation and    *
+* Copyright (C) 2005-2015, International Business Machines Corporation and    *

 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */


@@ -17,91 +21,91 @@
         <!-- Load environment variables -->
         <property environment="env"/>
 
         <!-- Load environment variables -->
         <property environment="env"/>
 

-        <condition property="is.icu4j.classes.set" >
-            <or>
-                <isset property="env.ICU4J_CLASSES" />
-                <isset property="env.ICU4J_JAR" />
-            </or>
-        </condition >
-        <fail unless="is.icu4j.classes.set" message="Please set the ICU4J_CLASSES or ICU4J_JAR environment variable."/>
+       <!-- Ant won't set properties that have already been set, so environment variables that have been set before won't be clobbered. -->
+       <property name="env.ICU4C_DIR" location="../.."/>

 
 

-        <condition property="is.icu4c.dir.set" >
-            <isset property="env.ICU4C_DIR" />
-        </condition >
-        <fail unless="is.icu4c.dir.set" message="Please set the ICU4C_DIR environment variable."/>
-
-        <condition property="is.cldr.dir.set" >
+       <condition property="is.cldr.dir.set" >

             <isset property="env.CLDR_DIR" />
         </condition >
             <isset property="env.CLDR_DIR" />
         </condition >

-        <fail unless="is.cldr.dir.set" message="Please set the CLDR_DIR environment variable."/>
+        <fail unless="is.cldr.dir.set" message="Please set the CLDR_DIR environment variable to the top level CLDR source dir (containing 'common')."/>

 
 

-        <condition property="is.cldr.classes.set" >
-            <or>
-                <isset property="env.CLDR_CLASSES" />
-                <isset property="env.CLDR_JAR" />
-            </or>
-        </condition >
-        <fail unless="is.cldr.classes.set" message="Please set the CLDR_CLASSES or CLDR_JAR environment variable."/>
+        <available property="cldrtools.dir" value="${env.CLDR_DIR}/cldr-tools" file="${env.CLDR_DIR}/cldr-tools" type="dir"/>
+        <available property="cldrtools.dir" value="${env.CLDR_DIR}/tools/java" file="${env.CLDR_DIR}/tools/java" type="dir"/>
+        <fail unless="cldrtools.dir" message="Please make sure that the CLDR tools directory is checked out into CLDR_DIR"/>

 
 

-        <condition property="is.utilities.classes.set" >
+        <available property="env.CLDR_CLASSES" value="${cldrtools.dir}/classes" file="${cldrtools.dir}/classes" type="dir"/>
+        <available property="cldrtools.jar" value="${cldrtools.dir}/cldr.jar" file="${cldrtools.dir}/cldr.jar" type="file"/>
+        <condition property="is.cldr.classes.set">

             <or>
             <or>

-                <isset property="env.ICU4J_CLASSES" />
-                <isset property="env.UTILITIES_JAR" />
+                <isset property="env.CLDR_CLASSES" />
+                <isset property="cldrtools.jar" />

             </or>
             </or>

-        </condition >
-        <fail unless="is.utilities.classes.set" message="Please set the ICU4J_CLASSES or UTILITIES_JAR environment variable."/>
+        </condition>
+        <fail unless="is.cldr.classes.set" message="CLDR classes not found in ${cldrtools.dir}. Please either set the CLDR_CLASSES environment variable or build cldr.jar."/>

 
 

+        <property name="env.CLDR_TMP_DIR" location="${env.CLDR_DIR}/../cldr-aux" /> <!-- Hack: see CLDRPaths -->
+        <property name="cldr.prod.dir" location="${env.CLDR_TMP_DIR}/production/" />

         <echo message="java home: ${java.home}"/>
         <echo message="java version: ${java.version}"/>
         <echo message="ant java version: ${ant.java.version}"/>
         <echo message="${ant.version}"/>
         <echo message="java home: ${java.home}"/>
         <echo message="java version: ${java.version}"/>
         <echo message="ant java version: ${ant.java.version}"/>
         <echo message="${ant.version}"/>

+        <echo message="cldr tools dir: ${cldrtools.dir}"/>
+        <echo message="cldr tools jar: ${cldrtools.jar}"/>
+        <echo message="cldr tools classes: ${env.CLDR_CLASSES}"/>
+        <echo message="CLDR_TMP_DIR: ${env.CLDR_TMP_DIR} "/>
+        <echo message="cldr.prod.dir (production data): ${cldr.prod.dir}"/>

     </target>
     </target>

-    <target name="setup">
-
-        <echo message="${env.CLDR_CLASSES}"/>
+    <target name="setup" depends="init">

         <taskdef name="cldr-build" classname="org.unicode.cldr.ant.CLDRBuild">
             <classpath>
                 <pathelement path="${java.class.path}/"/>
         <taskdef name="cldr-build" classname="org.unicode.cldr.ant.CLDRBuild">
             <classpath>
                 <pathelement path="${java.class.path}/"/>

-                <pathelement path="${env.ICU4J_CLASSES}"/>

                 <pathelement path="${env.CLDR_CLASSES}"/>
                 <pathelement path="${env.CLDR_CLASSES}"/>

-                <pathelement location="${env.ICU4J_JAR}"/>
-                <pathelement location="${env.CLDR_JAR}"/>
-                <pathelement location="${env.UTILITIES_JAR}"/>
+                <pathelement location="${cldrtools.jar}"/>
+                <fileset dir="${cldrtools.dir}/libs" includes="*.jar"/>

             </classpath>
         </taskdef>
             </classpath>
         </taskdef>

+        <mkdir dir="${env.CLDR_TMP_DIR}"/> <!-- make sure parent dir exists -->
+        <condition property="cldrprod.exists">
+            <available file="${cldr.prod.dir}" type="dir"/>
+        </condition>

     </target>
     </target>

+
+    <target name="cleanprod" depends="init, setup" if="cldrprod.exists">
+        <delete dir="${cldr.prod.dir}" />
+    </target>
+    <target name="proddata" depends="init,setup" unless="cldrprod.exists">
+        <echo message="Rebuilding ${cldr.prod.dir} - takes a while!"/>
+
+        <!-- setup prod data -->
+        <java fork="true" jar="${cldrtools.jar}">
+            <arg value="org.unicode.cldr.tool.GenerateProductionData" /> <!-- change to short alias 'proddata' or similar when annotated -->
+            <arg value="-v" />
+            <!-- TODO: for now, we just let the default source/target paths used.
+                 could set '-s' / '-d' for explicit source/dest -->
+        </java>
+    </target>
+

     <!-- target for generating ICU data -->
     <!-- target for generating ICU data -->

-    <target name="all" depends="locales, resfiles, resfiles_curr, resfiles_lang, resfiles_region, resfiles_zone, collation, colfiles, rbnf, rbnffiles, supplementalData, metaZones, windowsZones, likelySubtags, plurals, numberingSystems, translit, brkitr, brkfiles, keyTypeData" />
+    <target name="all" depends="locales, collation, rbnf, supplementalData, metadata, metaZones, windowsZones, likelySubtags, plurals, pluralRanges, numberingSystems, translit, brkitr, keyTypeData, genderList, dayPeriods" />

     <!-- parallel target -->
     <!-- parallel target -->

-    <target name="pall" depends="init">
+    <target name="pall" depends="init,setup,proddata">

         <parallel threadsPerProcessor ="1">
           <sequential>
             <ant target='locales' />
         <parallel threadsPerProcessor ="1">
           <sequential>
             <ant target='locales' />

-            <ant target='resfiles' />
-            <ant target='resfiles_curr' />
-            <ant target='resfiles_lang' />
-            <ant target='resfiles_region' />
-            <ant target='resfiles_zone' />

           </sequential>
           <sequential>
             <ant target='collation'>
             </ant>
           </sequential>
           <sequential>
             <ant target='collation'>
             </ant>

-            <ant target='colfiles'>
-            </ant>

           </sequential>
           <sequential>
             <ant target='rbnf'>
             </ant>
           </sequential>
           <sequential>
             <ant target='rbnf'>
             </ant>

-            <ant target='rbnffiles'>
-            </ant>

           </sequential>
           <ant target='supplementalData'>
           </ant>
           <sequential>
             <ant target='brkitr'>
             </ant>
           </sequential>
           <ant target='supplementalData'>
           </ant>
           <sequential>
             <ant target='brkitr'>
             </ant>

-            <ant target='brkfiles'>
-            </ant>

           </sequential>
           <sequential>
             <ant target='translit'>
           </sequential>
           <sequential>
             <ant target='translit'>


@@ -109,294 +113,234 @@
             <!--<ant target='trnsfiles'></ant> Not ANT-built - see
             note below. -->
           </sequential>
             <!--<ant target='trnsfiles'></ant> Not ANT-built - see
             note below. -->
           </sequential>

+          <sequential>
+               <ant target='keyTypeData'/>
+          </sequential>
+          <sequential>
+               <ant target='genderList'/>
+          </sequential>
+          <sequential>
+               <ant target='dayPeriods'/>
+          </sequential>

         </parallel>
      </target>
 
         </parallel>
      </target>
 

-    <target name="locales" depends="init,setup" description="builds locale files in ICU text format">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" srcFile=".*xml" destFile=".*txt">
+    <target name="locales" depends="init,setup,proddata" description="builds locale files in ICU text format">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">

             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>
             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>

-                    <arg name="--sourcedir"       value="${env.CLDR_DIR}/common/main" />
+                    <arg name="--sourcedir"       value="${cldr.prod.dir}/common/main" />

                     <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/locales"/>
                     <arg name="--specialsdir"     value="${env.ICU4C_DIR}/source/data/xml/main"/>
                     <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/locales"/>
                     <arg name="--specialsdir"     value="${env.ICU4C_DIR}/source/data/xml/main"/>

-                    <arg name="--supplementaldir" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="--supplementaldir" value="${cldr.prod.dir}/common/supplemental" />
+                    <arg name="--type" value="locales"/>
+                    <arg name="--depgraphfile" value="../../python/icutools/databuilder/locale_dependencies.py"/>

                 </args>
                <remapper>
                  <remap sourcePath="/Keys" targetDir="lang" />
                  <remap sourcePath="/Languages" targetDir="lang" />
                 </args>
                <remapper>
                  <remap sourcePath="/Keys" targetDir="lang" />
                  <remap sourcePath="/Languages" targetDir="lang" />

-                 <remap sourcePath="/LanguagesShort" targetDir="lang" />
+                 <remap sourcePath="/Languages%long" targetDir="lang" />
+                 <remap sourcePath="/Languages%menu" targetDir="lang" />
+                 <remap sourcePath="/Languages%short" targetDir="lang" />
+                 <remap sourcePath="/Languages%secondary" targetDir="lang" />
+                 <remap sourcePath="/Languages%variant" targetDir="lang" />

                  <remap sourcePath="/Scripts" targetDir="lang" />
                  <remap sourcePath="/Scripts" targetDir="lang" />

+                 <remap sourcePath="/Scripts%secondary" targetDir="lang" />
+                 <remap sourcePath="/Scripts%short" targetDir="lang" />
+                 <remap sourcePath="/Scripts%stand-alone" targetDir="lang" />
+                 <remap sourcePath="/Scripts%variant" targetDir="lang" />

                  <remap sourcePath="/Types" targetDir="lang" />
                  <remap sourcePath="/Types" targetDir="lang" />

+                 <remap sourcePath="/Types%short" targetDir="lang" />

                  <remap sourcePath="/Variants" targetDir="lang" />
                  <remap sourcePath="/Variants" targetDir="lang" />

+                 <remap sourcePath="/Variants%secondary" targetDir="lang" />
+                 <remap sourcePath="/characterLabelPattern" targetDir="lang" />

                  <remap sourcePath="/codePatterns" targetDir="lang" />
                  <remap sourcePath="/localeDisplayPattern" targetDir="lang" />
                  <remap sourcePath="/Countries" targetDir="region" />
                  <remap sourcePath="/codePatterns" targetDir="lang" />
                  <remap sourcePath="/localeDisplayPattern" targetDir="lang" />
                  <remap sourcePath="/Countries" targetDir="region" />

+                 <remap sourcePath="/Countries%variant" targetDir="region" />
+                 <remap sourcePath="/Countries%short" targetDir="region" />

                  <remap sourcePath="/Currencies" targetDir="curr" />
                  <remap sourcePath="/Currencies" targetDir="curr" />

+                 <remap sourcePath="/Currencies%formal" targetDir="curr" />
+                 <remap sourcePath="/Currencies%narrow" targetDir="curr" />
+                 <remap sourcePath="/Currencies%variant" targetDir="curr" />

                  <remap sourcePath="/CurrencyPlurals" targetDir="curr" />
                  <remap sourcePath="/CurrencyUnitPatterns" targetDir="curr" />
                  <remap sourcePath="/currencySpacing" targetDir="curr" />
                  <remap sourcePath="/zoneStrings" targetDir="zone" />
                  <remap sourcePath="/CurrencyPlurals" targetDir="curr" />
                  <remap sourcePath="/CurrencyUnitPatterns" targetDir="curr" />
                  <remap sourcePath="/currencySpacing" targetDir="curr" />
                  <remap sourcePath="/zoneStrings" targetDir="zone" />

+                 <remap sourcePath="/durationUnits" targetDir="unit" />
+                 <remap sourcePath="/units" targetDir="unit" />
+                 <remap sourcePath="/unitsShort" targetDir="unit" />
+                 <remap sourcePath="/unitsNarrow" targetDir="unit" />

                </remapper>
                 <!-- http://ant.apache.org/faq.html#xml-entity-include -->
                 &icu-config;
                </remapper>
                 <!-- http://ant.apache.org/faq.html#xml-entity-include -->
                 &icu-config;

+                       &icu-locale-deprecates;

             </run>
         </cldr-build>
     </target>
             </run>
         </cldr-build>
     </target>

-    <target name="resfiles" depends="init,setup" description="builds resfiles.mk">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="resfiles.mk" noArgs="true">
-            <run>
-                <args>
-                    <arg name="-s" value="${env.CLDR_DIR}/common/main" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/locales"/>
-                    <arg name="-p" value="${env.ICU4C_DIR}/source/data/xml/main"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
-                    <arg name="-w" value="${env.CLDR_DIR}/common/main" />
-                </args>
-               &icu-locale-deprecates;
-            </run>
-        </cldr-build>
-    </target>
-    <target name="resfiles_curr" depends="init,setup" description="builds curr/resfiles.mk">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="resfiles.mk" noArgs="true">
-            <run>
-                <args>
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/curr" />
-                    <arg name="-s" value="${env.CLDR_DIR}/common/main" />
-                    <arg name="-p" value="${env.ICU4C_DIR}/source/data/xml/main"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
-                    <arg name="-w" value="${env.CLDR_DIR}/common/main" />
-                </args>
-               &icu-locale-deprecates;
-            </run>
-        </cldr-build>
-    </target>
-    <target name="resfiles_lang" depends="init,setup" description="builds lang/resfiles.mk">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="resfiles.mk" noArgs="true">
+    <target name="collation" depends="init,setup,proddata" description="builds collation files in ICU text format">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">

             <run>
                 <args>
             <run>
                 <args>

-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/lang" />
-                    <arg name="-s" value="${env.CLDR_DIR}/common/main" />
-                    <arg name="-p" value="${env.ICU4C_DIR}/source/data/xml/main"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
-                    <arg name="-w" value="${env.CLDR_DIR}/common/main" />
-                </args>
-               &icu-locale-deprecates;
-            </run>
-        </cldr-build>
-    </target>
-    <target name="resfiles_region" depends="init,setup" description="builds region/resfiles.mk">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="resfiles.mk" noArgs="true">
-            <run>
-                <args>
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/region" />
-                    <arg name="-s" value="${env.CLDR_DIR}/common/main" />
-                    <arg name="-p" value="${env.ICU4C_DIR}/source/data/xml/main"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
-                    <arg name="-w" value="${env.CLDR_DIR}/common/main" />
+                    <arg name="--sourcedir"       value="${cldr.prod.dir}/common/collation" />
+                    <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/coll"/>
+                    <arg name="--specialsdir"     value="${env.ICU4C_DIR}/source/data/xml/collation"/>
+                    <arg name="--type"            value="collation"/>

                 </args>
                 </args>

-               &icu-locale-deprecates;
+                <!-- http://ant.apache.org/faq.html#xml-entity-include -->
+                &icu-config;
+                &icu-coll-deprecates;

             </run>
         </cldr-build>
     </target>
             </run>
         </cldr-build>
     </target>

-    <target name="resfiles_zone" depends="init,setup" description="builds zone/resfiles.mk">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="resfiles.mk" noArgs="true">
+    <target name="rbnf" depends="init,setup,proddata" description="builds rbnf files in ICU text format">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">

             <run>
                 <args>
             <run>
                 <args>

-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/zone" />
-                    <arg name="-s" value="${env.CLDR_DIR}/common/main" />
-                    <arg name="-p" value="${env.ICU4C_DIR}/source/data/xml/main"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
-                    <arg name="-w" value="${env.CLDR_DIR}/common/main" />
+                    <arg name="--sourcedir"       value="${cldr.prod.dir}/common/rbnf" />
+                    <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/rbnf"/>
+                    <arg name="--specialsdir"     value="${env.ICU4C_DIR}/source/data/xml/rbnf"/>
+                    <arg name="--type" value="rbnf" />

                 </args>
                 </args>

-               &icu-locale-deprecates;
+                <!-- http://ant.apache.org/faq.html#xml-entity-include -->
+                &icu-config;
+                &icu-rbnf-deprecates;

             </run>
         </cldr-build>
     </target>
             </run>
         </cldr-build>
     </target>

-    <target name="collation" depends="init,setup" description="builds collation files in ICU text format">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" srcFile=".*xml" destFile=".*txt">
+    <target name="supplementalData" depends="init,setup,proddata" description="builds supplementalData.txt from supplementalData.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="supplementalData.txt" noArgs="true">
+            <!-- launch the tool and generate the data after reading the config file -->

             <run>
                 <args>
             <run>
                 <args>

-                    <arg name="--sourcedir"       value="${env.CLDR_DIR}/common/collation" />
-                    <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/coll"/>
-                    <arg name="--specialsdir"     value="${env.ICU4C_DIR}/source/data/xml/collation"/>
-                    <arg name="--supplementaldir" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
+                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
+                    <arg name="-t" value="supplementalData"/>

                 </args>
                 </args>

-                <!-- http://ant.apache.org/faq.html#xml-entity-include -->
-                &icu-config;
+               <remapper>
+                 <remap sourcePath="/CurrencyMap" targetDir="curr" />
+                 <remap sourcePath="/CurrencyMeta" targetDir="curr" />
+               </remapper>

             </run>
         </cldr-build>
     </target>
             </run>
         </cldr-build>
     </target>

-    <target name="colfiles" depends="init, setup" description="builds colfiles.mk">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="colfiles.mk" noArgs="true">
+    <target name="metadata" depends="init,setup,proddata" description="builds metadata.txt from supplementalMetadata.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="metadata.txt" noArgs="true">

             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>
             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>

-                    <arg name="-s" value="${env.CLDR_DIR}/common/collation" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/coll"/>
-                    <arg name="-p" value="${env.ICU4C_DIR}/source/data/xml/collation"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
-                    <arg name="-w" value="${env.CLDR_DIR}/common/collation" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
+                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
+                    <arg name="-t" value="metadata"/>

                 </args>
                 </args>

-                <!-- http://ant.apache.org/faq.html#xml-entity-include -->
-                &icu-config;
-                 <deprecates>
-                    <alias from="de__PHONEBOOK" to="de@collation=phonebook"  xpath="//ldml/collations/default[@type='phonebook']"/>
-                    <alias from="es__TRADITIONAL" to="es@collation=traditional" xpath="//ldml/collations/default[@type='traditional']"/>
-                    <alias from="hi__DIRECT" to="hi@collation=direct" xpath="//ldml/collations/default[@type='direct']"/>
-                    <alias from="zh__PINYIN" to="zh@collation=pinyin" xpath="//ldml/collations/default[@type='pinyin']"/>
-                    <alias from="zh_TW_STROKE" to="zh@collation=stroke" xpath="//ldml/collations/default[@type='stroke']"/>
-                    <alias from="in" to="id" />
-                    <alias from="in_ID" to="id_ID" />
-                    <alias from="iw" to="he" />
-                    <alias from="iw_IL" to="he_IL" />
-                    <alias from="mo" to="ro_MD" />
-                    <alias from="no" to="nb" />
-                    <alias from="no_NO" to="nb_NO" />
-                    <alias from="pa_IN" to="pa_Guru_IN" />
-                    <alias from="sh" to="sr_Latn" />
-                    <alias from="sh_BA" to="sr_Latn_BA" />
-                    <alias from="sh_CS" to="sr_Latn_RS" />
-                    <alias from="sh_YU" to="sr_Latn_RS" />
-                    <alias from="sr_BA" to="sr_Cyrl_BA" />
-                    <alias from="sr_ME" to="sr_Cyrl_ME" />
-                    <alias from="sr_RS" to="sr_Cyrl_RS" />
-                    <alias from="zh_CN" to="zh_Hans_CN" />
-                    <alias from="zh_SG" to="zh_Hans_SG" />
-                    <alias from="zh_HK" to="zh_Hant_HK" />
-                    <alias from="zh_MO" to="zh_Hant_MO" />
-                    <alias from="zh_TW" to="zh_Hant_TW" />
-                    <emptyLocale locale="de_" />
-                    <emptyLocale locale="es_" />
-                    <emptyLocale locale="hi_" />
-                    <emptyLocale locale="zh_" />
-                </deprecates>

             </run>
         </cldr-build>
     </target>
             </run>
         </cldr-build>
     </target>

-    <target name="rbnf" depends="init,setup" description="builds rbnf files in ICU text format">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" srcFile=".*xml" destFile=".*txt">
+    <target name="metaZones" depends="init,setup,proddata" description="builds metaZones.txt from metaZones.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="metaZones.txt" noArgs="true">
+            <!-- launch the tool and generate the data after reading the config file -->

             <run>
                 <args>
             <run>
                 <args>

-                    <arg name="--sourcedir"       value="${env.CLDR_DIR}/common/rbnf" />
-                    <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/rbnf"/>
-                    <arg name="--specialsdir"     value="${env.ICU4C_DIR}/source/data/xml/rbnf"/>
-                    <arg name="--supplementaldir" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
+                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
+                    <arg name="-t" value="metaZones"/>

                 </args>
                 </args>

-                <!-- http://ant.apache.org/faq.html#xml-entity-include -->
-                &icu-config;

             </run>
         </cldr-build>
     </target>
             </run>
         </cldr-build>
     </target>

-    <target name="rbnffiles" depends="init, setup" description="builds rbnffiles.mk">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="rbnffiles.mk" noArgs="true">
+    <target name="windowsZones" depends="init,setup,proddata" description="builds windowsZones.txt from windowsZones.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="windowsZones.txt" noArgs="true">

             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>
             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>

-                    <arg name="-s" value="${env.CLDR_DIR}/common/rbnf" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/rbnf"/>
-                    <arg name="-p" value="${env.ICU4C_DIR}/source/data/xml/rbnf"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
-                    <arg name="-w" value="${env.CLDR_DIR}/common/rbnf" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />
+                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
+                    <arg name="-t" value="windowsZones"/>

                 </args>
             </run>
         </cldr-build>
     </target>
                 </args>
             </run>
         </cldr-build>
     </target>

-    <target name="supplementalData" depends="init,setup" description="builds supplementalData.txt from supplementalData.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="supplementalData.txt" noArgs="true">
+    <target name="likelySubtags" depends="init,setup,proddata" description="builds likelySubtags.txt from likelySubtags.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="likelySubtags.txt" noArgs="true">

             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>
             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>

-                    <arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />

                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>

-                    <arg name="-l"/>
-                    <arg name="-f"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-t" value="likelySubtags"/>

                 </args>
                 </args>

-               <remapper>
-                 <remap sourcePath="/CurrencyMap" targetDir="curr" />
-                 <remap sourcePath="/CurrencyMeta" targetDir="curr" />
-               </remapper>

             </run>
         </cldr-build>
     </target>
             </run>
         </cldr-build>
     </target>

-    <target name="metaZones" depends="init,setup" description="builds metaZones.txt from metaZones.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="metaZones.txt" noArgs="true">
+    <target name="plurals" depends="init,setup,proddata" description="builds plurals.txt from plurals.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="plurals.txt" noArgs="true">

             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>
             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>

-                    <arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />

                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>

-                    <arg name="-z"/>
-                    <arg name="-f"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-t" value="plurals"/>

                 </args>
             </run>
         </cldr-build>
     </target>
                 </args>
             </run>
         </cldr-build>
     </target>

-    <target name="windowsZones" depends="init,setup" description="builds windowsZones.txt from windowsZones.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="windowsZones.txt" noArgs="true">
+    <target name="pluralRanges" depends="init,setup,proddata" description="builds pluralRanges.txt from pluralRanges.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="pluralRanges.txt" noArgs="true">

             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>
             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>

-                    <arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />

                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>

-                    <arg name="-i"/>
-                    <arg name="-f"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-t" value="pluralRanges"/>

                 </args>
             </run>
         </cldr-build>
     </target>
                 </args>
             </run>
         </cldr-build>
     </target>

-    <target name="likelySubtags" depends="init,setup" description="builds likelySubtags.txt from likelySubtags.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="likelySubtags.txt" noArgs="true">
+    <target name="numberingSystems" depends="init,setup,proddata" description="builds numberingSystems.txt from numberingSystems.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="numberingSystems.txt" noArgs="true">

             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>
             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>

-                    <arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />

                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>

-                    <arg name="-t"/>
-                    <arg name="-f"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-t" value="numberingSystems"/>

                 </args>
             </run>
         </cldr-build>
     </target>
                 </args>
             </run>
         </cldr-build>
     </target>

-    <target name="plurals" depends="init,setup" description="builds plurals.txt from plurals.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="plurals.txt" noArgs="true">
+    <target name="genderList" depends="init,setup,proddata" description="builds genderList.txt from genderList.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="genderList.txt" noArgs="true">

             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>
             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>

-                    <arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />

                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>

-                    <arg name="-r"/>
-                    <arg name="-f"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-t" value="genderList"/>

                 </args>
             </run>
         </cldr-build>
     </target>
                 </args>
             </run>
         </cldr-build>
     </target>

-    <target name="numberingSystems" depends="init,setup" description="builds numberingSystems.txt from numberingSystems.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="numberingSystems.txt" noArgs="true">
+    <target name="dayPeriods" depends="init,setup,proddata" description="builds dayPeriods.txt from dayPeriods.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="dayPeriods.txt" noArgs="true">

             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>
             <!-- launch the tool and generate the data after reading the config file -->
             <run>
                 <args>

-                    <arg name="-s" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/supplemental" />

                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>

-                    <arg name="-n"/>
-                    <arg name="-f"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="-t" value="dayPeriods"/>

                 </args>
             </run>
         </cldr-build>
     </target>
                 </args>
             </run>
         </cldr-build>
     </target>

-    <target name="brkitr" depends="init,setup" description="builds break iterator files in ICU text format">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" srcFile=".*xml" destFile=".*txt">
+    <target name="brkitr" depends="init,setup,proddata" description="builds break iterator files in ICU text format">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt">

             <run>
                 <args>
             <run>
                 <args>

-                    <arg name="--sourcedir"       value="${env.ICU4C_DIR}/source/data/xml/brkitr"/>
+                    <arg name="--sourcedir"       value="${cldr.prod.dir}/common/segments"/>
+                                       <arg name="--specialsdir"       value="${env.ICU4C_DIR}/source/data/xml/brkitr"/>

                     <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/brkitr"/>
                     <arg name="--destdir"         value="${env.ICU4C_DIR}/source/data/brkitr"/>

-                    <arg name="--supplementaldir" value="${env.CLDR_DIR}/common/supplemental" />
+                    <arg name="--type" value="brkitr" />

                 </args>
                 <!-- The entity include is not required for this target -->
                 <!-- http://ant.apache.org/faq.html#xml-entity-include
                 </args>
                 <!-- The entity include is not required for this target -->
                 <!-- http://ant.apache.org/faq.html#xml-entity-include


@@ -405,41 +349,28 @@
             </run>
         </cldr-build>
     </target>
             </run>
         </cldr-build>
     </target>

-    <target name="brkfiles" depends="init, setup" description="builds brkfiles.mk">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" destFile="brkfiles.mk" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
-            <run>
-                <args>
-                    <arg name="-s" value="${env.ICU4C_DIR}/source/data/xml/brkitr" />
-                    <arg name="-d" value="${env.ICU4C_DIR}/source/data/brkitr"/>
-                    <arg name="-m" value="${env.CLDR_DIR}/common/supplemental" />
-                    <arg name="-w" value="${env.ICU4C_DIR}/source/data/xml/brkitr" />
-                </args>
-            </run>
-        </cldr-build>
-    </target>

 
 

-    <target name="keyTypeData" depends="init,setup" description="builds keyTypeData.txt and timezoneTypes.txt from bcp47/*.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.LDML2ICUConverter" noArgs="true">
-            <!-- launch the tool and generate the data after reading the config file -->
+    <target name="keyTypeData" depends="init,setup,proddata" description="builds keyTypeData.txt and timezoneTypes.txt from bcp47/*.xml">
+        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" noArgs="true">

             <run>
                 <args>
             <run>
                 <args>

-                    <arg name="-s" value="${env.CLDR_DIR}/common/bcp47" />
-                    <arg name="-k" value="${env.CLDR_DIR}/common/bcp47" />
+                    <arg name="-s" value="${cldr.prod.dir}/common/bcp47" />

                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
                     <arg name="-d" value="${env.ICU4C_DIR}/source/data/misc"/>

+                    <arg name="-t" value="keyTypeData"/>

                 </args>
             </run>
         </cldr-build>
     </target>
 
                 </args>
             </run>
         </cldr-build>
     </target>
 

-        <target name="translit" depends="init,setup" description="builds collation files in ICU text format">
+    <target name="translit" depends="init,setup,proddata" description="builds collation files in ICU text format">

         <cldr-build toolName="org.unicode.cldr.icu.ConvertTransforms" srcFile=".*xml" destFile=".*txt">
             <run>
                 <args>
         <cldr-build toolName="org.unicode.cldr.icu.ConvertTransforms" srcFile=".*xml" destFile=".*txt">
             <run>
                 <args>

-                    <arg name="-m" value="((?!.*(Canadian|Ethiopic).*).*)" />
-                    <arg name="--sourcedir" value="${env.CLDR_DIR}/common/transforms" />
+                    <arg name="-m" value="((?!.*(Canadian|Ethiopic|ug-Latin).*).*)" />
+                    <arg name="--sourcedir" value="${cldr.prod.dir}/common/transforms" />

                     <arg name="--destdir"   value="${env.ICU4C_DIR}/source/data/translit"/>
                     <arg name="--commentSkip"/>
                     <arg name="--destdir"   value="${env.ICU4C_DIR}/source/data/translit"/>
                     <arg name="--commentSkip"/>

+                    <arg name="--approvedOnly"/>

                 </args>
                 <!-- http://ant.apache.org/faq.html#xml-entity-include -->
 
                 </args>
                 <!-- http://ant.apache.org/faq.html#xml-entity-include -->
 


@@ -448,11 +379,11 @@
     </target>
     <!-- we don't generate en.txt or el.txt - so don't change trnsfiles.mk for now. -->
 <!--   
     </target>
     <!-- we don't generate en.txt or el.txt - so don't change trnsfiles.mk for now. -->
 <!--   

-     <target name="trnsfiles" depends="init, setup" description="builds trnsfiles.mk">
+     <target name="trnsfiles" depends="init, setup,proddata" description="builds trnsfiles.mk">

         <cldr-build toolName="org.unicode.cldr.icu.ConvertTransforms" srcFile=".*xml" destFile="trnsfiles.mk" noArgs="true">
             <run>
                 <args>   [ double hyphen not allowed in comments - transpose -" to fix below ]
         <cldr-build toolName="org.unicode.cldr.icu.ConvertTransforms" srcFile=".*xml" destFile="trnsfiles.mk" noArgs="true">
             <run>
                 <args>   [ double hyphen not allowed in comments - transpose -" to fix below ]

-                    <arg name=-"-sourcedir" value="${env.CLDR_DIR}/common/transforms" />
+                    <arg name=-"-sourcedir" value="${cldr.prod.dir}/common/transforms" />

                     <arg name=-"-destdir"   value="${env.ICU4C_DIR}/source/data/translit"/>
                     <arg name=-"-commentSkip"/>
                     <arg name=-"-writeIndex"/>
                     <arg name=-"-destdir"   value="${env.ICU4C_DIR}/source/data/translit"/>
                     <arg name=-"-commentSkip"/>
                     <arg name=-"-writeIndex"/>


@@ -460,7 +391,7 @@
             </run>
         </cldr-build>
     </target> -->
             </run>
         </cldr-build>
     </target> -->

-    <target name="clean" depends="init, setup" description="deletes all txt files and mk files from coll and locales directories">
+    <target name="clean" depends="init, setup, cleanprod" description="deletes all txt files and mk files from coll and locales directories">

         <delete>
             <fileset id="locales" dir="${env.ICU4C_DIR}/source/data/locales">
                 <include name="*.txt" />
         <delete>
             <fileset id="locales" dir="${env.ICU4C_DIR}/source/data/locales">
                 <include name="*.txt" />


@@ -468,6 +399,9 @@
             <fileset id="resfiles" dir="${env.ICU4C_DIR}/source/data/locales">
                 <include name="resfiles.mk" />
             </fileset>
             <fileset id="resfiles" dir="${env.ICU4C_DIR}/source/data/locales">
                 <include name="resfiles.mk" />
             </fileset>

+            <fileset id="dependencies_py" dir="${env.ICU4C_DIR}/source/python/icutools/databuilder">
+                <include name="locale_dependencies.py" />
+            </fileset>

             <fileset id="locales_split" dir="${env.ICU4C_DIR}/source/data">
                <include name="curr/*.txt" /> 
                <include name="curr/resfiles.mk" /> 
             <fileset id="locales_split" dir="${env.ICU4C_DIR}/source/data">
                <include name="curr/*.txt" /> 
                <include name="curr/resfiles.mk" /> 


@@ -477,6 +411,9 @@
                <include name="region/resfiles.mk" /> 
                <include name="zone/*.txt" /> 
                <include name="zone/resfiles.mk" /> 
                <include name="region/resfiles.mk" /> 
                <include name="zone/*.txt" /> 
                <include name="zone/resfiles.mk" /> 

+               <exclude name="zone/tzdbNames.txt" /> 
+               <include name="unit/*.txt" /> 
+               <include name="unit/resfiles.mk" /> 

            </fileset>
             <fileset id="collation" dir="${env.ICU4C_DIR}/source/data/coll">
                 <include name="*.txt" />
            </fileset>
             <fileset id="collation" dir="${env.ICU4C_DIR}/source/data/coll">
                 <include name="*.txt" />


@@ -489,17 +426,7 @@
                 <include name="root.txt" />
             </fileset>
             <fileset id="brkitr" dir="${env.ICU4C_DIR}/source/data/brkitr">
                 <include name="root.txt" />
             </fileset>
             <fileset id="brkitr" dir="${env.ICU4C_DIR}/source/data/brkitr">

-                <!-- brkitr directory contains bunch of txt files that are not produced by LDML2ICUConverter.
-                     So can't clean up everything. This needs to be updated when new files are added to xml/brkitr directory -->
-                <include name="root.txt" />
-                <include name="el.txt" />
-                <include name="en.txt" />
-                <include name="en_US.txt" />
-                <include name="en_US_POSIX.txt" />
-                <include name="fi.txt" />
-                <include name="he.txt" />
-                <include name="ja.txt" />
-                <include name="th.txt" />
+                <include name="*.txt"/>

             </fileset>
             <fileset id="brkfiles" dir="${env.ICU4C_DIR}/source/data/brkitr">
                 <include name="brkfiles.mk" />
             </fileset>
             <fileset id="brkfiles" dir="${env.ICU4C_DIR}/source/data/brkitr">
                 <include name="brkfiles.mk" />


@@ -513,6 +440,9 @@
             <fileset id="rbnffiles" dir="${env.ICU4C_DIR}/source/data/rbnf">
                 <include name="rbnffiles.mk" />
             </fileset>
             <fileset id="rbnffiles" dir="${env.ICU4C_DIR}/source/data/rbnf">
                 <include name="rbnffiles.mk" />
             </fileset>

+            <fileset id="metadata" dir="${env.ICU4C_DIR}/source/data/misc">
+                <include name="metadata.txt" />
+            </fileset>

             <fileset id="metaZones" dir="${env.ICU4C_DIR}/source/data/misc">
                 <include name="metaZones.txt" />
             </fileset>
             <fileset id="metaZones" dir="${env.ICU4C_DIR}/source/data/misc">
                 <include name="metaZones.txt" />
             </fileset>


@@ -525,6 +455,9 @@
             <fileset id="plurals" dir="${env.ICU4C_DIR}/source/data/misc">
                 <include name="plurals.txt" />
             </fileset>
             <fileset id="plurals" dir="${env.ICU4C_DIR}/source/data/misc">
                 <include name="plurals.txt" />
             </fileset>

+            <fileset id="pluralRanges" dir="${env.ICU4C_DIR}/source/data/misc">
+                <include name="pluralRanges.txt" />
+            </fileset>

             <fileset id="numberingSystems" dir="${env.ICU4C_DIR}/source/data/misc">
                 <include name="numberingSystems.txt" />
             </fileset>
             <fileset id="numberingSystems" dir="${env.ICU4C_DIR}/source/data/misc">
                 <include name="numberingSystems.txt" />
             </fileset>


@@ -532,6 +465,12 @@
                 <include name="keyTypeData.txt" />
                 <include name="timezoneTypes.txt" />
             </fileset>
                 <include name="keyTypeData.txt" />
                 <include name="timezoneTypes.txt" />
             </fileset>

+            <fileset id="genderList" dir="${env.ICU4C_DIR}/source/data/misc">
+                <include name="genderList.txt" />
+            </fileset>
+            <fileset id="dayPeriods" dir="${env.ICU4C_DIR}/source/data/misc">
+                <include name="dayPeriods.txt" />
+            </fileset>

         </delete>
     </target>
 </project>
         </delete>
     </target>
 </project>