AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-9139 Update ICU version, some copyright dates, readme boilerplate, timebombs

Browse Source 
X-SVN-Rev: 31517
This commit is contained in:
Peter Edberg 2012-02-27 05:33:06 +00:00
parent 01b36214be
commit 81d48c9c84
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icu4c/license.html
View File

@ -11,7 +11,7 @@
<p>COPYRIGHT AND PERMISSION NOTICE</p> <p>COPYRIGHT AND PERMISSION NOTICE</p>
<p> <p>
Copyright (c) 1995-2011 International Business Machines Corporation and others Copyright (c) 1995-2012 International Business Machines Corporation and others
</p> </p>
<p> <p>
All rights reserved. All rights reserved.

20
icu4c/readme.html
View File

@ -16,16 +16,16 @@
<body class="draft"> <body class="draft">
<h1>International Components for Unicode<br /> <h1>International Components for Unicode<br />
<abbr title="International Components for Unicode">ICU</abbr> 49 (DRAFT - M2) ReadMe</h1> <abbr title="International Components for Unicode">ICU</abbr> 49 ReadMe</h1>
<p><b>Note:</b> This is a development milestone release of ICU4C 49. <!--<p><b>Note:</b> This is a development milestone release of ICU4C nn.
The contents of this document may not reflect the recent changes done The contents of this document may not reflect the recent changes done
for ICU 49 development. This milestone is intended for those wishing for ICU nn development. This milestone is intended for those wishing
to get an early look at ICU 49 new features and API changes. It is not to get an early look at ICU nn new features and API changes. It is not
recommended for production use. recommended for production use.
</p> </p>-->
<p>Last updated: 2011-Dec-13<br /> <p>Last updated: 2012-Feb-26<br />
Copyright &copy; 1997-2011 International Business Machines Corporation and Copyright &copy; 1997-2012 International Business Machines Corporation and
others. All Rights Reserved.</p> others. All Rights Reserved.</p>
<!-- Remember that there is a copyright at the end too --> <!-- Remember that there is a copyright at the end too -->
<hr /> <hr />
@ -218,8 +218,8 @@
<p>The following list concentrates on <em>changes that affect existing <p>The following list concentrates on <em>changes that affect existing
applications migrating from previous ICU releases</em>. applications migrating from previous ICU releases</em>.
For more news about For more news about
this release, see the <a href="http://site.icu-project.org/download/49milestone">ICU this release, see the <a href="http://site.icu-project.org/download/">ICU
milestone download page</a>.</p> download page</a>.</p>
<h3>C++ namespace support required</h3> <h3>C++ namespace support required</h3>
<p>ICU4C 49 requires C++ namespace support. <p>ICU4C 49 requires C++ namespace support.
@ -1739,7 +1739,7 @@ gnumake</pre>
</ul> </ul>
<hr /> <hr />
<p>Copyright &copy; 1997-2011 International Business Machines Corporation and <p>Copyright &copy; 1997-2012 International Business Machines Corporation and
others. All Rights Reserved.<br /> others. All Rights Reserved.<br />
IBM Globalization Center of Competency - San Jos&eacute;<br /> IBM Globalization Center of Competency - San Jos&eacute;<br />
4400 North First Street<br /> 4400 North First Street<br />

12
icu4c/source/common/unicode/uvernum.h
View File

