Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: source/tools/genrb/genrb.c

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/tools/genrb/genrb.h ('k') | source/tools/genrb/genrb.vcxproj » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/tools/genrb/genrb.c
diff --git a/source/tools/genrb/genrb.c b/source/tools/genrb/genrb.c
index 7c5248092b23b4f2cb998117ef13889163485898..85c02897e6a5cced1336791b2352baa3824961f6 100644
--- a/source/tools/genrb/genrb.c
+++ b/source/tools/genrb/genrb.c
@@ -1,7 +1,7 @@
/*
*******************************************************************************
*
-* Copyright (C) 1998-2012, International Business Machines
+* Copyright (C) 1998-2014, International Business Machines
* Corporation and others. All Rights Reserved.
*
*******************************************************************************
@@ -92,7 +92,6 @@ static UBool write_java = FALSE;
static UBool write_xliff = FALSE;
static const char* outputEnc ="";
static struct SRBRoot *newPoolBundle = NULL;
- UBool gIncludeUnihanColl = FALSE;
/* TODO: separate header file for ResFile? */
typedef struct ResFile {
@@ -280,7 +279,7 @@ main(int argc,
}
}
- initParser(options[NO_COLLATION_RULES].doesOccur);
+ initParser();
/*added by Jing*/
if(options[LANGUAGE].doesOccur) {
@@ -397,7 +396,10 @@ main(int argc,
}
if(options[INCLUDE_UNIHAN_COLL].doesOccur) {
- gIncludeUnihanColl = TRUE;
+ puts("genrb option --includeUnihanColl ignored: \n"
+ "CLDR 26/ICU 54 unihan data is small, except\n"
+ "the ucadata-unihan.icu version of the collation root data\n"
+ "is about 300kB larger than the ucadata-implicithan.icu version.");
}
if((argc-1)!=1) {
@@ -557,7 +559,8 @@ processFile(
printf("autodetected encoding %s\n", cp);
}
/* Parse the data into an SRBRoot */
- data = parse(ucbuf, inputDir, outputDir, !omitBinaryCollation, status);
+ data = parse(ucbuf, inputDir, outputDir, filename,
+ !omitBinaryCollation, options[NO_COLLATION_RULES].doesOccur, status);
if (data == NULL || U_FAILURE(*status)) {
fprintf(stderr, "couldn't parse the file %s. Error:%s\n", filename,u_errorName(*status));
« no previous file with comments | « source/tools/genrb/genrb.h ('k') | source/tools/genrb/genrb.vcxproj » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698