From 3ba55d3843e3ae4d46547453bbe4de0fc842ba02 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Mon, 27 Feb 2012 18:38:36 +0000 Subject: [PATCH] ICU-9139 Update unicode-license copyright, fix readme validation errs X-SVN-Rev: 31523 --- icu4c/readme.html | 67 +++++++++++++++++++-------------------- icu4c/unicode-license.txt | 2 +- 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/icu4c/readme.html b/icu4c/readme.html index 47d34a73b59..27c118adcb3 100644 --- a/icu4c/readme.html +++ b/icu4c/readme.html @@ -3,9 +3,9 @@ - ReadMe for ICU 49 + ReadMe for ICU 49 Release Candidate + "Copyright (c) 1997-2012 IBM Corporation and others. All Rights Reserved." />

International Components for Unicode
- ICU 49 ReadMe

+ ICU 49 (Release Candidate) ReadMe - -

Last updated: 2012-Feb-26
+

Note: This is a development milestone release of ICU4C 49. + This milestone is intended for those wishing to get an early look at ICU 49 new features and API changes. + It is not recommended for production use. +

+

Last updated: 2012-Feb-27
Copyright © 1997-2012 International Business Machines Corporation and others. All Rights Reserved.

@@ -538,7 +536,7 @@ "using namespace icu;" which defeats much of the purpose of the namespace. (This is for historical reasons: Originally, ICU4C did not use namespaces, and some compilers did not support them. The default "using" statement - preserves source code compatibility.)
+ preserves source code compatibility.)
We recommend you turn this off via -DU_USING_ICU_NAMESPACE=0 or by modifying unicode/uversion.h: 
Index: source/common/unicode/uversion.h
@@ -566,7 +564,7 @@
         This means that some implementation code becomes simpler and faster,
         and statically linked ICU libraries become smaller.
         (See the U_CHARSET_IS_UTF8
-        API documentation for more details.)

+        API documentation for more details.)

         You can -DU_CHARSET_IS_UTF8=1 or
         modify unicode/utypes.h (in ICU 4.8 and below)
         or modify unicode/platform.h (in ICU 49 and higher):
@@ -590,26 +588,27 @@
         This can lead to inadvertent construction of a UnicodeString
         with a single character by using an integer,
         and it can lead to inadvertent dependency on the conversion framework
-        by using a C string literal.

+        by using a C string literal.

         Beginning with ICU 49, you should do the following:
         
         Note: The ICU test suites cannot be compiled with these settings.
       
       
  • utf.h, utf8.h, utf16.h, utf_old.h:
         By default, utypes.h (and thus almost every public ICU header)
         includes all of these header files.
         Often, none of them are needed, or only one or two of them.
-        All of utf_old.h is deprecated or obsolete.
    
+        All of utf_old.h is deprecated or obsolete.
    
         Beginning with ICU 49,
         you should define U_NO_DEFAULT_INCLUDE_UTF_HEADERS to 1
         (via -D or uconfig.h, as above)
-        and include those header files explicitly that you actually need.
    
+        and include those header files explicitly that you actually need.
    
         Note: The ICU test suites cannot be compiled with this setting.
    • 
       
  • .dat file: By default, the ICU data is built into
         a shared library (DLL). This is convenient because it requires no
@@ -621,7 +620,7 @@
         and modifiable (also with the icupkg tool).
         If a path is set, then single data files (e.g., .res files)
         can be copied to that location to provide new locale data
-        or conversion tables etc.
    
+        or conversion tables etc.
    
         The only drawback with a .dat package file is that the application
         needs to provide ICU with the file system path to the package file
         (e.g., by calling u_setDataDirectory())
@@ -631,23 +630,23 @@
         main() takes care of such initialization.
         It may be hard if ICU is shipped with
         another shared library (such as the Xerces-C++ XML parser)
-        which does not control main().
    
+        which does not control main().
    
         See the User Guide ICU Data
-        chapter for more details.
    
+        chapter for more details.
    
         If possible, we recommend building the .dat package.
         Specify --with-data-packaging=archive
-        on the configure command line, as in
    
-        runConfigureICU Linux --with-data-packaging=archive
    
+        on the configure command line, as in
    
+        runConfigureICU Linux --with-data-packaging=archive
    
         (Read the configure script's output for further instructions.
         On Windows, the Visual Studio build generates both the .dat package
-        and the data DLL.)
    
+        and the data DLL.)
    
         Be sure to install and use the tiny stubdata library
         rather than the large data DLL.
    • 
       
  • Static libraries: It may make sense to build the ICU code
         into static libraries (.a) rather than shared libraries (.so/.dll).
         Static linking reduces the overall size of the binary by removing
-        code that is never called.
    
-        Example configure command line:
    