@ -1,6 +1,6 @@
/* /*
******************************************************************************* *******************************************************************************
* Copyright (C) 2000-2011, International Business Machines * Copyright (C) 2000-2012, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
******************************************************************************* *******************************************************************************
* *
@ -42,7 +42,7 @@
* @stable ICU 2.4 * @stable ICU 2.4
*/ */
#define U_COPYRIGHT_STRING \ #define U_COPYRIGHT_STRING \
" Copyright (C) 2011, International Business Machines Corporation and others. All Rights Reserved. " " Copyright (C) 2012, International Business Machines Corporation and others. All Rights Reserved. "
/** The current ICU major version as an integer. /** The current ICU major version as an integer.
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
@ -54,13 +54,13 @@
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
* @stable ICU 2.6 * @stable ICU 2.6
*/ */
#define U_ICU_VERSION_MINOR_NUM 0 #define U_ICU_VERSION_MINOR_NUM 1
/** The current ICU patchlevel version as an integer. /** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
* @stable ICU 2.4 * @stable ICU 2.4
*/ */
#define U_ICU_VERSION_PATCHLEVEL_NUM 2 #define U_ICU_VERSION_PATCHLEVEL_NUM 0
/** The current ICU build level version as an integer. /** The current ICU build level version as an integer.
* This value is for use by ICU clients. It defaults to 0. * This value is for use by ICU clients. It defaults to 0.
@ -109,7 +109,7 @@
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
* @stable ICU 2.4 * @stable ICU 2.4
*/ */
#define U_ICU_VERSION "49.0.2" #define U_ICU_VERSION "49.1"
/** The current ICU library major/minor version as a string without dots, for library name suffixes. /** The current ICU library major/minor version as a string without dots, for library name suffixes.
* This value will change in the subsequent releases of ICU * This value will change in the subsequent releases of ICU
@ -121,7 +121,7 @@
/** Data version in ICU4C. /** Data version in ICU4C.
* @internal ICU 4.4 Internal Use Only * @internal ICU 4.4 Internal Use Only
**/ **/
#define U_ICU_DATA_VERSION "49.0.2" #define U_ICU_DATA_VERSION "49.1"
#endif /* U_HIDE_INTERNAL_API */ #endif /* U_HIDE_INTERNAL_API */
/*=========================================================================== /*===========================================================================

6
icu4c/source/data/misc/icuver.txt
View File

@ -1,11 +1,11 @@
// *************************************************************************** // ***************************************************************************
// * // *
// * Copyright (C) 2010-2011 International Business Machines // * Copyright (C) 2010-2012 International Business Machines
// * Corporation and others. All Rights Reserved. // * Corporation and others. All Rights Reserved.
// * // *
// *************************************************************************** // ***************************************************************************
icuver:table(nofallback){ icuver:table(nofallback){
DataVersion { "49.0.2.0" } DataVersion { "49.1.0.0" }
ICUVersion { "49.0.2.0" } ICUVersion { "49.1.0.0" }
} }

2
icu4c/source/test/cintltst/cldrtest.c
View File

@ -934,7 +934,7 @@ static void VerifyTranslation(void) {
if (U_FAILURE(errorCode)) { if (U_FAILURE(errorCode)) {
log_err("error uloc_getDisplayCountry returned %s\n", u_errorName(errorCode)); log_err("error uloc_getDisplayCountry returned %s\n", u_errorName(errorCode));
} }
else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(49, 1, 0)) { /* TODO: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) */ else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(50, 0, 0)) { /* TODO: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) */
strIdx = findStringSetMismatch(currLoc, langBuffer, langSize, exemplarCharacters, exemplarLen, FALSE, &badChar); strIdx = findStringSetMismatch(currLoc, langBuffer, langSize, exemplarCharacters, exemplarLen, FALSE, &badChar);
if (strIdx >= 0) { if (strIdx >= 0) {
log_err("getDisplayCountry(%s) at index %d returned characters not in the exemplar characters: %04X.\n", log_err("getDisplayCountry(%s) at index %d returned characters not in the exemplar characters: %04X.\n",

2
icu4c/source/test/cintltst/cmsccoll.c
View File

@ -5170,7 +5170,7 @@ TestTailor6179(void)
} }
log_err("\n"); log_err("\n");
} }
if(isICUVersionAtLeast(49, 1, 0)) { /* TODO: debug & fix, see ticket #8982 */ if(isICUVersionAtLeast(50, 0, 0)) { /* TODO: debug & fix, see ticket #8982 */
tLen = u_strlen(tData2[1]); tLen = u_strlen(tData2[1]);
rLen = ucol_getSortKey(coll, tData2[1], tLen, resColl, 100); rLen = ucol_getSortKey(coll, tData2[1], tLen, resColl, 100);
if (rLen != LEN(firstSecondaryIgnCE) || uprv_memcmp(resColl, firstSecondaryIgnCE, rLen) != 0) { if (rLen != LEN(firstSecondaryIgnCE) || uprv_memcmp(resColl, firstSecondaryIgnCE, rLen) != 0) {

2
icu4c/source/test/cintltst/creststn.c
View File

@ -281,7 +281,7 @@ static void TestErrorCodes(void) {
/* we look up the resource which is aliased and at our level */ /* we look up the resource which is aliased and at our level */
/* TODO: restore the following test when cldrbug 3058: is fixed */ /* TODO: restore the following test when cldrbug 3058: is fixed */
if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(49, 1, 0)) { if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(50, 0, 0)) {
status = U_USING_DEFAULT_WARNING; status = U_USING_DEFAULT_WARNING;
r2 = ures_getByKey(r, "Countries", r2, &status); r2 = ures_getByKey(r, "Countries", r2, &status);
checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status); checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);

4
icu4c/source/test/intltest/rbbitst.cpp
View File

@ -1744,7 +1744,7 @@ void RBBITest::TestUnicodeFiles() {
void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *bi) { void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *bi) {
#if !UCONFIG_NO_REGULAR_EXPRESSIONS #if !UCONFIG_NO_REGULAR_EXPRESSIONS
// TODO(andy): Match line break behavior to Unicode 6.0 and remove this time bomb. // TODO(andy): Match line break behavior to Unicode 6.0 and remove this time bomb.
UBool isICUVersionPast48 = isICUVersionAtLeast(49, 1); UBool isICUVersionPast49 = isICUVersionAtLeast(50, 0);
UBool isLineBreak = 0 == strcmp(fileName, "LineBreakTest.txt"); UBool isLineBreak = 0 == strcmp(fileName, "LineBreakTest.txt");
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
@ -1840,7 +1840,7 @@ void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *
// //
if (testString.length() > 0) { if (testString.length() > 0) {
// TODO(andy): Remove this time bomb code. Note: Line range updated for Unicode 6.1 LineBreakTest.txt. // TODO(andy): Remove this time bomb code. Note: Line range updated for Unicode 6.1 LineBreakTest.txt.
if (!isLineBreak || isICUVersionPast48 || !(5066 <= lineNumber && lineNumber <= 5170)) { if (!isLineBreak || isICUVersionPast49 || !(5066 <= lineNumber && lineNumber <= 5170)) {
checkUnicodeTestCase(fileName, lineNumber, testString, &breakPositions, bi); checkUnicodeTestCase(fileName, lineNumber, testString, &breakPositions, bi);
} }
} }

4
icu4c/source/test/intltest/ssearch.cpp
View File

@ -1,6 +1,6 @@
/* /*
********************************************************************** **********************************************************************
* Copyright (C) 2005-2011, International Business Machines * Copyright (C) 2005-2012, International Business Machines
* Corporation and others. All Rights Reserved. * Corporation and others. All Rights Reserved.
********************************************************************** **********************************************************************
*/ */
@ -980,7 +980,7 @@ void SSearchTest::offsetTest()
col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status); col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status);
for(int32_t i = 0; i < testCount; i += 1) { for(int32_t i = 0; i < testCount; i += 1) {
if (!isICUVersionAtLeast(49, 1) && i>=4 && i<=6) { if (!isICUVersionAtLeast(50, 0) && i>=4 && i<=6) {
continue; // timebomb until ticket #8080 is resolved continue; // timebomb until ticket #8080 is resolved
} }
UnicodeString ts = CharsToUnicodeString(test[i]); UnicodeString ts = CharsToUnicodeString(test[i]);