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-4881 Update version number to 3.5.

Browse source 
X-SVN-Rev: 18689
This commit is contained in:
George Rhoten 2005-10-17 22:11:34 +00:00
parent 6827d1ddc6
commit 5221d3bad4
15 changed files with 1528 additions and 1542 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,10 +38,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuuc34.dll"
OutputFile="..\..\bin\icuuc35.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib\icuuc34.pdb"
ProgramDatabaseFile=".\..\..\lib\icuuc35.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4a800000"
ImportLibrary="..\..\lib\icuuc.lib"/>
@ -102,11 +102,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuuc34d.dll"
OutputFile="..\..\bin\icuuc35d.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\..\..\lib\icuuc34d.pdb"
ProgramDatabaseFile=".\..\..\lib\icuuc35d.pdb"
BaseAddress="0x4a800000"
ImportLibrary="..\..\lib\icuucd.lib"/>
<Tool

7
icu4c/source/common/uidna.cpp
View file

@ -194,13 +194,6 @@ static inline UBool isLDHChar(UChar ch){
return FALSE;
}
// We should add this to utypes.c
#if U_ICU_VERSION_MAJOR_NUM>3 || (U_ICU_VERSION_MAJOR_NUM==3 && U_ICU_VERSION_MINOR_NUM>4)
# error Time bomb: After ICU 3.4 move the definition of utypes.h and fix the TODO in _uIDNAErrorName definition.
#else
# define U_IDNA_ZERO_LENGTH_LABEL_ERROR U_IDNA_ERROR_LIMIT
#endif
static int32_t
_internal_toASCII(const UChar* src, int32_t srcLength,
UChar* dest, int32_t destCapacity,

2980
icu4c/source/common/unicode/urename.h
View file

File diff suppressed because it is too large Load diff

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

@ -719,6 +719,7 @@ typedef enum UErrorCode {
U_IDNA_ACE_PREFIX_ERROR,
U_IDNA_VERIFICATION_ERROR,
U_IDNA_LABEL_TOO_LONG_ERROR,
U_IDNA_ZERO_LENGTH_LABEL_ERROR,
U_IDNA_ERROR_LIMIT,
/*
* Aliases for StringPrep

10
icu4c/source/common/unicode/uversion.h
View file

@ -67,7 +67,7 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_MINOR_NUM 4
#define U_ICU_VERSION_MINOR_NUM 5
/** The current ICU patchlevel version as an integer.
* This value will change in the subsequent releases of ICU
@ -79,20 +79,20 @@
* This value will change in the subsequent releases of ICU
* @stable ICU 2.6
*/
#define U_ICU_VERSION_SUFFIX _3_4
#define U_ICU_VERSION_SUFFIX _3_5
/** The current ICU library version as a dotted-decimal string. The patchlevel
* only appears in this string if it non-zero.
* This value will change in the subsequent releases of ICU
* @stable ICU 2.4
*/
#define U_ICU_VERSION "3.4"
#define U_ICU_VERSION "3.5"
/** 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 "34"
#define U_ICU_VERSION_SHORT "35"
/** An ICU version consists of up to 4 numbers from 0..255.
* @stable ICU 2.4
@ -119,7 +119,7 @@ typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
#define U_ICU_NAMESPACE icu
namespace U_ICU_NAMESPACE { }
#else
#define U_ICU_NAMESPACE icu_3_4
#define U_ICU_NAMESPACE icu_3_5
namespace U_ICU_NAMESPACE { }
namespace icu = U_ICU_NAMESPACE;
#endif

6
icu4c/source/common/utypes.c
View file

@ -156,11 +156,9 @@ _uRegexErrorName[U_REGEX_ERROR_LIMIT - U_REGEX_ERROR_START] = {
"U_REGEX_LOOK_BEHIND_LIMIT",
"U_REGEX_SET_CONTAINS_STRING"
};
/* TODO: replace the definition with _uIDNAErrorName[U_IDNA_ERROR_LIMIT - U_IDNA_ERROR_START ]
* in ICU 3.6
*/
static const char * const
_uIDNAErrorName[U_IDNA_ERROR_LIMIT - U_IDNA_ERROR_START + 1] = {
_uIDNAErrorName[U_IDNA_ERROR_LIMIT - U_IDNA_ERROR_START] = {
"U_IDNA_ERROR_START",
"U_STRINGPREP_PROHIBITED_ERROR",
"U_STRINGPREP_UNASSIGNED_ERROR",

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

@ -10,7 +10,7 @@
##############################################################################
# Keep the following in sync with the version - see common/unicode/uversion.h
U_ICUDATA_NAME=icudt34
U_ICUDATA_NAME=icudt35
##############################################################################
U_ICUDATA_ENDIAN_SUFFIX=l
UNICODE_VERSION=4.1

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

@ -39,10 +39,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuin34.dll"
OutputFile="..\..\bin\icuin35.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib\icuin34.pdb"
ProgramDatabaseFile=".\..\..\lib\icuin35.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4a900000"
ImportLibrary="..\..\lib\icuin.lib"/>
@ -106,11 +106,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuin34d.dll"
OutputFile="..\..\bin\icuin35d.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\..\..\lib\icuin34d.pdb"
ProgramDatabaseFile=".\..\..\lib\icuin35d.pdb"
BaseAddress="0x4a900000"
ImportLibrary="..\..\lib\icuind.lib"/>
<Tool

8
icu4c/source/io/io.vcproj
View file

@ -39,10 +39,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuio34.dll"
OutputFile="..\..\bin\icuio35.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib\icuio34.pdb"
ProgramDatabaseFile=".\..\..\lib\icuio35.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4ab00000"
ImportLibrary="..\..\lib\icuio.lib"/>
@ -106,11 +106,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icuio34d.dll"
OutputFile="..\..\bin\icuio35d.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\..\..\lib\icuio34d.pdb"
ProgramDatabaseFile=".\..\..\lib\icuio35d.pdb"
BaseAddress="0x4ab00000"
ImportLibrary="..\..\lib\icuiod.lib"/>
<Tool

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

@ -41,11 +41,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icule34d.dll"
OutputFile="..\..\bin\icule35d.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\..\..\lib\icule34d.pdb"
ProgramDatabaseFile=".\..\..\lib\icule35d.pdb"
BaseAddress="0x4ac00000"
ImportLibrary="..\..\lib\iculed.lib"/>
<Tool
@ -105,10 +105,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icule34.dll"
OutputFile="..\..\bin\icule35.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib\icule34.pdb"
ProgramDatabaseFile=".\..\..\lib\icule35.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4ac00000"
ImportLibrary="..\..\lib\icule.lib"/>

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

@ -37,10 +37,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\iculx34.dll"
OutputFile="..\..\bin\iculx35.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\..\..\lib\iculx34.pdb"
ProgramDatabaseFile=".\..\..\lib\iculx35.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4ac80000"
ImportLibrary="..\..\lib\iculx.lib"/>
@ -102,11 +102,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\iculx34d.dll"
OutputFile="..\..\bin\iculx35d.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\..\..\lib\iculx34d.pdb"
ProgramDatabaseFile=".\..\..\lib\iculx35d.pdb"
BaseAddress="0x4ac80000"
ImportLibrary="..\..\lib\iculxd.lib"/>
<Tool

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

@ -38,10 +38,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icudt34.dll"
OutputFile="..\..\bin\icudt35.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\Release/icudt34.pdb"
ProgramDatabaseFile=".\Release/icudt35.pdb"
ResourceOnlyDLL="TRUE"
ImportLibrary="..\..\lib\icudt.lib"/>
<Tool
@ -103,10 +103,10 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\bin\icudt34.dll"
OutputFile="..\..\bin\icudt35.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
ProgramDatabaseFile=".\Debug/icudt34.pdb"
ProgramDatabaseFile=".\Debug/icudt35.pdb"
ResourceOnlyDLL="TRUE"
ImportLibrary="..\..\lib\icudt.lib"/>
<Tool

6
icu4c/source/test/intltest/idnaref.cpp
View file

@ -240,12 +240,6 @@ CLEANUP:
}
#if U_ICU_VERSION_MAJOR_NUM>3 || (U_ICU_VERSION_MAJOR_NUM==3 && U_ICU_VERSION_MINOR_NUM>4)
# error Time bomb: Remove the definition of U_IDNA_ZERO_LENGTH_LABEL_ERROR from __FILE__
#else
# define U_IDNA_ZERO_LENGTH_LABEL_ERROR U_IDNA_ERROR_LIMIT
#endif
U_CFUNC int32_t U_EXPORT2
idnaref_toASCII(const UChar* src, int32_t srcLength,
UChar* dest, int32_t destCapacity,

2
icu4c/source/test/intltest/testidna.cpp
View file

@ -395,7 +395,7 @@ static struct ErrorCases{
0x0000
},
"www..com",
U_IDNA_ERROR_LIMIT, //TODO: Fix this to U_IDNA_ZERO_LENGTH_LABEL_ERROR, in 3.6
U_IDNA_ZERO_LENGTH_LABEL_ERROR,
TRUE, TRUE, FALSE
},
{

8
icu4c/source/tools/toolutil/toolutil.vcproj
View file

@ -37,11 +37,11 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\bin\icutu34.dll"
OutputFile="..\..\..\bin\icutu35.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\lib"
ProgramDatabaseFile=".\..\..\..\lib\icutu34.pdb"
ProgramDatabaseFile=".\..\..\..\lib\icutu35.pdb"
EnableCOMDATFolding="2"
BaseAddress="0x4ac00000"
ImportLibrary="..\..\..\lib\icutu.lib"/>
@ -102,12 +102,12 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
OutputFile="..\..\..\bin\icutu34d.dll"
OutputFile="..\..\..\bin\icutu35d.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\..\..\..\lib\icutu34d.pdb"
ProgramDatabaseFile=".\..\..\..\lib\icutu35d.pdb"
BaseAddress="0x4ac00000"
ImportLibrary="..\..\..\lib\icutud.lib"/>
<Tool