+        code that is never called.
    
+        Example configure command line:
    
         runConfigureICU Linux --enable-static --disable-shared
    • 
       
  • Out-of-source build: It is usually desirable to keep the ICU
         source file tree clean and have build output files written to
@@ -670,7 +669,7 @@
         to the .dat package file can be hardcoded. ICU will automatically set
         the path to the final install location using U_ICU_DATA_DEFAULT_DIR.
         Alternatively, you can set -DICU_DATA_DIR=/path/to/icu/data
-        when building the ICU code. (Used by source/common/putil.c.)
    
+        when building the ICU code. (Used by source/common/putil.c.)
    
         Consider also setting -DICU_NO_USER_DATA_OVERRIDE
         if you do not want the "ICU_DATA" environment variable to be used.
         (An application can still override the data path via
@@ -690,8 +689,8 @@
         Consider not installing these header files.
    • 
       
  • Disable renaming: By default, ICU library entry point names
         have an ICU version suffix. Turn this off for a system-level installation,
-        to enable upgrading ICU without breaking applications. For example:
    
-        runConfigureICU Linux --disable-renaming
    
+        to enable upgrading ICU without breaking applications. For example:
    
+        runConfigureICU Linux --disable-renaming
    
         The public header files from this configuration must be installed
         for applications to include and get the correct entry point names.
    • 
     
@@ -889,9 +888,9 @@
       Visual C++ compiler will not work with a bash command prompt.
 
       
  • If the computer isn't set up to use Visual C++ from the command line,
-      you need to run vcvars32.bat.
    For example:
    "C:\Program Files\Microsoft
+      you need to run vcvars32.bat.
    For example:
    "C:\Program Files\Microsoft
       Visual Studio 8\VC\bin\vcvars32.bat" can be used for 32-bit builds
-      or 
    "C:\Program Files (x86)\Microsoft Visual Studio
+      or 
    "C:\Program Files (x86)\Microsoft Visual Studio
       8\VC\bin\amd64\vcvarsamd64.bat" can be used for 64-bit builds on
       Windows x64.
    • 
 
@@ -1101,7 +1100,7 @@
       when using runConfigureICU. This will prevent applications that use the
       icuio library from crashing.
       
-      
  • Also note that on current versions of z/OS, the XPLINK version (C128) of the
+      
  • Also note that on current versions of z/OS, the XPLINK version (C128) of the
       C++ standard library is standard. Therefore you may see an error when running
       with XPLINK disabled. To avoid this error, set the following environment variable or similar:
       	
    export _CXX_PSYSIX="CEE.SCEELIB(C128N)":"CBC.SCLBSID(IOSTREAM,COMPLEX)"
    
@@ -1235,7 +1234,7 @@ CHGJOB CCSID(37)
 
       
  • Run 'QSH'
    • 
       
-      
  • Run: 
    export PATH=/QIBM/ProdData/DeveloperTools/qsh/bin:$PATH:/QOpenSys/usr/bin
+      
  • Run: 
    export PATH=/QIBM/ProdData/DeveloperTools/qsh/bin:$PATH:/QOpenSys/usr/bin
       
    • 
 
       
  • Run gzip -d on the ICU source code compressed tar archive
@@ -1272,10 +1271,10 @@ CHGJOB CCSID(37)
 				/icua copy of the ICU source
 			
 			
-				/buildAan empty directory, it will contain ICU built for A
    (MacOSX in this case)
+				/buildAan empty directory, it will contain ICU built for A
    (MacOSX in this case)
 			
 			
-				/buildBan empty directory, it will contain ICU built for B
    (HaikuOS in this case)
+				/buildBan empty directory, it will contain ICU built for B
    (HaikuOS in this case)
 			
 		
 		
@@ -1288,7 +1287,7 @@ gnumake
  • Set PATH or other variables as needed, such as CPPFLAGS.
    • -
  • Build ICU in /buildB
    +
  • Build ICU in /buildB
    Note: "--with-cross-build" takes an absolute path.
    cd /buildB
 sh /icu/source/configure --host=i586-pc-haiku --with-cross-build=/buildA
diff --git a/icu4c/unicode-license.txt b/icu4c/unicode-license.txt
index bf2c3a3995e..c748a43b801 100644
--- a/icu4c/unicode-license.txt
+++ b/icu4c/unicode-license.txt
@@ -17,7 +17,7 @@ FILES OR SOFTWARE.
 
     COPYRIGHT AND PERMISSION NOTICE
 
-    Copyright © 1991-2011 Unicode, Inc. All rights reserved. Distributed under
+    Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under
 the Terms of Use in http://www.unicode.org/copyright.html.
 
     Permission is hereby granted, free of charge, to any person obtaining a