From 4b966aacc4318a4e8c4b7dc1ff2b40589cbca8bf Mon Sep 17 00:00:00 2001 From: Michael Ow Date: Tue, 7 May 2013 19:53:34 +0000 Subject: [PATCH] ICU-10083 Update version number to 52.0.1 and update timebombs X-SVN-Rev: 33604 --- icu4c/source/common/common.vcxproj | 8 ++++---- icu4c/source/common/unicode/uvernum.h | 16 ++++++++-------- icu4c/source/data/makedata.mak | 2 +- 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 | 6 +++--- icu4c/source/test/cintltst/cmsccoll.c | 2 +- icu4c/source/test/cintltst/creststn.c | 2 +- icu4c/source/test/intltest/ssearch.cpp | 2 +- icu4c/source/tools/ctestfw/ctestfw.vcxproj | 8 ++++---- icu4c/source/tools/toolutil/toolutil.vcxproj | 8 ++++---- 15 files changed, 49 insertions(+), 49 deletions(-) diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj index 05696e08651..0feda9bee9d 100644 --- a/icu4c/source/common/common.vcxproj +++ b/icu4c/source/common/common.vcxproj @@ -104,7 +104,7 @@ 0x0409 - ..\..\bin\icuuc51.dll + ..\..\bin\icuuc52.dll true .\..\..\lib\icuuc.pdb true @@ -145,7 +145,7 @@ 0x0409 - ..\..\bin\icuuc51d.dll + ..\..\bin\icuuc52d.dll true true .\..\..\lib\icuucd.pdb @@ -183,7 +183,7 @@ 0x0409 - ..\..\bin64\icuuc51.dll + ..\..\bin64\icuuc52.dll true .\..\..\lib64\icuuc.pdb true @@ -222,7 +222,7 @@ 0x0409 - ..\..\bin64\icuuc51d.dll + ..\..\bin64\icuuc52d.dll true true .\..\..\lib64\icuucd.pdb diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index 87769ee12ac..841763336fb 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -51,25 +51,25 @@ * @stable ICU 2.4 */ #define U_COPYRIGHT_STRING \ - " Copyright (C) 2012, International Business Machines Corporation and others. All Rights Reserved. " + " Copyright (C) 2013, 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 * @stable ICU 2.4 */ -#define U_ICU_VERSION_MAJOR_NUM 51 +#define U_ICU_VERSION_MAJOR_NUM 52 /** 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. @@ -83,7 +83,7 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.6 */ -#define U_ICU_VERSION_SUFFIX _51 +#define U_ICU_VERSION_SUFFIX _52 /** * \def U_DEF2_ICU_ENTRY_POINT_RENAME @@ -118,19 +118,19 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "51.1" +#define U_ICU_VERSION "52.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 "51" +#define U_ICU_VERSION_SHORT "52" #ifndef U_HIDE_INTERNAL_API /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "51.1" +#define U_ICU_DATA_VERSION "52.0.1" #endif /* U_HIDE_INTERNAL_API */ /*=========================================================================== diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index 110bfbc510a..d156abc25ce 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -10,7 +10,7 @@ ############################################################################## # Keep the following in sync with the version - see common/unicode/uvernum.h -U_ICUDATA_NAME=icudt51 +U_ICUDATA_NAME=icudt52 ############################################################################## U_ICUDATA_ENDIAN_SUFFIX=l UNICODE_VERSION=6.2 diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index 49095cd2c5d..db6d38a23fd 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -6,6 +6,6 @@ // *************************************************************************** icuver:table(nofallback){ - DataVersion { "51.1.0.0" } - ICUVersion { "51.1.0.0" } + DataVersion { "52.0.1.0" } + ICUVersion { "52.0.1.0" } } diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj index 35fc0fa6501..020fcf96218 100644 --- a/icu4c/source/i18n/i18n.vcxproj +++ b/icu4c/source/i18n/i18n.vcxproj @@ -107,7 +107,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin\icuin51.dll + ..\..\bin\icuin52.dll true .\..\..\lib\icuin.pdb true @@ -151,7 +151,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin\icuin51d.dll + ..\..\bin\icuin52d.dll true true .\..\..\lib\icuind.pdb @@ -192,7 +192,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuin51.dll + ..\..\bin64\icuin52.dll true .\..\..\lib64\icuin.pdb true @@ -234,7 +234,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuin51d.dll + ..\..\bin64\icuin52d.dll true true .\..\..\lib64\icuind.pdb diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj index 0b80e887ee0..a27065004eb 100644 --- a/icu4c/source/io/io.vcxproj +++ b/icu4c/source/io/io.vcxproj @@ -107,7 +107,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icuio51.dll + ..\..\bin\icuio52.dll true .\..\..\lib\icuio.pdb true @@ -151,7 +151,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icuio51d.dll + ..\..\bin\icuio52d.dll true true .\..\..\lib\icuiod.pdb @@ -192,7 +192,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuio51.dll + ..\..\bin64\icuio52.dll true .\..\..\lib64\icuio.pdb true @@ -234,7 +234,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuio51d.dll + ..\..\bin64\icuio52d.dll true true .\..\..\lib64\icuiod.pdb diff --git a/icu4c/source/layout/layout.vcxproj b/icu4c/source/layout/layout.vcxproj index 45d8680f3e0..625055ff292 100644 --- a/icu4c/source/layout/layout.vcxproj +++ b/icu4c/source/layout/layout.vcxproj @@ -110,7 +110,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icule51d.dll + ..\..\bin\icule52d.dll true true .\..\..\lib\iculed.pdb @@ -151,7 +151,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icule51.dll + ..\..\bin\icule52.dll true .\..\..\lib\icule.pdb true @@ -195,7 +195,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icule51d.dll + ..\..\bin64\icule52d.dll true true .\..\..\lib64\iculed.pdb @@ -234,7 +234,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icule51.dll + ..\..\bin64\icule52.dll true .\..\..\lib64\icule.pdb true diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj index 44d62104c6d..dac4cfec87c 100644 --- a/icu4c/source/layoutex/layoutex.vcxproj +++ b/icu4c/source/layoutex/layoutex.vcxproj @@ -107,7 +107,7 @@ 0x0409 - ..\..\bin\iculx51.dll + ..\..\bin\iculx52.dll true .\..\..\lib\iculx.pdb true @@ -150,7 +150,7 @@ 0x0409 - ..\..\bin\iculx51d.dll + ..\..\bin\iculx52d.dll true true .\..\..\lib\iculxd.pdb @@ -190,7 +190,7 @@ 0x0409 - ..\..\bin64\iculx51.dll + ..\..\bin64\iculx52.dll true .\..\..\lib64\iculx.pdb true @@ -231,7 +231,7 @@ 0x0409 - ..\..\bin64\iculx51d.dll + ..\..\bin64\iculx52d.dll true true .\..\..\lib64\iculxd.pdb diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj index 0b20a612ab5..ed4ca6be252 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\icudt51.dll + ..\..\bin\icudt52.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\icudt51.dll + ..\..\bin\icudt52.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\icudt51.dll + ..\..\bin64\icudt52.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\icudt51.dll + ..\..\bin64\icudt52.dll true .\x64\Debug/icudt.pdb true diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index 9a48bd3f53c..942995e400a 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -941,7 +941,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(52, 0, 1)) { /* TODO: FIX or REMOVE this test! Was: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) - but CldrBug:3058 is wontfix */ + else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(52, 0, 2)) { /* TODO: FIX or REMOVE this test! Was: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) - but CldrBug:3058 is wontfix */ 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", @@ -972,7 +972,7 @@ static void VerifyTranslation(void) { log_err("error ures_getStringByIndex(%d) returned %s\n", idx, u_errorName(errorCode)); continue; } - if (uprv_strstr(currLoc, "uz_Arab") != currLoc || isICUVersionAtLeast(52, 0, 1)) { /* TODO: FIX or REMOVE this test! */ + if (uprv_strstr(currLoc, "uz_Arab") != currLoc || isICUVersionAtLeast(52, 0, 2)) { /* TODO: FIX or REMOVE this test! */ strIdx = findStringSetMismatch(currLoc, fromBundleStr, langSize, exemplarCharacters, exemplarLen, TRUE, &badChar); if (strIdx >= 0) { log_err("getDayNames(%s, %d) at index %d returned characters not in the exemplar characters: %04X.\n", @@ -1003,7 +1003,7 @@ static void VerifyTranslation(void) { log_err("error ures_getStringByIndex(%d) returned %s\n", idx, u_errorName(errorCode)); continue; } - if (uprv_strstr(currLoc, "uz_Arab") != currLoc || isICUVersionAtLeast(52, 0, 1)) { /* TODO: FIX or REMOVE this test! */ + if (uprv_strstr(currLoc, "uz_Arab") != currLoc || isICUVersionAtLeast(52, 0, 2)) { /* TODO: FIX or REMOVE this test! */ strIdx = findStringSetMismatch(currLoc, fromBundleStr, langSize, exemplarCharacters, exemplarLen, TRUE, &badChar); if (strIdx >= 0) { log_err("getMonthNames(%s, %d) 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 ef190f5a8c7..102cbeb3cc3 100644 --- a/icu4c/source/test/cintltst/cmsccoll.c +++ b/icu4c/source/test/cintltst/cmsccoll.c @@ -5207,7 +5207,7 @@ TestTailor6179(void) } log_err("\n"); } -if(isICUVersionAtLeast(52, 0, 1)) { /* TODO: debug & fix, see ticket #8982 */ +if(isICUVersionAtLeast(52, 0, 2)) { /* 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 2730a218188..cd01601df5a 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -282,7 +282,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 - but CldrBug:3058 is WONTFIX */ - if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(52, 0, 1)) { + if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(52, 0, 2)) { 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/ssearch.cpp b/icu4c/source/test/intltest/ssearch.cpp index a48309fac5d..64b1fe659a9 100644 --- a/icu4c/source/test/intltest/ssearch.cpp +++ b/icu4c/source/test/intltest/ssearch.cpp @@ -629,7 +629,7 @@ void SSearchTest::offsetTest() col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status); for(int32_t i = 0; i < testCount; i += 1) { - if (!isICUVersionAtLeast(52, 0, 1) && i>=4 && i<=6) { + if (!isICUVersionAtLeast(52, 0, 2) && i>=4 && i<=6) { continue; // timebomb until ticket #9156 (was #8081) is resolved } UnicodeString ts = CharsToUnicodeString(test[i]); diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj index c0e8bd8c87c..7dbdc9fca60 100644 --- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj +++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj @@ -107,7 +107,7 @@ 0x0409 - ..\..\..\bin\icutest51.dll + ..\..\..\bin\icutest52.dll true .\..\..\..\lib\icutest.pdb true @@ -150,7 +150,7 @@ 0x0409 - ..\..\..\bin\icutest51d.dll + ..\..\..\bin\icutest52d.dll true true .\..\..\..\lib\icutestd.pdb @@ -190,7 +190,7 @@ 0x0409 - ..\..\..\bin64\icutest51.dll + ..\..\..\bin64\icutest52.dll true .\..\..\..\lib64\icutest.pdb true @@ -231,7 +231,7 @@ 0x0409 - ..\..\..\bin64\icutest51d.dll + ..\..\..\bin64\icutest52d.dll true true .\..\..\..\lib64\icutestd.pdb diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj index 4e7cd53daad..9bb123e1046 100644 --- a/icu4c/source/tools/toolutil/toolutil.vcxproj +++ b/icu4c/source/tools/toolutil/toolutil.vcxproj @@ -107,7 +107,7 @@ 0x0409 - ..\..\..\bin\icutu51.dll + ..\..\..\bin\icutu52.dll true ..\..\..\lib;%(AdditionalLibraryDirectories) .\..\..\..\lib\icutu.pdb @@ -151,7 +151,7 @@ 0x0409 - ..\..\..\bin\icutu51d.dll + ..\..\..\bin\icutu52d.dll true ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -193,7 +193,7 @@ 0x0409 - ..\..\..\bin64\icutu51.dll + ..\..\..\bin64\icutu52.dll true ..\..\..\lib64;%(AdditionalLibraryDirectories) .\..\..\..\lib64\icutu.pdb @@ -235,7 +235,7 @@ 0x0409 - ..\..\..\bin64\icutu51d.dll + ..\..\..\bin64\icutu52d.dll true ..\..\..\lib64;%(AdditionalLibraryDirectories) true -- 2.40.0