organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-8635 Update ICU4C version to 49.0.1 (49M1)

Browse source 
X-SVN-Rev: 30216
This commit is contained in:
Michael Ow 2011-06-14 00:00:57 +00:00
parent 7f68601ad9
commit 65629eb419
17 changed files with 50 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
icu4c/source/common/common.vcxproj
View file

@ -104,7 +104,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icuuc48.dll</OutputFile>
<OutputFile>..\..\bin\icuuc49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icuuc.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -145,7 +145,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icuuc48d.dll</OutputFile>
<OutputFile>..\..\bin\icuuc49d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\icuucd.pdb</ProgramDatabaseFile>
@ -183,7 +183,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icuuc48.dll</OutputFile>
<OutputFile>..\..\bin64\icuuc49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icuuc.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -222,7 +222,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icuuc48d.dll</OutputFile>
<OutputFile>..\..\bin64\icuuc49d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\icuucd.pdb</ProgramDatabaseFile>

2
icu4c/source/common/unicode/platform.h.in
View file

@ -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

6
icu4c/source/common/unicode/utypes.h
View file

@ -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
/**

18
icu4c/source/common/unicode/uvernum.h
View file

@ -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

3
icu4c/source/configure vendored
View file

@ -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/\..*//'`

3
icu4c/source/configure.in
View file

@ -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)

2
icu4c/source/data/makedata.mak
View file

@ -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

4
icu4c/source/data/misc/icuver.txt
View file

@ -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" }
}

8
icu4c/source/i18n/i18n.vcxproj
View file

@ -107,7 +107,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icuin48.dll</OutputFile>
<OutputFile>..\..\bin\icuin49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icuin.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -151,7 +151,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icuin48d.dll</OutputFile>
<OutputFile>..\..\bin\icuin49d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\icuind.pdb</ProgramDatabaseFile>
@ -192,7 +192,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icuin48.dll</OutputFile>
<OutputFile>..\..\bin64\icuin49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icuin.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -234,7 +234,7 @@
<AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icuin48d.dll</OutputFile>
<OutputFile>..\..\bin64\icuin49d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\icuind.pdb</ProgramDatabaseFile>

8
icu4c/source/layout/layout.vcxproj
View file

@ -110,7 +110,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icule48d.dll</OutputFile>
<OutputFile>..\..\bin\icule49d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\iculed.pdb</ProgramDatabaseFile>
@ -151,7 +151,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\icule48.dll</OutputFile>
<OutputFile>..\..\bin\icule49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\icule.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -195,7 +195,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icule48d.dll</OutputFile>
<OutputFile>..\..\bin64\icule49d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\iculed.pdb</ProgramDatabaseFile>
@ -234,7 +234,7 @@
<AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\icule48.dll</OutputFile>
<OutputFile>..\..\bin64\icule49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\icule.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>

8
icu4c/source/layoutex/layoutex.vcxproj
View file

@ -107,7 +107,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\iculx48.dll</OutputFile>
<OutputFile>..\..\bin\iculx49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib\iculx.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -150,7 +150,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin\iculx48d.dll</OutputFile>
<OutputFile>..\..\bin\iculx49d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib\iculxd.pdb</ProgramDatabaseFile>
@ -190,7 +190,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\iculx48.dll</OutputFile>
<OutputFile>..\..\bin64\iculx49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\..\..\lib64\iculx.pdb</ProgramDatabaseFile>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@ -231,7 +231,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
<OutputFile>..\..\bin64\iculx48d.dll</OutputFile>
<OutputFile>..\..\bin64\iculx49d.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>.\..\..\lib64\iculxd.pdb</ProgramDatabaseFile>

8
icu4c/source/stubdata/stubdata.vcxproj
View file

@ -113,7 +113,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
<OutputFile>..\..\bin\icudt48.dll</OutputFile>
<OutputFile>..\..\bin\icudt49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<ProgramDatabaseFile>.\x86\Release\icudt.pdb</ProgramDatabaseFile>
@ -160,7 +160,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
<OutputFile>..\..\bin\icudt48.dll</OutputFile>
<OutputFile>..\..\bin\icudt49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\x86\Debug/icudt.pdb</ProgramDatabaseFile>
<NoEntryPoint>true</NoEntryPoint>
@ -207,7 +207,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
<OutputFile>..\..\bin64\icudt48.dll</OutputFile>
<OutputFile>..\..\bin64\icudt49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>
<ProgramDatabaseFile>.\x64\Release\icudt.pdb</ProgramDatabaseFile>
@ -252,7 +252,7 @@
<Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>
</PreLinkEvent>
<Link>
<OutputFile>..\..\bin64\icudt48.dll</OutputFile>
<OutputFile>..\..\bin64\icudt49.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\x64\Debug/icudt.pdb</ProgramDatabaseFile>
<NoEntryPoint>true</NoEntryPoint>

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

@ -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;

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

@ -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;

4
icu4c/source/test/cintltst/udatatst.c
View file

@ -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);

8
icu4c/source/test/intltest/rbbitst.cpp
View file

@ -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;
//

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

@ -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;