ICU-13358 Update urename.h. Also update script & instructions.

X-SVN-Rev: 40523

diff --git a/icu4c/source/common/unicode/urename.h b/icu4c/source/common/unicode/urename.h
index f783d2920a14f88308becf2bb29044081207dcd0..982655c4425e0b79586d3beb63db5fc2566a722a 100644 (file)
--- a/icu4c/source/common/unicode/urename.h
+++ b/icu4c/source/common/unicode/urename.h
@@ -107,6 +107,7 @@
 #define _UTF7Data U_ICU_ENTRY_POINT_RENAME(_UTF7Data)
 #define _UTF8Data U_ICU_ENTRY_POINT_RENAME(_UTF8Data)
 #define allowedHourFormatsCleanup U_ICU_ENTRY_POINT_RENAME(allowedHourFormatsCleanup)
+#define checkImpl U_ICU_ENTRY_POINT_RENAME(checkImpl)
 #define cmemory_cleanup U_ICU_ENTRY_POINT_RENAME(cmemory_cleanup)
 #define dayPeriodRulesCleanup U_ICU_ENTRY_POINT_RENAME(dayPeriodRulesCleanup)
 #define deleteAllowedHourFormats U_ICU_ENTRY_POINT_RENAME(deleteAllowedHourFormats)
@@ -944,6 +945,7 @@
 #define uhash_iget U_ICU_ENTRY_POINT_RENAME(uhash_iget)
 #define uhash_igeti U_ICU_ENTRY_POINT_RENAME(uhash_igeti)
 #define uhash_init U_ICU_ENTRY_POINT_RENAME(uhash_init)
+#define uhash_initSize U_ICU_ENTRY_POINT_RENAME(uhash_initSize)
 #define uhash_iput U_ICU_ENTRY_POINT_RENAME(uhash_iput)
 #define uhash_iputi U_ICU_ENTRY_POINT_RENAME(uhash_iputi)
 #define uhash_iremove U_ICU_ENTRY_POINT_RENAME(uhash_iremove)

diff --git a/icu4c/source/tools/genren/Makefile b/icu4c/source/tools/genren/Makefile
index 4c15e813cea8c96c7dddfca82e62f244bc78443a..082c74fab17e3f34c658af236ba22bcfce5d563e 100644 (file)
--- a/icu4c/source/tools/genren/Makefile
+++ b/icu4c/source/tools/genren/Makefile
@@ -55,7 +55,7 @@ $(ICUDIR)/config.status:
        -mv $(ICUDIR) $(ICUDIR)old
        -(rm -rf $(ICUDIR)old &)
        mkdir $(ICUDIR)
-       ( cd $(ICUDIR) ; CPPFLAGS=-DU_DISABLE_RENAMING=1 $(GENREN_CONFIGURE_ENV) $(top_srcdir)/../configure --with-data-packaging=archive --enable-tests=no --prefix=`pwd` $(GENREN_CONFIGURE_OPTS) )
+       ( cd $(ICUDIR) ; CPPFLAGS="-DU_DISABLE_RENAMING=1 -DUCONFIG_ENABLE_PLUGINS" $(GENREN_CONFIGURE_ENV) $(top_srcdir)/../configure --with-data-packaging=archive --enable-tests=no --prefix=`pwd` $(GENREN_CONFIGURE_OPTS) )
     # cause lib and bin to be created, and any other general sanity
        $(MAKE) $(FLAG_OVERRIDE) -C $(ICUDIR) clean
        $(MAKE) $(FLAG_OVERRIDE) -C $(ICUDIR) all-local

diff --git a/icu4c/source/tools/genren/README b/icu4c/source/tools/genren/README
index 2fcca3393f9faf00828cf867815d45dab9d45cac..f4cc4db01591e5c3c765e3b5066ecb7beddac841 100644 (file)
--- a/icu4c/source/tools/genren/README
+++ b/icu4c/source/tools/genren/README
@@ -9,13 +9,26 @@ It also does not currently work well in an out-of-source situation.
 The following instructions are for Linux version.
 - urename.h file should be generated after implementation is complete for a release.
 - the version number for a release should be set according to the list in source/common/unicode/uvernum.h
-- In this [genren] directory, run 
 
-    "make install-header"
+Before generating urename.h, the layout engine header files must be installed from the harfbuzz project.
+This is prerequisite for the icu layoutex (Paragraph Layout) project, which is subject to renaming.
+(Using the svn command is the simplest way of getting just the files from one subdirectory of the git project.)
+
+    cd icu4c/source
+    svn export https://github.com/behdad/icu-le-hb/trunk/src layout
+
+- Regenerate urename.h
+
+    cd icu4c/source/tools/genren
+    make install-header
 
 - urename.h will be updated in icu/source/common/unicode/urename.h  **in your original source directory**
+- Warnings concerning bad namespace (not 'icu') on UCaseMap can be ignored.
 - Eyeball the new file for errors
 
+    cd icu4c/source
+    svn diff common/unicode/urename.h
+
 - Other make targets here
 
     clean      - cleans out intermediate files

diff --git a/icu4c/source/tools/genren/genren.pl b/icu4c/source/tools/genren/genren.pl
index faf0047529cfab5e3bbe3192143c0bef7907d9c0..8859a27ef57738d1cbca8b46f1552ff93cb709f4 100755 (executable)
--- a/icu4c/source/tools/genren/genren.pl
+++ b/icu4c/source/tools/genren/genren.pl
@@ -70,12 +70,12 @@ $HEADERDEF =~ s/\./_/;
 
 #We will print our copyright here + warnings
 
-$YEAR = strftime "%Y",localtime;
-
 print HEADER <<"EndOfHeaderComment";
+// © 2016 and later: Unicode, Inc. and others.
+// License & terms of use: http://www.unicode.org/copyright.html
 /*
 *******************************************************************************
-*   Copyright (C) 2002-$YEAR, International Business Machines
+*   Copyright (C) 2002-2016, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *******************************************************************************
 *