X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/a0b4f637ba1a6c3c5651b61a69303b029bacf7d3..2ca993e82fb37b597a3c73ecd1586a139a6579c5:/icuSources/data/build.xml

diff --git a/icuSources/data/build.xml b/icuSources/data/build.xml
index afa08d82..96b26362 100644
--- a/icuSources/data/build.xml
+++ b/icuSources/data/build.xml
@@ -2,11 +2,12 @@
     <!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) 2005-2014, International Business Machines Corporation and    *
+* Copyright (C) 2005-2015, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
@@ -56,7 +57,7 @@
         </taskdef>
     </target>
     <!-- target for generating ICU data -->
-    <target name="all" depends="locales, collation, rbnf, supplementalData, metadata, metaZones, windowsZones, likelySubtags, plurals, numberingSystems, translit, brkitr, keyTypeData, genderList, postalCodeData, dayPeriods" />
+    <target name="all" depends="locales, collation, rbnf, supplementalData, metadata, metaZones, windowsZones, likelySubtags, plurals, numberingSystems, translit, brkitr, keyTypeData, genderList, dayPeriods" />
     <!-- parallel target -->
     <target name="pall" depends="init">
         <parallel threadsPerProcessor ="1">
@@ -89,9 +90,6 @@
           <sequential>
           	<ant target='genderList'/>
           </sequential>
-          <sequential>
-          	<ant target='postalCodeData'/>
-          </sequential>
           <sequential>
           	<ant target='dayPeriods'/>
           </sequential>
@@ -176,6 +174,7 @@
                 </args>
                 <!-- http://ant.apache.org/faq.html#xml-entity-include -->
                 &icu-config;
+                &icu-rbnf-deprecates;
             </run>
         </cldr-build>
     </target>
@@ -279,18 +278,6 @@
             </run>
         </cldr-build>
     </target>
-    <target name="postalCodeData" depends="init,setup" description="builds postalCodeData.txt from postalCodeData.xml">
-        <cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" destFile="postalCodeData.txt" noArgs="true">
-            <!-- 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="-d" value="${env.ICU4C_DIR}/source/data/misc"/>
-                    <arg name="-t" value="postalCodeData"/>
-                </args>
-            </run>
-        </cldr-build>
-    </target>
     <target name="dayPeriods" depends="init,setup" 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 -->
@@ -393,15 +380,7 @@
                 <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="ja.txt" />
+                <include name="*.txt"/>
             </fileset>
             <fileset id="brkfiles" dir="${env.ICU4C_DIR}/source/data/brkitr">
                 <include name="brkfiles.mk" />
@@ -440,9 +419,6 @@
             <fileset id="genderList" dir="${env.ICU4C_DIR}/source/data/misc">
                 <include name="genderList.txt" />
             </fileset>
-            <fileset id="postalCodeData" dir="${env.ICU4C_DIR}/source/data/misc">
-                <include name="postalCodeData.txt" />
-            </fileset>
             <fileset id="dayPeriods" dir="${env.ICU4C_DIR}/source/data/misc">
                 <include name="dayPeriods.txt" />
             </fileset>