From 81d48c9c845415a211b6a4687dcb4dec2bd697f3 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Mon, 27 Feb 2012 05:33:06 +0000 Subject: [PATCH] ICU-9139 Update ICU version, some copyright dates, readme boilerplate, timebombs X-SVN-Rev: 31517 --- icu4c/license.html | 2 +- icu4c/readme.html | 20 ++++++++++---------- icu4c/source/common/unicode/uvernum.h | 12 ++++++------ icu4c/source/data/misc/icuver.txt | 6 +++--- icu4c/source/test/cintltst/cldrtest.c | 2 +- icu4c/source/test/cintltst/cmsccoll.c | 2 +- icu4c/source/test/cintltst/creststn.c | 2 +- icu4c/source/test/intltest/rbbitst.cpp | 4 ++-- icu4c/source/test/intltest/ssearch.cpp | 4 ++-- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/icu4c/license.html b/icu4c/license.html index 1e2b1ab592..d078d0575b 100644 --- a/icu4c/license.html +++ b/icu4c/license.html @@ -11,7 +11,7 @@

COPYRIGHT AND PERMISSION NOTICE

-Copyright (c) 1995-2011 International Business Machines Corporation and others +Copyright (c) 1995-2012 International Business Machines Corporation and others

All rights reserved. diff --git a/icu4c/readme.html b/icu4c/readme.html index 1b14e25645..47d34a73b5 100644 --- a/icu4c/readme.html +++ b/icu4c/readme.html @@ -16,16 +16,16 @@

International Components for Unicode
- ICU 49 (DRAFT - M2) ReadMe

+ ICU 49 ReadMe -

Note: This is a development milestone release of ICU4C 49. + +

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

@@ -218,8 +218,8 @@

The following list concentrates on changes that affect existing applications migrating from previous ICU releases. For more news about - this release, see the ICU - milestone download page.

+ this release, see the ICU + download page.

C++ namespace support required

ICU4C 49 requires C++ namespace support. @@ -1739,7 +1739,7 @@ gnumake

-

Copyright © 1997-2011 International Business Machines Corporation and +

Copyright © 1997-2012 International Business Machines Corporation and others. All Rights Reserved.
IBM Globalization Center of Competency - San José
4400 North First Street
diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index fcad9caaa3..401acf41cd 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -1,6 +1,6 @@ /* ******************************************************************************* -* Copyright (C) 2000-2011, International Business Machines +* Copyright (C) 2000-2012, International Business Machines * Corporation and others. All Rights Reserved. ******************************************************************************* * @@ -42,7 +42,7 @@ * @stable ICU 2.4 */ #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. * This value will change in the subsequent releases of ICU @@ -54,13 +54,13 @@ * This value will change in the subsequent releases of ICU * @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. * This value will change in the subsequent releases of ICU * @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. * 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 * @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. * This value will change in the subsequent releases of ICU @@ -121,7 +121,7 @@ /** Data version in ICU4C. * @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 */ /*=========================================================================== diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index bb85eebf7d..80e6606f97 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -1,11 +1,11 @@ // *************************************************************************** // * -// * Copyright (C) 2010-2011 International Business Machines +// * Copyright (C) 2010-2012 International Business Machines // * Corporation and others. All Rights Reserved. // * // *************************************************************************** icuver:table(nofallback){ - DataVersion { "49.0.2.0" } - ICUVersion { "49.0.2.0" } + DataVersion { "49.1.0.0" } + ICUVersion { "49.1.0.0" } } diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index ff7bb8907f..64b5a171d3 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -934,7 +934,7 @@ static void VerifyTranslation(void) { if (U_FAILURE(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); if (strIdx >= 0) { log_err("getDisplayCountry(%s) at index %d returned characters not in the exemplar characters: %04X.\n", diff --git a/icu4c/source/test/cintltst/cmsccoll.c b/icu4c/source/test/cintltst/cmsccoll.c index bb95976068..9a5f839af8 100644 --- a/icu4c/source/test/cintltst/cmsccoll.c +++ b/icu4c/source/test/cintltst/cmsccoll.c @@ -5170,7 +5170,7 @@ TestTailor6179(void) } 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]); rLen = ucol_getSortKey(coll, tData2[1], tLen, resColl, 100); if (rLen != LEN(firstSecondaryIgnCE) || uprv_memcmp(resColl, firstSecondaryIgnCE, rLen) != 0) { diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index 5b7994cfe8..a574bcd0ed 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -281,7 +281,7 @@ static void TestErrorCodes(void) { /* we look up the resource which is aliased and at our level */ /* 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; r2 = ures_getByKey(r, "Countries", r2, &status); checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status); diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp index 522f23aed1..ea23dae661 100644 --- a/icu4c/source/test/intltest/rbbitst.cpp +++ b/icu4c/source/test/intltest/rbbitst.cpp @@ -1744,7 +1744,7 @@ void RBBITest::TestUnicodeFiles() { void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *bi) { #if !UCONFIG_NO_REGULAR_EXPRESSIONS // 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"); UErrorCode status = U_ZERO_ERROR; @@ -1840,7 +1840,7 @@ void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator * // if (testString.length() > 0) { // 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); } } diff --git a/icu4c/source/test/intltest/ssearch.cpp b/icu4c/source/test/intltest/ssearch.cpp index 1948833c1c..4a9d3663f4 100644 --- a/icu4c/source/test/intltest/ssearch.cpp +++ b/icu4c/source/test/intltest/ssearch.cpp @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (C) 2005-2011, International Business Machines + * Copyright (C) 2005-2012, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** */ @@ -980,7 +980,7 @@ void SSearchTest::offsetTest() col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status); 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 } UnicodeString ts = CharsToUnicodeString(test[i]);