From bbad39b77a505d31f664e80cee35d3439de5a8ee Mon Sep 17 00:00:00 2001 From: Michael Ow Date: Wed, 18 Apr 2012 17:03:06 +0000 Subject: [PATCH] ICU-9232 Update version in ICU4C to 50.0.1 and update time bombs X-SVN-Rev: 31725 --- icu4c/source/common/common.vcxproj | 8 ++++---- icu4c/source/common/unicode/uvernum.h | 14 +++++++------- icu4c/source/data/makedata.mak | 4 ++-- icu4c/source/data/misc/icuver.txt | 4 ++-- icu4c/source/i18n/i18n.vcxproj | 8 ++++---- icu4c/source/io/io.vcxproj | 8 ++++---- icu4c/source/layout/layout.vcxproj | 8 ++++---- icu4c/source/layoutex/layoutex.vcxproj | 8 ++++---- icu4c/source/stubdata/stubdata.vcxproj | 8 ++++---- 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 | 2 +- icu4c/source/test/intltest/ssearch.cpp | 2 +- icu4c/source/tools/ctestfw/ctestfw.vcxproj | 8 ++++---- icu4c/source/tools/toolutil/toolutil.vcxproj | 8 ++++---- 16 files changed, 48 insertions(+), 48 deletions(-) diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj index 42f947c6997..eb995b39f4e 100644 --- a/icu4c/source/common/common.vcxproj +++ b/icu4c/source/common/common.vcxproj @@ -104,7 +104,7 @@ 0x0409 - ..\..\bin\icuuc49.dll + ..\..\bin\icuuc50.dll true .\..\..\lib\icuuc.pdb true @@ -145,7 +145,7 @@ 0x0409 - ..\..\bin\icuuc49d.dll + ..\..\bin\icuuc50d.dll true true .\..\..\lib\icuucd.pdb @@ -183,7 +183,7 @@ 0x0409 - ..\..\bin64\icuuc49.dll + ..\..\bin64\icuuc50.dll true .\..\..\lib64\icuuc.pdb true @@ -222,7 +222,7 @@ 0x0409 - ..\..\bin64\icuuc49d.dll + ..\..\bin64\icuuc50d.dll true true .\..\..\lib64\icuucd.pdb diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index 401acf41cd6..cbb58259873 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -48,19 +48,19 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION_MAJOR_NUM 49 +#define U_ICU_VERSION_MAJOR_NUM 50 /** The current ICU minor version as an integer. * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_MINOR_NUM 1 +#define U_ICU_VERSION_MINOR_NUM 0 /** 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 0 +#define U_ICU_VERSION_PATCHLEVEL_NUM 1 /** The current ICU build level version as an integer. * This value is for use by ICU clients. It defaults to 0. @@ -74,7 +74,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_SUFFIX _49 +#define U_ICU_VERSION_SUFFIX _50 /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME @@ -109,19 +109,19 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "49.1" +#define U_ICU_VERSION "50.0.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 * @stable ICU 2.6 */ -#define U_ICU_VERSION_SHORT "49" +#define U_ICU_VERSION_SHORT "50" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "49.1" +#define U_ICU_DATA_VERSION "50.0.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index e6bb80b635b..3884d2a9ff7 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -1,5 +1,5 @@ #********************************************************************** -#* Copyright (C) 1999-2011, International Business Machines Corporation +#* Copyright (C) 1999-2012, International Business Machines Corporation #* and others. All Rights Reserved. #********************************************************************** # nmake file for creating data files on win32 @@ -10,7 +10,7 @@ ############################################################################## # Keep the following in sync with the version - see common/unicode/uvernum.h -U_ICUDATA_NAME=icudt49 +U_ICUDATA_NAME=icudt50 ############################################################################## U_ICUDATA_ENDIAN_SUFFIX=l UNICODE_VERSION=6.1 diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index 80e6606f979..64943dbd2c5 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -6,6 +6,6 @@ // *************************************************************************** icuver:table(nofallback){ - DataVersion { "49.1.0.0" } - ICUVersion { "49.1.0.0" } + DataVersion { "50.0.1.0" } + ICUVersion { "50.0.1.0" } } diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj index a9b2cac980b..d60330eadfa 100644 --- a/icu4c/source/i18n/i18n.vcxproj +++ b/icu4c/source/i18n/i18n.vcxproj @@ -107,7 +107,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin\icuin49.dll + ..\..\bin\icuin50.dll true .\..\..\lib\icuin.pdb true @@ -151,7 +151,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin\icuin49d.dll + ..\..\bin\icuin50d.dll true true .\..\..\lib\icuind.pdb @@ -192,7 +192,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuin49.dll + ..\..\bin64\icuin50.dll true .\..\..\lib64\icuin.pdb true @@ -234,7 +234,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuin49d.dll + ..\..\bin64\icuin50d.dll true true .\..\..\lib64\icuind.pdb diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj index 11d87678466..a6f93d49f2a 100644 --- a/icu4c/source/io/io.vcxproj +++ b/icu4c/source/io/io.vcxproj @@ -107,7 +107,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icuio49.dll + ..\..\bin\icuio50.dll true .\..\..\lib\icuio.pdb true @@ -151,7 +151,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icuio49d.dll + ..\..\bin\icuio50d.dll true true .\..\..\lib\icuiod.pdb @@ -192,7 +192,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuio49.dll + ..\..\bin64\icuio50.dll true .\..\..\lib64\icuio.pdb true @@ -234,7 +234,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuio49d.dll + ..\..\bin64\icuio50d.dll true true .\..\..\lib64\icuiod.pdb diff --git a/icu4c/source/layout/layout.vcxproj b/icu4c/source/layout/layout.vcxproj index 10d2a610a04..643ce0864b3 100644 --- a/icu4c/source/layout/layout.vcxproj +++ b/icu4c/source/layout/layout.vcxproj @@ -110,7 +110,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icule49d.dll + ..\..\bin\icule50d.dll true true .\..\..\lib\iculed.pdb @@ -151,7 +151,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icule49.dll + ..\..\bin\icule50.dll true .\..\..\lib\icule.pdb true @@ -195,7 +195,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icule49d.dll + ..\..\bin64\icule50d.dll true true .\..\..\lib64\iculed.pdb @@ -234,7 +234,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icule49.dll + ..\..\bin64\icule50.dll true .\..\..\lib64\icule.pdb true diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj index b114e6a0be2..5745ad67ed5 100644 --- a/icu4c/source/layoutex/layoutex.vcxproj +++ b/icu4c/source/layoutex/layoutex.vcxproj @@ -107,7 +107,7 @@ 0x0409 - ..\..\bin\iculx49.dll + ..\..\bin\iculx50.dll true .\..\..\lib\iculx.pdb true @@ -150,7 +150,7 @@ 0x0409 - ..\..\bin\iculx49d.dll + ..\..\bin\iculx50d.dll true true .\..\..\lib\iculxd.pdb @@ -190,7 +190,7 @@ 0x0409 - ..\..\bin64\iculx49.dll + ..\..\bin64\iculx50.dll true .\..\..\lib64\iculx.pdb true @@ -231,7 +231,7 @@ 0x0409 - ..\..\bin64\iculx49d.dll + ..\..\bin64\iculx50d.dll true true .\..\..\lib64\iculxd.pdb diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj index 4916d0bc33a..b0e6abbbc57 100644 --- a/icu4c/source/stubdata/stubdata.vcxproj +++ b/icu4c/source/stubdata/stubdata.vcxproj @@ -113,7 +113,7 @@ echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" - ..\..\bin\icudt49.dll + ..\..\bin\icudt50.dll true true .\x86\Release\icudt.pdb @@ -160,7 +160,7 @@ echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" - ..\..\bin\icudt49.dll + ..\..\bin\icudt50.dll true .\x86\Debug/icudt.pdb true @@ -207,7 +207,7 @@ echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" - ..\..\bin64\icudt49.dll + ..\..\bin64\icudt50.dll true true .\x64\Release\icudt.pdb @@ -252,7 +252,7 @@ echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." > "$(ProjectDir)stubdatabuilt.txt" - ..\..\bin64\icudt49.dll + ..\..\bin64\icudt50.dll true .\x64\Debug/icudt.pdb true diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index 64b5a171d36..a4d179aa18d 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(50, 0, 0)) { /* TODO: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) */ + else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(50, 1, 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 9a5f839af8c..a356c243dbf 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(50, 0, 0)) { /* TODO: debug & fix, see ticket #8982 */ +if(isICUVersionAtLeast(50, 1, 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 a574bcd0ed9..af935a39229 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(50, 0, 0)) { + if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(50, 1, 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 f68a0c927bd..609241f52f2 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. Ticket #7270 - UBool isTicket7270Fixed = isICUVersionAtLeast(50, 0); + UBool isTicket7270Fixed = isICUVersionAtLeast(50, 1); UBool isLineBreak = 0 == strcmp(fileName, "LineBreakTest.txt"); UErrorCode status = U_ZERO_ERROR; diff --git a/icu4c/source/test/intltest/ssearch.cpp b/icu4c/source/test/intltest/ssearch.cpp index 7b9f0e1ff7e..367a25c0161 100644 --- a/icu4c/source/test/intltest/ssearch.cpp +++ b/icu4c/source/test/intltest/ssearch.cpp @@ -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(50, 0) && i>=4 && i<=6) { + if (!isICUVersionAtLeast(50, 1) && i>=4 && i<=6) { continue; // timebomb until ticket #8080 is resolved } UnicodeString ts = CharsToUnicodeString(test[i]); diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj index a914446e6a5..7bbb29726a1 100644 --- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj +++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj @@ -107,7 +107,7 @@ 0x0409 - ..\..\..\bin\icutest.dll + ..\..\..\bin\icutest50.dll true .\..\..\..\lib\icutest.pdb true @@ -150,7 +150,7 @@ 0x0409 - ..\..\..\bin\icutestd.dll + ..\..\..\bin\icutest50d.dll true true .\..\..\..\lib\icutestd.pdb @@ -190,7 +190,7 @@ 0x0409 - ..\..\..\bin64\icutest.dll + ..\..\..\bin64\icutest50.dll true .\..\..\..\lib64\icutest.pdb true @@ -231,7 +231,7 @@ 0x0409 - ..\..\..\bin64\icutestd.dll + ..\..\..\bin64\icutest50d.dll true true .\..\..\..\lib64\icutestd.pdb diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj index abb57fdf9d4..32ff217ec1a 100644 --- a/icu4c/source/tools/toolutil/toolutil.vcxproj +++ b/icu4c/source/tools/toolutil/toolutil.vcxproj @@ -107,7 +107,7 @@ 0x0409 - ..\..\..\bin\icutu49.dll + ..\..\..\bin\icutu50.dll true ..\..\..\lib;%(AdditionalLibraryDirectories) .\..\..\..\lib\icutu.pdb @@ -151,7 +151,7 @@ 0x0409 - ..\..\..\bin\icutu49d.dll + ..\..\..\bin\icutu50d.dll true ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -193,7 +193,7 @@ 0x0409 - ..\..\..\bin64\icutu49.dll + ..\..\..\bin64\icutu50.dll true ..\..\..\lib64;%(AdditionalLibraryDirectories) .\..\..\..\lib64\icutu.pdb @@ -235,7 +235,7 @@ 0x0409 - ..\..\..\bin64\icutu49d.dll + ..\..\..\bin64\icutu50d.dll true ..\..\..\lib64;%(AdditionalLibraryDirectories) true