Update ICU to 54.1 step 1

source/tools/genrb/genrb.c

 /*
 *******************************************************************************
 *
-*   Copyright (C) 1998-2012, International Business Machines
+*   Copyright (C) 1998-2014, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
 *
 * File genrb.c
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   05/25/99    stephen     Creation.
@@ skipping 70 matching lines @@
                       UOPTION_DEF("formatVersion", '\x01', UOPT_REQUIRES_ARG),/* 18 */
                       UOPTION_DEF("writePoolBundle", '\x01', UOPT_NO_ARG),/* 19 */
                       UOPTION_DEF("usePoolBundle", '\x01', UOPT_OPTIONAL_ARG),/* 20 */
                       UOPTION_DEF("includeUnihanColl", '\x01', UOPT_NO_ARG),/* 21 */ /* temporary, don't display in usage info */
                   };
 
 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 {
   uint8_t *fBytes;
   const int32_t *fIndexes;
   const char *fKeys;
   int32_t fKeysLength;
   int32_t fKeysCount;
   int32_t fChecksum;
 } ResFile;
@@ skipping 167 matching lines @@
         outputEnc = options[WRITE_JAVA].value;
     }
 
     if(options[WRITE_XLIFF].doesOccur) {
         write_xliff = TRUE;
         if(options[WRITE_XLIFF].value != NULL){
             xliffOutputFileName = options[WRITE_XLIFF].value;
         }
     }
 
-    initParser(options[NO_COLLATION_RULES].doesOccur);
+    initParser();
 
     /*added by Jing*/
     if(options[LANGUAGE].doesOccur) {
         language = options[LANGUAGE].value;
     }
 
     if(options[WRITE_POOL_BUNDLE].doesOccur) {
         newPoolBundle = bundle_open(NULL, TRUE, &status);
         if(U_FAILURE(status)) {
             fprintf(stderr, "unable to create an empty bundle for the pool keys: %s\n", u_errorName(status));
@@ skipping 96 matching lines @@
         for (i = 0; i < poolBundle.fKeysLength; ++i) {
             if (poolBundle.fKeys[i] == 0) {
                 ++poolBundle.fKeysCount;
             }
         }
         T_FileStream_close(poolFile);
         setUsePoolBundle(TRUE);
     }
 
     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) {
         printf("genrb number of files: %d\n", argc - 1);
     }
     /* generate the binary files */
     for(i = 1; i < argc; ++i) {
         status = U_ZERO_ERROR;
         arg    = getLongPathname(argv[i]);
 
@@ skipping 139 matching lines @@
     }
     if (ucbuf == NULL || U_FAILURE(*status)) {
         fprintf(stderr, "An error occured processing file %s. Error: %s\n", openFileName == NULL ? filename : openFileName,u_errorName(*status));
         goto finish;
     }
     /* auto detected popular encodings? */
     if (cp!=NULL && isVerbose()) {
         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));
         goto finish;
     }
     if(options[WRITE_POOL_BUNDLE].doesOccur) {
         int32_t newKeysLength;
         const char *newKeys, *newKeysLimit;
         bundle_compactKeys(data, status);
         newKeys = bundle_getKeyBytes(data, &newKeysLength);
@@ skipping 152 matching lines @@
     uprv_free(dirname);
 
     return resName;
 }
 
 /*
  * Local Variables:
  * indent-tabs-mode: nil
  * End:
  */