Update ICU version to 64.2

PiperOrigin-RevId: 267010469
This commit is contained in:
Nick Hamatake 2019-09-03 14:15:23 -07:00 committed by TensorFlower Gardener
parent 76ca9f1060
commit 45fe8a9dac
13 changed files with 15 additions and 27 deletions

View File

@ -15,16 +15,13 @@ exports_files(["LICENSE"])
# #
# First, download, build, and install ICU. This installs tools such as makeconv. # First, download, build, and install ICU. This installs tools such as makeconv.
# Then, run the following from your icu4c/source directory: # Then, run the following from your icu4c/source directory:
# $ cd data/mappings # $ cp [path to filters.json] .
# $ rm *.cnv # there shouldn't be any .cnv files here to begin with # $ ICU_DATA_FILTER_FILE=filters.json ./runConfigureICU Linux
# $ grep \.ucm ucmcore.mk | \ # $ make clean && make
# sed 's/\(UCM_SOURCE_CORE=\)\?\([^ ]\+\.ucm\)\\\?/\2/g' | \ # $ cd data/out/tmp
# tr '\n' ' ' | xargs makeconv # $ genccode icudt64l.dat
# $ ls *.cnv > filelist.lst # $ echo 'U_CAPI const void * U_EXPORT2 uprv_getICUData_conversion() { return icudt64l_dat.bytes; }' >> icudt64l_dat.c
# $ pkgdata -m common -p ucmcore filelist.lst # This creates icudt64l_dat.c, which you can move, rename, gzip, then split.
# $ genccode -f custom_conversion_data ucmcore.dat
# This creates custom_conversion_data.c. You will need to change the target
# :conversion_data to depend on your custom source instead of :conversion_data.c
filegroup( filegroup(
name = "conversion_files", name = "conversion_files",
srcs = glob(["icu_conversion_data.c.gz.*"]), srcs = glob(["icu_conversion_data.c.gz.*"]),

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -12,10 +12,9 @@
/** /**
* \def U_DEBUG * \def U_DEBUG
* Determines whether to include debugging code. * Determines whether to include debugging code.
--- a/icu4c/source/common/udata.cpp --- a/icu4c/source/common/udata.cpp
+++ b/icu4c/source/common/udata.cpp +++ b/icu4c/source/common/udata.cpp
@@ -18,15 +18,15 @@ @@ -18,11 +18,10 @@
#include "unicode/utypes.h" /* U_PLATFORM etc. */ #include "unicode/utypes.h" /* U_PLATFORM etc. */
@ -31,12 +30,7 @@
#endif #endif
#include "unicode/putil.h" #include "unicode/putil.h"
#include "unicode/udata.h" @@ -649,10 +648,9 @@
+#include "unicode/umachine.h"
#include "unicode/uversion.h"
#include "charstr.h"
#include "cmemory.h"
@@ -641,10 +641,11 @@
* partial-data-library access functions where each returns a pointer * partial-data-library access functions where each returns a pointer
* to its data package, if it is linked in. * to its data package, if it is linked in.
*/ */
@ -44,22 +38,19 @@
-extern const void *uprv_getICUData_collation(void) ATTRIBUTE_WEAK; -extern const void *uprv_getICUData_collation(void) ATTRIBUTE_WEAK;
-extern const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK; -extern const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK;
-*/ -*/
+
+//extern "C" const void *uprv_getICUData_collation(void);
+U_CDECL_BEGIN +U_CDECL_BEGIN
+const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK; +const void *uprv_getICUData_conversion(void) ATTRIBUTE_WEAK;
+U_CDECL_END +U_CDECL_END
/*----------------------------------------------------------------------* /*----------------------------------------------------------------------*
* * * *
@@ -702,10 +703,11 @@ @@ -710,10 +708,11 @@
if (uprv_getICUData_collation) { if (uprv_getICUData_collation) {
setCommonICUDataPointer(uprv_getICUData_collation(), FALSE, pErrorCode); setCommonICUDataPointer(uprv_getICUData_collation(), FALSE, pErrorCode);
} }
+ */ + */
if (uprv_getICUData_conversion) { if (uprv_getICUData_conversion) {
- setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode); setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode);
+ setCommonICUDataPointer(uprv_getICUData_conversion(), FALSE, pErrorCode);
} }
- */ - */
+ +

View File

@ -10,11 +10,11 @@ def clean_dep(dep):
def repo(): def repo():
third_party_http_archive( third_party_http_archive(
name = "icu", name = "icu",
strip_prefix = "icu-release-62-1", strip_prefix = "icu-release-64-2",
sha256 = "e15ffd84606323cbad5515bf9ecdf8061cc3bf80fb883b9e6aa162e485aa9761", sha256 = "dfc62618aa4bd3ca14a3df548cd65fe393155edd213e49c39f3a30ccd618fc27",
urls = [ urls = [
"https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-62-1.tar.gz", "https://storage.googleapis.com/mirror.tensorflow.org/github.com/unicode-org/icu/archive/release-64-2.zip",
"https://github.com/unicode-org/icu/archive/release-62-1.tar.gz", "https://github.com/unicode-org/icu/archive/release-64-2.zip",
], ],
build_file = "//third_party/icu:BUILD.bazel", build_file = "//third_party/icu:BUILD.bazel",
system_build_file = "//third_party/icu:BUILD.system", system_build_file = "//third_party/icu:BUILD.system",