Index: source/data/build.xml |
diff --git a/source/data/build.xml b/source/data/build.xml |
index f256b5b5831b52abb1f85fd882086bbe78eea690..de114568bb9b76c29d2b250117b0d9b214dc59ab 100644 |
--- a/source/data/build.xml |
+++ b/source/data/build.xml |
@@ -1,11 +1,12 @@ |
<!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"> |
]> |
<!-- |
/* |
******************************************************************************* |
-* Copyright (C) 2005-2013, International Business Machines Corporation and * |
+* Copyright (C) 2005-2014, International Business Machines Corporation and * |
* others. All Rights Reserved. * |
******************************************************************************* |
*/ |
@@ -82,6 +83,18 @@ |
<!--<ant target='trnsfiles'></ant> Not ANT-built - see |
note below. --> |
</sequential> |
+ <sequential> |
+ <ant target='keyTypeData'/> |
+ </sequential> |
+ <sequential> |
+ <ant target='genderList'/> |
+ </sequential> |
+ <sequential> |
+ <ant target='postalCodeData'/> |
+ </sequential> |
+ <sequential> |
+ <ant target='dayPeriods'/> |
+ </sequential> |
</parallel> |
</target> |
@@ -101,19 +114,32 @@ |
<remap sourcePath="/Keys" targetDir="lang" /> |
<remap sourcePath="/Languages" targetDir="lang" /> |
<remap sourcePath="/LanguagesShort" targetDir="lang" /> |
+ <remap sourcePath="/Languages%secondary" targetDir="lang" /> |
+ <remap sourcePath="/Languages%variant" 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%short" targetDir="lang" /> |
<remap sourcePath="/Variants" targetDir="lang" /> |
+ <remap sourcePath="/Variants%secondary" targetDir="lang" /> |
<remap sourcePath="/codePatterns" targetDir="lang" /> |
<remap sourcePath="/localeDisplayPattern" targetDir="lang" /> |
<remap sourcePath="/Countries" targetDir="region" /> |
+ <remap sourcePath="/Countries%variant" targetDir="region" /> |
<remap sourcePath="/CountriesShort" targetDir="region" /> |
<remap sourcePath="/Currencies" 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="/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; |
@@ -133,32 +159,7 @@ |
</args> |
<!-- http://ant.apache.org/faq.html#xml-entity-include --> |
&icu-config; |
- <deprecates> |
- <alias from="de__PHONEBOOK" to="de" rbpath="/collations/default" value="phonebook"/> |
- <alias from="es__TRADITIONAL" to="es" rbpath="/collations/default" value="traditional"/> |
- <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_" /> |
- </deprecates> |
+ &icu-coll-deprecates; |
</run> |
</cldr-build> |
</target> |
@@ -305,7 +306,8 @@ |
<cldr-build toolName="org.unicode.cldr.icu.NewLdml2IcuConverter" srcFile=".*xml" destFile=".*txt"> |
<run> |
<args> |
- <arg name="--sourcedir" value="${env.ICU4C_DIR}/source/data/xml/brkitr"/> |
+ <arg name="--sourcedir" value="${env.CLDR_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="--type" value="brkitr" /> |
<arg name="--makefile" value="brkfiles.mk"/> |
@@ -330,11 +332,11 @@ |
</cldr-build> |
</target> |
- <target name="translit" depends="init,setup" description="builds collation files in ICU text format"> |
+ <target name="translit" depends="init,setup" description="builds collation files in ICU text format"> |
<cldr-build toolName="org.unicode.cldr.icu.ConvertTransforms" srcFile=".*xml" destFile=".*txt"> |
<run> |
<args> |
- <arg name="-m" value="((?!.*(Canadian|Ethiopic).*).*)" /> |
+ <arg name="-m" value="((?!.*(Canadian|Ethiopic|ug-Latin).*).*)" /> |
<arg name="--sourcedir" value="${env.CLDR_DIR}/common/transforms" /> |
<arg name="--destdir" value="${env.ICU4C_DIR}/source/data/translit"/> |
<arg name="--commentSkip"/> |
@@ -375,6 +377,9 @@ |
<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" /> |