From: Michael Ow Date: Tue, 14 Jun 2011 00:00:57 +0000 (+0000) Subject: ICU-8635 Update ICU4C version to 49.0.1 (49M1) X-Git-Tag: milestone-59-0-1~4730 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65629eb4193fe435d2adff09bae286ffaf47c256;p=icu ICU-8635 Update ICU4C version to 49.0.1 (49M1) X-SVN-Rev: 30216 --- diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj index 20f1cefd75d..e0484bd9867 100644 --- a/icu4c/source/common/common.vcxproj +++ b/icu4c/source/common/common.vcxproj @@ -104,7 +104,7 @@ 0x0409 - ..\..\bin\icuuc48.dll + ..\..\bin\icuuc49.dll true .\..\..\lib\icuuc.pdb true @@ -145,7 +145,7 @@ 0x0409 - ..\..\bin\icuuc48d.dll + ..\..\bin\icuuc49d.dll true true .\..\..\lib\icuucd.pdb @@ -183,7 +183,7 @@ 0x0409 - ..\..\bin64\icuuc48.dll + ..\..\bin64\icuuc49.dll true .\..\..\lib64\icuuc.pdb true @@ -222,7 +222,7 @@ 0x0409 - ..\..\bin64\icuuc48d.dll + ..\..\bin64\icuuc49d.dll true true .\..\..\lib64\icuucd.pdb diff --git a/icu4c/source/common/unicode/platform.h.in b/icu4c/source/common/unicode/platform.h.in index b0f83b9a954..466c8cae7c2 100644 --- a/icu4c/source/common/unicode/platform.h.in +++ b/icu4c/source/common/unicode/platform.h.in @@ -394,7 +394,7 @@ # ifndef U_ICU_ENTRY_POINT_RENAME /* Renaming pattern: u_strcpy_41_suffix */ # define U_ICU_ENTRY_POINT_RENAME(x) x ## _ ## @LIB_VERSION_MAJOR@ ## @ICULIBSUFFIXCNAME@ -# define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt##@ICULIBSUFFIXCNAME@##major##minor##_dat +# define U_DEF_ICUDATA_ENTRY_POINT(major) icudt##@ICULIBSUFFIXCNAME@##major##_dat # endif #endif diff --git a/icu4c/source/common/unicode/utypes.h b/icu4c/source/common/unicode/utypes.h index 6b48fd2de18..1face48bce4 100644 --- a/icu4c/source/common/unicode/utypes.h +++ b/icu4c/source/common/unicode/utypes.h @@ -254,20 +254,20 @@ * \#define U_ICU_ENTRY_POINT icudt19_dat * @stable ICU 2.4 */ -#define U_ICUDATA_ENTRY_POINT U_DEF2_ICUDATA_ENTRY_POINT(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM) +#define U_ICUDATA_ENTRY_POINT U_DEF2_ICUDATA_ENTRY_POINT(U_ICU_VERSION_MAJOR_NUM) /** * Do not use. * @internal */ -#define U_DEF2_ICUDATA_ENTRY_POINT(major, minor) U_DEF_ICUDATA_ENTRY_POINT(major, minor) +#define U_DEF2_ICUDATA_ENTRY_POINT(major) U_DEF_ICUDATA_ENTRY_POINT(major) /** * Do not use. * @internal */ #ifndef U_DEF_ICUDATA_ENTRY_POINT /* affected by symbol renaming. See platform.h */ -#define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt##major##minor##_dat +#define U_DEF_ICUDATA_ENTRY_POINT(major) icudt##major##_dat #endif /** diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h index 1edfa1cd82a..ef6a8b0cc0a 100644 --- a/icu4c/source/common/unicode/uvernum.h +++ b/icu4c/source/common/unicode/uvernum.h @@ -42,25 +42,25 @@ * @stable ICU 2.4 */ #define U_COPYRIGHT_STRING \ - " Copyright (C) 2010, International Business Machines Corporation and others. All Rights Reserved. " + " Copyright (C) 2011, 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 4 +#define U_ICU_VERSION_MAJOR_NUM 49 /** 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 8 +#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 _48 +#define U_ICU_VERSION_SUFFIX _49 /** Glued version suffix function for renamers * This value will change in the subsequent releases of ICU. @@ -83,7 +83,7 @@ * @stable ICU 4.2 */ #ifndef U_ICU_ENTRY_POINT_RENAME -#define U_ICU_ENTRY_POINT_RENAME(x) x ## _48 +#define U_ICU_ENTRY_POINT_RENAME(x) x ## _49 #endif /** The current ICU library version as a dotted-decimal string. The patchlevel @@ -91,18 +91,18 @@ * This value will change in the subsequent releases of ICU * @stable ICU 2.4 */ -#define U_ICU_VERSION "4.8" +#define U_ICU_VERSION "49.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 "48" +#define U_ICU_VERSION_SHORT "49" /** Data version in ICU4C. * @internal ICU 4.4 Internal Use Only **/ -#define U_ICU_DATA_VERSION "4.8" +#define U_ICU_DATA_VERSION "49.0.1" /*=========================================================================== * ICU collation framework version information diff --git a/icu4c/source/configure b/icu4c/source/configure index a30fcbefea4..0e65e448329 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -2601,7 +2601,8 @@ fi # Compute a reasonable library version from the release version. This is # very bad, but that's wanted... We want to make sure that the LIB_VERSION # has at least a dot in it, so we'll add a .0 if needed. -LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'` +#[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`] +LIB_VERSION=$VERSION LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'` diff --git a/icu4c/source/configure.in b/icu4c/source/configure.in index ae59b114e96..b3341ca17e9 100644 --- a/icu4c/source/configure.in +++ b/icu4c/source/configure.in @@ -66,7 +66,8 @@ fi # Compute a reasonable library version from the release version. This is # very bad, but that's wanted... We want to make sure that the LIB_VERSION # has at least a dot in it, so we'll add a .0 if needed. -[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`] +#[LIB_VERSION=`echo $VERSION | sed -e 's/\.//' -e 's/^\([^.]*\)$/\1.0/'`] +LIB_VERSION=$VERSION LIB_VERSION_MAJOR=`echo $LIB_VERSION | sed 's/\..*//'` AC_SUBST(VERSION) AC_SUBST(LIB_VERSION) diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index 0c84d045e9f..b5b2976f3b4 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=icudt48 +U_ICUDATA_NAME=icudt49 ############################################################################## U_ICUDATA_ENDIAN_SUFFIX=l UNICODE_VERSION=6.0 diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt index e9f7c09a112..f617e48cc29 100644 --- a/icu4c/source/data/misc/icuver.txt +++ b/icu4c/source/data/misc/icuver.txt @@ -6,6 +6,6 @@ // *************************************************************************** icuver:table(nofallback){ - DataVersion { "4.8.0.0" } - ICUVersion { "4.8.0.0" } + DataVersion { "49.0.1.0" } + ICUVersion { "49.0.1.0" } } diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj index c83f0240627..22ab4e9b9d5 100644 --- a/icu4c/source/i18n/i18n.vcxproj +++ b/icu4c/source/i18n/i18n.vcxproj @@ -107,7 +107,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin\icuin48.dll + ..\..\bin\icuin49.dll true .\..\..\lib\icuin.pdb true @@ -151,7 +151,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin\icuin48d.dll + ..\..\bin\icuin49d.dll true true .\..\..\lib\icuind.pdb @@ -192,7 +192,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuin48.dll + ..\..\bin64\icuin49.dll true .\..\..\lib64\icuin.pdb true @@ -234,7 +234,7 @@ ../common;%(AdditionalIncludeDirectories) - ..\..\bin64\icuin48d.dll + ..\..\bin64\icuin49d.dll true true .\..\..\lib64\icuind.pdb diff --git a/icu4c/source/layout/layout.vcxproj b/icu4c/source/layout/layout.vcxproj index 4fc2adc343e..10d2a610a04 100644 --- a/icu4c/source/layout/layout.vcxproj +++ b/icu4c/source/layout/layout.vcxproj @@ -110,7 +110,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icule48d.dll + ..\..\bin\icule49d.dll true true .\..\..\lib\iculed.pdb @@ -151,7 +151,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin\icule48.dll + ..\..\bin\icule49.dll true .\..\..\lib\icule.pdb true @@ -195,7 +195,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icule48d.dll + ..\..\bin64\icule49d.dll true true .\..\..\lib64\iculed.pdb @@ -234,7 +234,7 @@ ..\common;%(AdditionalIncludeDirectories) - ..\..\bin64\icule48.dll + ..\..\bin64\icule49.dll true .\..\..\lib64\icule.pdb true diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj index f27010abe33..b114e6a0be2 100644 --- a/icu4c/source/layoutex/layoutex.vcxproj +++ b/icu4c/source/layoutex/layoutex.vcxproj @@ -107,7 +107,7 @@ 0x0409 - ..\..\bin\iculx48.dll + ..\..\bin\iculx49.dll true .\..\..\lib\iculx.pdb true @@ -150,7 +150,7 @@ 0x0409 - ..\..\bin\iculx48d.dll + ..\..\bin\iculx49d.dll true true .\..\..\lib\iculxd.pdb @@ -190,7 +190,7 @@ 0x0409 - ..\..\bin64\iculx48.dll + ..\..\bin64\iculx49.dll true .\..\..\lib64\iculx.pdb true @@ -231,7 +231,7 @@ 0x0409 - ..\..\bin64\iculx48d.dll + ..\..\bin64\iculx49d.dll true true .\..\..\lib64\iculxd.pdb diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj index 961447f57a3..4916d0bc33a 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\icudt48.dll + ..\..\bin\icudt49.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\icudt48.dll + ..\..\bin\icudt49.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\icudt48.dll + ..\..\bin64\icudt49.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\icudt48.dll + ..\..\bin64\icudt49.dll true .\x64\Debug/icudt.pdb true diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c index 22ff5a0202a..c6ab1f8cdb0 100644 --- a/icu4c/source/test/cintltst/cldrtest.c +++ b/icu4c/source/test/cintltst/cldrtest.c @@ -867,7 +867,7 @@ findSetMatch( UScriptCode *scriptCodes, int32_t scriptsLen, } static void VerifyTranslation(void) { - static const UVersionInfo icu49 = { 4, 9, 0, 0 }; + static const UVersionInfo icu49 = { 49, 1, 0, 0 }; UResourceBundle *root, *currentLocale; int32_t locCount = uloc_countAvailable(); int32_t locIndex; diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index 0851bcbd5d2..6cda58a3eda 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -250,7 +250,7 @@ static void checkStatus(int32_t line, UErrorCode expected, UErrorCode status) { } static void TestErrorCodes(void) { - static const UVersionInfo icu49 = { 4, 9, 0, 0 }; + static const UVersionInfo icu49 = { 49, 1, 0, 0 }; UErrorCode status = U_USING_DEFAULT_WARNING; UResourceBundle *r = NULL, *r2 = NULL; diff --git a/icu4c/source/test/cintltst/udatatst.c b/icu4c/source/test/cintltst/udatatst.c index a7e2a14d294..a936bc245fa 100644 --- a/icu4c/source/test/cintltst/udatatst.c +++ b/icu4c/source/test/cintltst/udatatst.c @@ -1109,10 +1109,10 @@ static void TestICUDataName() break; } - sprintf(expectDataName, "%s%d%d%c", + /* Only major number is needed. */ + sprintf(expectDataName, "%s%d%c", "icudt", (int)icuVersion[0], - (int)icuVersion[1], typeChar); log_verbose("Expected: %s\n", expectDataName); diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp index 880455c9fcd..aed26287c13 100644 --- a/icu4c/source/test/intltest/rbbitst.cpp +++ b/icu4c/source/test/intltest/rbbitst.cpp @@ -2201,10 +2201,10 @@ 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. - UVersionInfo icu49 = { 4, 9, 0, 0 }; -UBool isICUVersionPast48 = isICUVersionAtLeast(icu49); -UBool isLineBreak = 0 == strcmp(fileName, "LineBreakTest.txt"); + // TODO(andy): Match line break behavior to Unicode 6.0 and remove this time bomb. + UVersionInfo icu49 = { 49, 1, 0, 0 }; + UBool isICUVersionPast48 = isICUVersionAtLeast(icu49); + 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 9cf89edbcd2..0949b9b285f 100644 --- a/icu4c/source/test/intltest/ssearch.cpp +++ b/icu4c/source/test/intltest/ssearch.cpp @@ -904,7 +904,7 @@ static char *printOrders(char *buffer, OrderList &list) void SSearchTest::offsetTest() { - static const UVersionInfo icu49 = { 4, 9, 0, 0 }; + static const UVersionInfo icu49 = { 49, 1, 0, 0 }; const char *test[] = { // The sequence \u0FB3\u0F71\u0F71\u0F80 contains a discontiguous // contraction (\u0FB3\u0F71\u0F80) logically followed by \u0F71. @@ -2342,7 +2342,7 @@ void SSearchTest::monkeyTest(char *params) void SSearchTest::bmMonkeyTest(char *params) { - static const UVersionInfo icu49 = { 4, 9, 0, 0 }; // for timebomb + static const UVersionInfo icu49 = { 49, 1, 0, 0 }; // for timebomb static const UChar skipChars[] = { 0x0E40, 0x0E41, 0x0E42, 0x0E43, 0x0E44, 0xAAB5, 0xAAB6, 0xAAB9, 0xAABB, 0xAABC, 0 }; // for timebomb // ook! UErrorCode status = U_ZERO_ERROR;