mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-21 04:29:31 +00:00
ICU-2457 update to 2.4 version number
X-SVN-Rev: 10137
This commit is contained in:
parent
f85b8fd193
commit
10bc681d20
8 changed files with 1278 additions and 1248 deletions
|
@ -55,7 +55,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x4a800000" /dll /machine:I386 /out:"..\..\bin\icuuc22.dll" /implib:"..\..\lib\icuuc.lib" /libpath:"..\..\lib"
|
||||
# ADD LINK32 icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x4a800000" /dll /machine:I386 /out:"..\..\bin\icuuc24.dll" /implib:"..\..\lib\icuuc.lib" /libpath:"..\..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none /debug
|
||||
|
||||
!ELSEIF "$(CFG)" == "common - Win32 Debug"
|
||||
|
@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x4a800000" /dll /debug /machine:I386 /out:"..\..\bin\icuuc22d.dll" /implib:"..\..\lib\icuucd.lib" /pdbtype:sept /libpath:"..\..\lib"
|
||||
# ADD LINK32 icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x4a800000" /dll /debug /machine:I386 /out:"..\..\bin\icuuc24d.dll" /implib:"..\..\lib\icuucd.lib" /pdbtype:sept /libpath:"..\..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "common - Win64 Release"
|
||||
|
@ -109,7 +109,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IX86 /machine:IA64
|
||||
# ADD LINK32 icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x4a800000" /dll /machine:IX86 /out:"..\..\bin\icuuc22.dll" /implib:"..\..\lib\icuuc.lib" /libpath:"..\..\lib" /machine:IA64
|
||||
# ADD LINK32 icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x4a800000" /dll /machine:IX86 /out:"..\..\bin\icuuc24.dll" /implib:"..\..\lib\icuuc.lib" /libpath:"..\..\lib" /machine:IA64
|
||||
# SUBTRACT LINK32 /debug
|
||||
|
||||
!ELSEIF "$(CFG)" == "common - Win64 Debug"
|
||||
|
@ -136,7 +136,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IX86 /pdbtype:sept /machine:IA64
|
||||
# ADD LINK32 icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x4a800000" /dll /incremental:no /debug /machine:IX86 /out:"..\..\bin\icuuc22d.dll" /implib:"..\..\lib\icuucd.lib" /pdbtype:sept /libpath:"..\..\lib" /machine:IA64
|
||||
# ADD LINK32 icudata.lib kernel32.lib user32.lib advapi32.lib shell32.lib /nologo /base:"0x4a800000" /dll /incremental:no /debug /machine:IX86 /out:"..\..\bin\icuuc24d.dll" /implib:"..\..\lib\icuucd.lib" /pdbtype:sept /libpath:"..\..\lib" /machine:IA64
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -48,20 +48,20 @@
|
|||
#define U_ICU_VERSION_MAJOR_NUM 2
|
||||
|
||||
/** The current ICU minor version as an integer. */
|
||||
#define U_ICU_VERSION_MINOR_NUM 2
|
||||
#define U_ICU_VERSION_MINOR_NUM 4
|
||||
|
||||
/** The current ICU patchlevel version as an integer. */
|
||||
#define U_ICU_VERSION_PATCHLEVEL_NUM 0
|
||||
|
||||
/** Glued version suffix for renamers */
|
||||
#define U_ICU_VERSION_SUFFIX _2_2
|
||||
#define U_ICU_VERSION_SUFFIX _2_4
|
||||
|
||||
/** The current ICU library version as a dotted-decimal string. The patchlevel
|
||||
only appears in this string if it non-zero. */
|
||||
#define U_ICU_VERSION "2.2"
|
||||
#define U_ICU_VERSION "2.4"
|
||||
|
||||
/** The current ICU library major/minor version as a string without dots, for library name suffixes. */
|
||||
#define U_ICU_VERSION_SHORT "22"
|
||||
#define U_ICU_VERSION_SHORT "24"
|
||||
|
||||
/** An ICU version consists of up to 4 numbers from 0..255. */
|
||||
#define U_MAX_VERSION_LENGTH 4
|
||||
|
@ -76,7 +76,7 @@
|
|||
typedef uint8_t UVersionInfo[U_MAX_VERSION_LENGTH];
|
||||
|
||||
#if U_HAVE_NAMESPACE && defined(XP_CPLUSPLUS)
|
||||
#define U_ICU_NAMESPACE icu_2_2
|
||||
#define U_ICU_NAMESPACE icu_2_4
|
||||
namespace U_ICU_NAMESPACE { }
|
||||
namespace icu = U_ICU_NAMESPACE;
|
||||
U_NAMESPACE_USE
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
##############################################################################
|
||||
# Keep the following in sync with the version - see common/unicode/uversion.h
|
||||
U_ICUDATA_NAME=icudt22
|
||||
U_ICUDATA_NAME=icudt24
|
||||
##############################################################################
|
||||
U_ICUDATA_ENDIAN_SUFFIX=l
|
||||
UNICODE_VERSION=3.2
|
||||
|
|
|
@ -55,7 +55,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\icuio22.dll" /implib:"..\..\..\lib/icuio.lib" /libpath:"..\..\..\lib\\"
|
||||
# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:I386 /out:"..\..\..\bin\icuio24.dll" /implib:"..\..\..\lib/icuio.lib" /libpath:"..\..\..\lib\\"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "ustdio - Win32 Debug"
|
||||
|
@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\icuio22d.dll" /implib:"..\..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\..\lib\\"
|
||||
# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\bin\icuio24d.dll" /implib:"..\..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\..\lib\\"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "ustdio - Win64 Release"
|
||||
|
@ -109,7 +109,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IA64
|
||||
# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:IA64 /out:"..\..\..\bin\icuio22.dll" /implib:"..\..\..\lib/icuio.lib" /libpath:"..\..\..\lib\\"
|
||||
# ADD LINK32 icuuc.lib icuin.lib /nologo /dll /machine:IA64 /out:"..\..\..\bin\icuio24.dll" /implib:"..\..\..\lib/icuio.lib" /libpath:"..\..\..\lib\\"
|
||||
|
||||
!ELSEIF "$(CFG)" == "ustdio - Win64 Debug"
|
||||
|
||||
|
@ -135,7 +135,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IA64 /pdbtype:sept
|
||||
# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /incremental:no /debug /machine:IA64 /out:"..\..\..\bin\icuio22d.dll" /implib:"..\..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\..\lib\\"
|
||||
# ADD LINK32 icuucd.lib icuind.lib /nologo /dll /incremental:no /debug /machine:IA64 /out:"..\..\..\bin\icuio24d.dll" /implib:"..\..\..\lib\icuiod.lib" /pdbtype:sept /libpath:"debug" /libpath:"..\..\..\lib\\"
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 icuuc.lib /nologo /base:"0x4a900000" /dll /debug /machine:I386 /out:"..\..\bin\icuin22.dll" /implib:"..\..\lib\icuin.lib" /libpath:"..\..\lib"
|
||||
# ADD LINK32 icuuc.lib /nologo /base:"0x4a900000" /dll /debug /machine:I386 /out:"..\..\bin\icuin24.dll" /implib:"..\..\lib\icuin.lib" /libpath:"..\..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "i18n - Win32 Debug"
|
||||
|
@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 icuucd.lib /nologo /base:"0x4a900000" /dll /debug /machine:I386 /out:"..\..\bin\icuin22d.dll" /implib:"..\..\lib\icuind.lib" /pdbtype:sept /libpath:"..\..\lib"
|
||||
# ADD LINK32 icuucd.lib /nologo /base:"0x4a900000" /dll /debug /machine:I386 /out:"..\..\bin\icuin24d.dll" /implib:"..\..\lib\icuind.lib" /pdbtype:sept /libpath:"..\..\lib"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "i18n - Win64 Release"
|
||||
|
@ -109,7 +109,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IX86 /machine:IA64
|
||||
# ADD LINK32 icuuc.lib /nologo /base:"0x4a900000" /dll /machine:IX86 /out:"..\..\bin\icuin22.dll" /implib:"..\..\lib\icuin.lib" /libpath:"..\..\lib" /machine:IA64
|
||||
# ADD LINK32 icuuc.lib /nologo /base:"0x4a900000" /dll /machine:IX86 /out:"..\..\bin\icuin24.dll" /implib:"..\..\lib\icuin.lib" /libpath:"..\..\lib" /machine:IA64
|
||||
# SUBTRACT LINK32 /debug
|
||||
|
||||
!ELSEIF "$(CFG)" == "i18n - Win64 Debug"
|
||||
|
@ -136,7 +136,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IX86 /pdbtype:sept /machine:IA64
|
||||
# ADD LINK32 icuucd.lib /nologo /base:"0x4a900000" /dll /incremental:no /debug /machine:IX86 /out:"..\..\bin\icuin22d.dll" /implib:"..\..\lib\icuind.lib" /pdbtype:sept /libpath:"..\..\lib" /machine:IA64
|
||||
# ADD LINK32 icuucd.lib /nologo /base:"0x4a900000" /dll /incremental:no /debug /machine:IX86 /out:"..\..\bin\icuin24d.dll" /implib:"..\..\lib\icuind.lib" /pdbtype:sept /libpath:"..\..\lib" /machine:IA64
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
|
||||
# ADD LINK32 ..\..\lib\icuuc.lib /nologo /dll /machine:I386 /out:"..\..\bin\icule22.dll" /implib:"..\..\lib\icule.lib"
|
||||
# ADD LINK32 ..\..\lib\icuuc.lib /nologo /dll /machine:I386 /out:"..\..\bin\icule24.dll" /implib:"..\..\lib\icule.lib"
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "layout - Win32 Debug"
|
||||
|
@ -82,7 +82,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
|
||||
# ADD LINK32 ..\..\lib\icuucd.lib /nologo /dll /debug /machine:I386 /out:"..\..\bin\icule22d.dll" /implib:"..\..\lib\iculed.lib" /pdbtype:sept
|
||||
# ADD LINK32 ..\..\lib\icuucd.lib /nologo /dll /debug /machine:I386 /out:"..\..\bin\icule24d.dll" /implib:"..\..\lib\iculed.lib" /pdbtype:sept
|
||||
# SUBTRACT LINK32 /pdb:none
|
||||
|
||||
!ELSEIF "$(CFG)" == "layout - Win64 Release"
|
||||
|
@ -109,7 +109,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:IX86 /machine:IA64
|
||||
# ADD LINK32 ..\..\lib\icuuc.lib /nologo /dll /machine:IX86 /out:"..\..\bin\icule22.dll" /implib:"..\..\lib\icule.lib" /machine:IA64
|
||||
# ADD LINK32 ..\..\lib\icuuc.lib /nologo /dll /machine:IX86 /out:"..\..\bin\icule24.dll" /implib:"..\..\lib\icule.lib" /machine:IA64
|
||||
|
||||
!ELSEIF "$(CFG)" == "layout - Win64 Debug"
|
||||
|
||||
|
@ -135,7 +135,7 @@ BSC32=bscmake.exe
|
|||
# ADD BSC32 /nologo
|
||||
LINK32=link.exe
|
||||
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:IX86 /pdbtype:sept /machine:IA64
|
||||
# ADD LINK32 ..\..\lib\icuucd.lib /nologo /dll /incremental:no /debug /machine:IX86 /out:"..\..\bin\icule22d.dll" /implib:"..\..\lib\iculed.lib" /pdbtype:sept /machine:IA64
|
||||
# ADD LINK32 ..\..\lib\icuucd.lib /nologo /dll /incremental:no /debug /machine:IX86 /out:"..\..\bin\icule24d.dll" /implib:"..\..\lib\iculed.lib" /pdbtype:sept /machine:IA64
|
||||
|
||||
!ENDIF
|
||||
|
||||
|
|
|
@ -13,8 +13,9 @@ COM=$(ICUDIR)/common/libicuuc.$(SO)
|
|||
I18=$(ICUDIR)/i18n/libicui18n.$(SO)
|
||||
LAY=$(ICUDIR)/layout/libicule.$(SO)
|
||||
DAT=$(ICUDIR)/stubdata/libicudata.$(SO)
|
||||
UIO=$(ICUDIR)/extra/ustdio/libustdio.$(SO)
|
||||
|
||||
LIBS=$(COM) $(I18) $(LAY)
|
||||
LIBS=$(COM) $(I18) $(LAY) $(UIO)
|
||||
|
||||
all:
|
||||
@cat README
|
||||
|
@ -28,20 +29,23 @@ $(ICUDIR)/config.status:
|
|||
-mv $(ICUDIR) $(ICUDIR)old
|
||||
-(rm -rf $(ICUDIR)old &)
|
||||
mkdir $(ICUDIR)
|
||||
( cd $(ICUDIR) ; CPPFLAGS=-DURENAME_H $(TOP)/../configure --with-data-packaging=archive --enable-layout=yes --enable-tests=no --enable-extras=no --prefix=`pwd` $(GENREN_CONFIGURE_OPTS) )
|
||||
( cd $(ICUDIR) ; CPPFLAGS=-DURENAME_H $(TOP)/../configure --with-data-packaging=archive --enable-layout=yes --enable-tests=no --enable-extras=yes --prefix=`pwd` $(GENREN_CONFIGURE_OPTS) )
|
||||
|
||||
# build the libraries
|
||||
$(DAT): $(ICUDIR)/config.status Makefile
|
||||
gmake -C $(ICUDIR)/stubdata libicudata.so
|
||||
gmake -C $(ICUDIR)/stubdata libicudata.$(SO)
|
||||
|
||||
$(COM): $(DAT) $(ICUDIR)/config.status Makefile
|
||||
gmake -C $(ICUDIR)/common libicuuc.so
|
||||
gmake -C $(ICUDIR)/common libicuuc.$(SO)
|
||||
|
||||
$(I18): $(DAT) $(COM) $(ICUDIR)/config.status Makefile
|
||||
gmake -C $(ICUDIR)/i18n libicui18n.so
|
||||
gmake -C $(ICUDIR)/i18n libicui18n.$(SO)
|
||||
|
||||
$(LAY): $(DAT) $(I18) $(COM) $(ICUDIR)/config.status Makefile
|
||||
gmake -C $(ICUDIR)/layout libicule.so
|
||||
gmake -C $(ICUDIR)/layout libicule.$(SO)
|
||||
|
||||
$(UIO): $(DAT) $(I18) $(COM) $(ICUDIR)/config.status Makefile
|
||||
gmake -C $(ICUDIR)/extra/ustdio libustdio.$(SO)
|
||||
|
||||
# the header itself
|
||||
urename.h: $(LIBS) genren.pl
|
||||
|
|
Loading…
Add table
Reference in a new issue