ICU-20439 update config files and instructions for CLDR release-35-beta integration

diff --git a/icu4c/source/data/cldr-icu-readme.txt b/icu4c/source/data/cldr-icu-readme.txt
index 7078e2c2316a8792ab68be622edda481c6c38765..c96b1b0cd12e676935f6fb6244bd860d61451fb7 100644 (file)
--- a/icu4c/source/data/cldr-icu-readme.txt
+++ b/icu4c/source/data/cldr-icu-readme.txt
@@ -161,11 +161,14 @@ ant all
 #ant jar
 
 # 3. Configure ICU4C, build and test without new data first, to verify that
-# there are no pre-existing errors (configure shown here for MacOSX, adjust
-# for your platform).
+# there are no pre-existing errors.
+# If you do not want to re-run configure and make in step 12 below, then define
+# ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data here in order to generate the
+# unicore data needed for the ICU4J jars. Here <platform> is the runConfigureICU
+# code for the platform you are building, e.g. Linux, MacOSX, Cygwin.
 
 cd $ICU4C_DIR/source
-./runConfigureICU MacOSX
+ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data ./runConfigureICU <platform>
 make all 2>&1 | tee /tmp/icu4c-oldData-makeAll.txt
 make check 2>&1 | tee /tmp/icu4c-oldData-makeCheck.txt
 
@@ -208,8 +211,12 @@ git status
 
 # 7. Now rebuild ICU4C with the new data and run make check tests.
 # Again, keep a log so you can investigate the errors.
-
 cd $ICU4C_DIR/source
+
+# 7a. NEW: This now requires re-doing runConfigureICU
+ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data ./runConfigureICU <platform>
+
+# 7b. Now do the rebuild.
 make check 2>&1 | tee /tmp/icu4c-newData-makeCheck.txt
 
 # 8. Investigate each test case failure. The first run processing new CLDR data
@@ -242,21 +249,22 @@ cd $ICU4J_ROOT
 ant all 2>&1 | tee /tmp/icu4j-oldData-antAll.txt
 ant check 2>&1 | tee /tmp/icu4j-oldData-antCheck.txt
 
-# 12. Transfer the data to ICU4J.
-# 12a. You must first configure ICU in order to add the unicore data.
-
+# 12. Transfer the data to ICU4J:
 cd $ICU4C_DIR/source
-ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data ./runConfigureICU Linux
 
-# 12b. Now buil the jar files.
+# 12a. If you did not do configure ICU4C this way in step 3, do it now:
+ICU_DATA_BUILDTOOL_OPTS=--include_uni_core_data ./runConfigureICU <platform>
 
+# 12b. Now build the jar files.
 cd $ICU4C_DIR/source/data
-make clean
-make -j6
+# The following 2 lines are optional for a clean rebuild:
+  make clean
+  make -j6
 make icu4j-data-install
 cd $ICU4C_DIR/source/test/testdata
-make clean
-make -j6
+# The following 2 lines are optional for a clean rebuild:
+  make clean
+  make -j6
 make icu4j-data-install
 
 # 13. Now rebuild ICU4J with the new data and run tests:

diff --git a/icu4c/source/data/icu-coll-deprecates.xml b/icu4c/source/data/icu-coll-deprecates.xml
index ccf978a659266a5b0b6b041d5e9d5b516f49286e..09efac236747691b80c844e3db8f2cdc1a01eb62 100644 (file)
--- a/icu4c/source/data/icu-coll-deprecates.xml
+++ b/icu4c/source/data/icu-coll-deprecates.xml
@@ -16,7 +16,7 @@
        <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="mo" to="ro" />
        <alias from="no" to="nb" />
        <alias from="no_NO" to="nb_NO" />
        <alias from="pa_IN" to="pa_Guru_IN" />

diff --git a/icu4c/source/data/icu-locale-deprecates.xml b/icu4c/source/data/icu-locale-deprecates.xml
index 5ed82ede4f064176d33306c308bbb04c6dff0e58..d2ec74166c477bae977741833e1223e39138a6a1 100644 (file)
--- a/icu4c/source/data/icu-locale-deprecates.xml
+++ b/icu4c/source/data/icu-locale-deprecates.xml
@@ -14,12 +14,16 @@
     <alias from="bs_BA" to="bs_Latn_BA" />
     <alias from="en_NH" to="en_VU"/>
     <alias from="en_RH" to="en_ZW"/>
+    <alias from="ff_CM" to="ff_Latn_CM"/>
+    <alias from="ff_GN" to="ff_Latn_GN"/>
+    <alias from="ff_MR" to="ff_Latn_MR"/>
+    <alias from="ff_SN" to="ff_Latn_SN"/>
     <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="ja_JP_TRADITIONAL" to="ja_JP" rbpath="/calendar/default" value="japanese"/>
-    <alias from="mo" to="ro_MD"/>
+    <alias from="mo" to="ro"/>
     <alias from="no_NO" to="nb_NO"/>
     <alias from="no_NO_NY" to="nn_NO"/>
     <alias from="no" to="nb"/>