aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2010-02-05 17:59:15 -0800
committerElliott Hughes <enh@google.com>2010-02-05 17:59:15 -0800
commitc70b03865a4768168991fb24d2bb5891b43a23d4 (patch)
treecb5d7806801c87802ebf64bfd34cdad56d6864a5
parent7b6e3f9ad9cc73dcc917c2da552e8688942dc41e (diff)
downloadicu4c-c70b03865a4768168991fb24d2bb5891b43a23d4.tar.gz
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.
-rwxr-xr-xstubdata/icu_dat_generator.py7
-rw-r--r--stubdata/icudt42l-default.datbin2399200 -> 2338800 bytes
-rw-r--r--stubdata/icudt42l-default.txt7
-rw-r--r--stubdata/icudt42l-large.datbin5270944 -> 5187632 bytes
-rw-r--r--stubdata/icudt42l-large.txt11
-rw-r--r--stubdata/icudt42l-us-euro.datbin2607648 -> 2526688 bytes
-rw-r--r--stubdata/icudt42l-us-euro.txt10
-rw-r--r--stubdata/icudt42l-us-japan.datbin2179264 -> 2150128 bytes
-rw-r--r--stubdata/icudt42l-us-japan.txt5
-rw-r--r--stubdata/icudt42l-us.datbin1939488 -> 1898864 bytes
-rw-r--r--stubdata/icudt42l-us.txt5
-rw-r--r--stubdata/icudt42l-zh.datbin4876384 -> 4795424 bytes
-rw-r--r--stubdata/icudt42l-zh.txt10
13 files changed, 3 insertions, 52 deletions
diff --git a/stubdata/icu_dat_generator.py b/stubdata/icu_dat_generator.py
index 1a16717e..c78ac1ed 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 GetIcuVersion(version_string):
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 @@ def InvokeIcuTool(tool, working_dir, args):
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 5c751631..1ecb42c9 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 eee8f157..38a9c32d 100644
--- a/stubdata/icudt42l-default.txt
+++ b/stubdata/icudt42l-default.txt
@@ -124,13 +124,6 @@ nl.res
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 3ec56ec0..dbbe9cc0 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 df20b35c..f995c4a5 100644
--- a/stubdata/icudt42l-large.txt
+++ b/stubdata/icudt42l-large.txt
@@ -68,17 +68,6 @@ coll/zh_Hant_HK.res
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 d8bc2717..22902171 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 10ec3d64..368f6582 100644
--- a/stubdata/icudt42l-us-euro.txt
+++ b/stubdata/icudt42l-us-euro.txt
@@ -54,16 +54,6 @@ coll/pl_PL.res
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 21e03acd..81e3c115 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 14583311..bdda5056 100644
--- a/stubdata/icudt42l-us-japan.txt
+++ b/stubdata/icudt42l-us-japan.txt
@@ -35,11 +35,6 @@ coll/ja_JP.res
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 3af006c3..8f4acafe 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 fd85ea7a..1ef12413 100644
--- a/stubdata/icudt42l-us.txt
+++ b/stubdata/icudt42l-us.txt
@@ -34,11 +34,6 @@ coll/es_US.res
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 876f64cb..2337a203 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 52a69d89..f0e0c3b7 100644
--- a/stubdata/icudt42l-zh.txt
+++ b/stubdata/icudt42l-zh.txt
@@ -63,16 +63,6 @@ coll/zh_Hant_HK.res
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