ICU-8827 Unicode 6.1 tools: ignore UTS #46 NV8, update version numbers

X-SVN-Rev: 30880

diff --git a/tools/unicode/makedefs.sh b/tools/unicode/makedefs.sh
index 9496164d6340c46ba66367f22aa4d6d342c13173..f389b1ff948f74302ff90765f382a265e724e706 100755 (executable)
--- a/tools/unicode/makedefs.sh
+++ b/tools/unicode/makedefs.sh
@@ -1,9 +1,9 @@
-# Copyright (C) 2010, International Business Machines
+# Copyright (C) 2011, International Business Machines
 # Corporation and others.  All Rights Reserved.
 #
 # Basic definitions for building ICU Unicode data.
 # Sourced from makeprops.sh for example.
-UNICODE_VERSION=6.0
+UNICODE_VERSION=6.1
 # Assume that there are parallel src & bld trees with the Unicode tools
 # source files and the out-of-source build files.
 # Assume that the current folder is some/path/src/unicode
@@ -13,4 +13,4 @@ UNITOOLS_BLD=../../bld/unicode
 UNIDATA=$ICU_SRC/source/data/unidata
 COMMON=$ICU_SRC/source/common
 SRC_DATA_IN=$ICU_SRC/source/data/in
-BLD_DATA_FILES=$ICU_BLD/data/out/build/icudt45l
+BLD_DATA_FILES=$ICU_BLD/data/out/build/icudt49l

diff --git a/tools/unicode/py/idna2nrm.py b/tools/unicode/py/idna2nrm.py
index ec8a9832691094a30e2057a1bbd73976b0acff95..e1772b428a113cf72d15a1e521bc3376023ec34a 100755 (executable)
--- a/tools/unicode/py/idna2nrm.py
+++ b/tools/unicode/py/idna2nrm.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python2.4
-#   Copyright (C) 2010, International Business Machines
+#   Copyright (C) 2010-2011, International Business Machines
 #   Corporation and others.  All Rights Reserved.
 #
 #   file name:  idna2nrm.py
@@ -27,6 +27,8 @@ replacements = [
   # we treat these values here like their regular siblings.
   (re.compile(r"^([^;]+)  ; disallowed_STD3_valid"), r"# \1disallowed_STD3_valid"),
   (re.compile(r"; disallowed_STD3_mapped +; "), ">"),
+  # For UTS #46, we do not care about "not valid in IDNA2008".
+  (re.compile(r"; *; NV8 +"), ""),
   # Normal transformations.
   (re.compile(r"; disallowed"), ">FFFD"),
   (re.compile(r"; ignored"), ">"),