Remove unused RBNF data.
I've left support for RBNF data in "icu_data_generator.py" for now.
I made a couple of changes to the script: I made it slightly more
clear what -h and -v do, and I changed the -v output so that it
doesn't look like we accidentally run the same genrb command four
times in a row (we actually do, but it's in a different directory
each time). This looked like a bug to a naive user (me) running the
script for the first time.
Everything still builds and boots. Not sure what other tests to do
to prove there isn't a rhinoceros in the room.
diff --git a/stubdata/icu_dat_generator.py b/stubdata/icu_dat_generator.py
index 1a16717..c78ac1e 100755
--- a/stubdata/icu_dat_generator.py
+++ b/stubdata/icu_dat_generator.py
@@ -20,8 +20,7 @@
# icu_dat_generator.py icu-version [-v] [-h]
#
# Sample usage:
-# $ANDROID_BUILD_TOP/external/icu4c/stubdata$ ./icu_dat_generator.py 4.2
-# $ANDROID_BUILD_TOP/external/icu4c/stubdata$ ./icu_dat_generator.py 4.2 -v -h
+# $ANDROID_BUILD_TOP/external/icu4c/stubdata$ ./icu_dat_generator.py 4.2 --verbose
#
# Add new dat file:
# 1. Add icudtxxl-<datname>.txt to $ANDROID_BUILD_TOP/external/icu4c/stubdata.
@@ -54,7 +53,7 @@
def PrintHelp():
print "Usage:"
- print "icu_dat_generator.py icu-version [-v] [-h]"
+ print "icu_dat_generator.py icu-version [-v|--verbose] [-h|--help]"
print "Example:"
print "$ANDROID_BUILD_TOP/external/icu4c/stubdata$ ./icu_dat_generator.py 4.2"
@@ -64,7 +63,7 @@
command_list.extend(args)
if VERBOSE:
- command = " ".join(command_list)
+ command = "[%s] %s" % (working_dir, " ".join(command_list))
print command
ret = subprocess.call(command_list, cwd = working_dir)
diff --git a/stubdata/icudt42l-default.dat b/stubdata/icudt42l-default.dat
index 5c75163..1ecb42c 100644
--- a/stubdata/icudt42l-default.dat
+++ b/stubdata/icudt42l-default.dat
Binary files differ
diff --git a/stubdata/icudt42l-default.txt b/stubdata/icudt42l-default.txt
index eee8f15..38a9c32 100644
--- a/stubdata/icudt42l-default.txt
+++ b/stubdata/icudt42l-default.txt
@@ -124,13 +124,6 @@
nl_BE.res
nl_NL.res
pnames.icu
-rbnf/de.res
-rbnf/en.res
-rbnf/es.res
-rbnf/fr.res
-rbnf/nl.res
-rbnf/res_index.res
-rbnf/root.res
res_index.res
root.res
supplementalData.res
diff --git a/stubdata/icudt42l-large.dat b/stubdata/icudt42l-large.dat
index 3ec56ec..dbbe9cc 100644
--- a/stubdata/icudt42l-large.dat
+++ b/stubdata/icudt42l-large.dat
Binary files differ
diff --git a/stubdata/icudt42l-large.txt b/stubdata/icudt42l-large.txt
index df20b35..f995c4a 100644
--- a/stubdata/icudt42l-large.txt
+++ b/stubdata/icudt42l-large.txt
@@ -68,17 +68,6 @@
coll/res_index.res
coll/root.res
-rbnf/de.res
-rbnf/en.res
-rbnf/es.res
-rbnf/fr.res
-rbnf/it.res
-rbnf/ja.res
-rbnf/nl.res
-rbnf/pl.res
-rbnf/res_index.res
-rbnf/root.res
-
ar.res
cs.res
cs_CZ.res
diff --git a/stubdata/icudt42l-us-euro.dat b/stubdata/icudt42l-us-euro.dat
index d8bc271..2290217 100644
--- a/stubdata/icudt42l-us-euro.dat
+++ b/stubdata/icudt42l-us-euro.dat
Binary files differ
diff --git a/stubdata/icudt42l-us-euro.txt b/stubdata/icudt42l-us-euro.txt
index 10ec3d6..368f658 100644
--- a/stubdata/icudt42l-us-euro.txt
+++ b/stubdata/icudt42l-us-euro.txt
@@ -54,16 +54,6 @@
coll/res_index.res
coll/root.res
-rbnf/de.res
-rbnf/en.res
-rbnf/es.res
-rbnf/fr.res
-rbnf/it.res
-rbnf/nl.res
-rbnf/pl.res
-rbnf/res_index.res
-rbnf/root.res
-
cs.res
cs_CZ.res
de.res
diff --git a/stubdata/icudt42l-us-japan.dat b/stubdata/icudt42l-us-japan.dat
index 21e03ac..81e3c11 100644
--- a/stubdata/icudt42l-us-japan.dat
+++ b/stubdata/icudt42l-us-japan.dat
Binary files differ
diff --git a/stubdata/icudt42l-us-japan.txt b/stubdata/icudt42l-us-japan.txt
index 1458331..bdda505 100644
--- a/stubdata/icudt42l-us-japan.txt
+++ b/stubdata/icudt42l-us-japan.txt
@@ -35,11 +35,6 @@
coll/res_index.res
coll/root.res
-rbnf/en.res
-rbnf/ja.res
-rbnf/res_index.res
-rbnf/root.res
-
en.res
en_AU.res
en_BE.res
diff --git a/stubdata/icudt42l-us.dat b/stubdata/icudt42l-us.dat
index 3af006c..8f4acaf 100644
--- a/stubdata/icudt42l-us.dat
+++ b/stubdata/icudt42l-us.dat
Binary files differ
diff --git a/stubdata/icudt42l-us.txt b/stubdata/icudt42l-us.txt
index fd85ea7..1ef1241 100644
--- a/stubdata/icudt42l-us.txt
+++ b/stubdata/icudt42l-us.txt
@@ -34,11 +34,6 @@
coll/res_index.res
coll/root.res
-rbnf/en.res
-rbnf/es.res
-rbnf/res_index.res
-rbnf/root.res
-
en.res
en_AU.res
en_BE.res
diff --git a/stubdata/icudt42l-zh.dat b/stubdata/icudt42l-zh.dat
index 876f64c..2337a20 100644
--- a/stubdata/icudt42l-zh.dat
+++ b/stubdata/icudt42l-zh.dat
Binary files differ
diff --git a/stubdata/icudt42l-zh.txt b/stubdata/icudt42l-zh.txt
index 52a69d8..f0e0c3b 100644
--- a/stubdata/icudt42l-zh.txt
+++ b/stubdata/icudt42l-zh.txt
@@ -63,16 +63,6 @@
coll/res_index.res
coll/root.res
-rbnf/de.res
-rbnf/en.res
-rbnf/es.res
-rbnf/fr.res
-rbnf/it.res
-rbnf/nl.res
-rbnf/pl.res
-rbnf/res_index.res
-rbnf/root.res
-
ar.res
cs.res
cs_CZ.res
