dmitryh 2004/04/04 11:30:03
Modified: c Makefile.incl.in version.incl
c/Projects/Win32/Res/AllInOne AllInOne.rc
c/Projects/Win32/VC6/AllInOne AllInOne.dsp
AllInOneWithICU.dsp
c/Projects/Win32/VC7/AllInOne AllInOne.vcproj
AllInOneWithICU.vcproj
c/Tests/Harness Harness.dsp Harness.rc Harness.vcproj
c/src/xalanc/Include XalanVersion.hpp
c/src/xalanc/NLS/en_US XalanMsg_en_US.xlf
c/xdocs/sources entities.ent
c/xdocs/sources/xalan readme.xml
Log:
Advancing Xalan-C version number to 1.8.0 and Xerces-C to 2.5.0
Revision Changes Path
1.16 +2 -2 xml-xalan/c/Makefile.incl.in
Index: Makefile.incl.in
===================================================================
RCS file: /home/cvs/xml-xalan/c/Makefile.incl.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Makefile.incl.in 3 Mar 2004 15:06:38 -0000 1.15
+++ Makefile.incl.in 4 Apr 2004 18:30:02 -0000 1.16
@@ -315,7 +315,7 @@
endif
- XERCES_LIB= -L$(XERCESCROOT)/lib -lxerces-c24
+ XERCES_LIB= -L$(XERCESCROOT)/lib -lxerces-c25
ICU_LIB= -L$(ICUROOT)/lib -licuuc26 -L$(ICUI18NROOT)/lib -licui18n26
LIB = $(LIB_NAME)$(LIB_MAJOR_VER).$(LIB_MINOR_VER)$(SHLIBSUFFIX)
@@ -351,7 +351,7 @@
MAKE_SHARED = ${CXX} $(CXXFLAGS) -Wl,compat=pm3 -D${PLATFORM} -Wl,dll
LINK = $(CXX) $(CXXFLAGS) $(PLATFORM_COMPILE_OPTIONS) -Wl,compat=pm3
- XERCES_LIB=$(XERCESCROOT)/lib/libxerces-c2_4_0.x
+ XERCES_LIB=$(XERCESCROOT)/lib/libxerces-c2_5_0.x
ICU_LIB=$(XERCESCROOT)/lib/libicuuc26.1.x
$(XERCESCROOT)/lib/libicui18n26.1.x
LIB=$(LIB_NAME).$(VER)$(OS390SIDEDECK)
1.6 +3 -3 xml-xalan/c/version.incl
Index: version.incl
===================================================================
RCS file: /home/cvs/xml-xalan/c/version.incl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- version.incl 26 Feb 2004 23:10:06 -0000 1.5
+++ version.incl 4 Apr 2004 18:30:02 -0000 1.6
@@ -16,8 +16,8 @@
###################################################################
PROJECT_NAME = xalan-c
-LIB_MAJOR_VER = 17
-LIB_MAJOR_DOT_VER = 1.7
+LIB_MAJOR_VER = 18
+LIB_MAJOR_DOT_VER = 1.8
LIB_MINOR_VER = 0
-VER = 1_7_0
+VER = 1_8_0
1.7 +8 -8 xml-xalan/c/Projects/Win32/Res/AllInOne/AllInOne.rc
Index: AllInOne.rc
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/Res/AllInOne/AllInOne.rc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AllInOne.rc 5 Dec 2003 18:09:19 -0000 1.6
+++ AllInOne.rc 4 Apr 2004 18:30:02 -0000 1.7
@@ -29,8 +29,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,6,0,0
- PRODUCTVERSION 1,6,0,0
+ FILEVERSION 1,8,0,0
+ PRODUCTVERSION 1,8,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,15 +47,15 @@
BEGIN
VALUE "Comments", "Dynamic linked library for Xalan-C++\0"
VALUE "CompanyName", "Apache Software Foundation\0"
- VALUE "FileDescription", "Dynamic Link Library for Xalan-C++
Version 1.7.0\0"
- VALUE "FileVersion", "1, 7, 0, 0\0"
- VALUE "InternalName", "Xalan-C_1_7_0.dll\0"
- VALUE "LegalCopyright", "Copyright � Apache Software Foundation
1999-2003. Subject to licensing terms\0"
+ VALUE "FileDescription", "Dynamic Link Library for Xalan-C++
Version 1.8.0\0"
+ VALUE "FileVersion", "1, 8, 0, 0\0"
+ VALUE "InternalName", "Xalan-C_1_8_0.dll\0"
+ VALUE "LegalCopyright", "Copyright � Apache Software Foundation
1999-2004. Subject to licensing terms\0"
VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "Xalan-C_1_7_0.dll\0"
+ VALUE "OriginalFilename", "Xalan-C_1_8_0.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Xalan-C++ Version 1.7.0\0"
- VALUE "ProductVersion", "1, 7, 0, 0\0"
+ VALUE "ProductVersion", "1, 8, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
1.51 +5 -5 xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOne.dsp
Index: AllInOne.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOne.dsp,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- AllInOne.dsp 2 Apr 2004 02:46:13 -0000 1.50
+++ AllInOne.dsp 4 Apr 2004 18:30:02 -0000 1.51
@@ -56,7 +56,7 @@
# 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 xerces-c_2.lib XalanMessages_1_7_0.lib /nologo /dll /pdb:none
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_7_0.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\Build\Win32\VC6\Release"
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8_0.lib /nologo /dll /pdb:none
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_8_0.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\Build\Win32\VC6\Release"
!ELSEIF "$(CFG)" == "AllInOne - Win32 Debug"
@@ -83,7 +83,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib XalanMessages_1_7_0D.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_7_0D.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
/libpath:"..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8_0D.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_8_0D.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
/libpath:"..\..\..\..\Build\Win32\VC6\Debug"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AllInOne - Win32 Release with symbols"
@@ -112,7 +112,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32
..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo
/dll /debug /machine:I386
-# ADD LINK32 xerces-c_2.lib XalanMessages_1_7_0S.lib /nologo /dll /debug
/machine:I386
/out:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1_7_0S.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1S.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\Build\Win32\VC6\Release.symbols"
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8_0S.lib /nologo /dll /debug
/machine:I386
/out:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1_8_0S.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1S.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\Build\Win32\VC6\Release.symbols"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AllInOne - Win64 Release"
@@ -140,7 +140,7 @@
# 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 xerces-c_2.lib XalanMessages_1_7_0.lib /nologo /dll /pdb:none
/machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_7_0.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8_0.lib /nologo /dll /pdb:none
/machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_8_0.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
!ELSEIF "$(CFG)" == "AllInOne - Win64 Debug"
@@ -166,7 +166,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib XalanMessages_1_7_0D.lib /nologo /dll /debug
/machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_7_0D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8_0D.lib /nologo /dll /debug
/machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_8_0D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.48 +5 -5
xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp
Index: AllInOneWithICU.dsp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/Projects/Win32/VC6/AllInOne/AllInOneWithICU.dsp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- AllInOneWithICU.dsp 3 Apr 2004 02:28:01 -0000 1.47
+++ AllInOneWithICU.dsp 4 Apr 2004 18:30:02 -0000 1.48
@@ -56,7 +56,7 @@
# 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 xerces-c_2.lib XalanMessages_1_7_0.lib icuuc.lib icuin.lib
/nologo /dll /pdb:none /machine:I386
/out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_7_0.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Release"
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8_0.lib icuuc.lib icuin.lib
/nologo /dll /pdb:none /machine:I386
/out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_8_0.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Release"
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win32 Debug"
@@ -83,7 +83,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib XalanMessages_1_7_0D.lib icuucd.lib icuind.lib
/nologo /dll /debug /machine:I386
/out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_7_0D.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
/libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8_0D.lib icuucd.lib icuind.lib
/nologo /dll /debug /machine:I386
/out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_8_0D.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
/libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Debug"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win32 Release with symbols"
@@ -112,7 +112,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32
..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib /nologo
/dll /debug /machine:I386
-# ADD LINK32 xerces-c_2.lib XalanMessages_1_7_0S.lib icuuc.lib icuin.lib
/nologo /dll /debug /machine:I386
/out:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1_7_0S.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1S.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Release.symbols"
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8_0S.lib icuuc.lib icuin.lib
/nologo /dll /debug /machine:I386
/out:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1_8_0S.dll"
/implib:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1S.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib"
/libpath:"..\..\..\..\Build\Win32\VC6\Release.symbols"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win64 Release"
@@ -140,7 +140,7 @@
# 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 xerces-c_2.lib XalanMessages_1_7_0.lib icuuc.lib icuin.lib
/nologo /dll /pdb:none /machine:IX86
/out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_7_0.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib" /machine:IA64
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8_0.lib icuuc.lib icuin.lib
/nologo /dll /pdb:none /machine:IX86
/out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_8_0.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib"
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/libpath:"..\..\..\..\..\..\icu\lib" /machine:IA64
!ELSEIF "$(CFG)" == "AllInOneWithICU - Win64 Debug"
@@ -166,7 +166,7 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 xerces-c_2D.lib XalanMessages_1_7_0D.lib icuucd.lib icuind.lib
/nologo /dll /debug /machine:IX86
/out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_7_0D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\..\..\icu\lib" /machine:IA64
+# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8_0D.lib icuucd.lib icuind.lib
/nologo /dll /debug /machine:IX86
/out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_8_0D.dll"
/implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
/libpath:"..\..\..\..\..\..\icu\lib" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.4 +8 -8 xml-xalan/c/Projects/Win32/VC7/AllInOne/AllInOne.vcproj
Index: AllInOne.vcproj
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC7/AllInOne/AllInOne.vcproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AllInOne.vcproj 30 Mar 2004 15:17:44 -0000 1.3
+++ AllInOne.vcproj 4 Apr 2004 18:30:03 -0000 1.4
@@ -50,13 +50,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="xerces-c_2.lib
XalanMessages_1_7_0S.lib"
-
OutputFile="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_7_0S.dll"
+ AdditionalDependencies="xerces-c_2.lib
XalanMessages_1_8_0S.lib"
+
OutputFile="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8_0S.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC7\Release,..\..\..\..\Build\Win32\VC7\Release.symbols"
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_7_0S.pdb"
+
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8_0S.pdb"
ImportLibrary="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1S.lib"/>
<Tool
Name="VCMIDLTool"
@@ -119,8 +119,8 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="xerces-c_2.lib
XalanMessages_1_7_0.lib"
-
OutputFile="..\..\..\..\Build\Win32\VC7\Release/Xalan-C_1_7_0.dll"
+ AdditionalDependencies="xerces-c_2.lib
XalanMessages_1_8_0.lib"
+
OutputFile="..\..\..\..\Build\Win32\VC7\Release/Xalan-C_1_8_0.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC7\Release,..\..\..\..\Build\Win32\VC7\Release"
@@ -184,13 +184,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="xerces-c_2D.lib
XalanMessages_1_7_0D.lib"
-
OutputFile="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_7_0D.dll"
+ AdditionalDependencies="xerces-c_2D.lib
XalanMessages_1_8_0D.lib"
+
OutputFile="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8_0D.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC7\Debug,..\..\..\..\Build\Win32\VC7\Debug"
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_7_0D.pdb"
+
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8_0D.pdb"
ImportLibrary="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1D.lib"/>
<Tool
Name="VCMIDLTool"
1.3 +8 -8
xml-xalan/c/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj
Index: AllInOneWithICU.vcproj
===================================================================
RCS file:
/home/cvs/xml-xalan/c/Projects/Win32/VC7/AllInOne/AllInOneWithICU.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AllInOneWithICU.vcproj 30 Mar 2004 15:17:44 -0000 1.2
+++ AllInOneWithICU.vcproj 4 Apr 2004 18:30:03 -0000 1.3
@@ -41,8 +41,8 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="xerces-c_2.lib
XalanMessages_1_7_0.lib icuuc.lib icuin.lib"
-
OutputFile="..\..\..\..\Build\Win32\VC7\Release/Xalan-C_1_7_0.dll"
+ AdditionalDependencies="xerces-c_2.lib
XalanMessages_1_8_0.lib icuuc.lib icuin.lib"
+
OutputFile="..\..\..\..\Build\Win32\VC7\Release/Xalan-C_1_8_0.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC7\Release,..\..\..\..\..\..\icu\lib,..\..\..\..\Build\Win32\VC7\Release"
@@ -100,13 +100,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="xerces-c_2D.lib
XalanMessages_1_7_0D.lib icuucd.lib icuind.lib"
-
OutputFile="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_7_0D.dll"
+ AdditionalDependencies="xerces-c_2D.lib
XalanMessages_1_8_0D.lib icuucd.lib icuind.lib"
+
OutputFile="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8_0D.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC7\Debug,..\..\..\..\..\..\icu\lib,..\..\..\..\Build\Win32\VC7\Debug"
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_7_0D.pdb"
+
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8_0D.pdb"
ImportLibrary="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1D.lib"/>
<Tool
Name="VCMIDLTool"
@@ -161,13 +161,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="xerces-c_2.lib
XalanMessages_1_7_0S.lib icuuc.lib icuin.lib"
-
OutputFile="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_7_0S.dll"
+ AdditionalDependencies="xerces-c_2.lib
XalanMessages_1_8_0S.lib icuuc.lib icuin.lib"
+
OutputFile="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8_0S.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC7\Release,..\..\..\..\..\..\icu\lib,..\..\..\..\Build\Win32\VC7\Release.symbols"
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_7_0S.pdb"
+
ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8_0S.pdb"
ImportLibrary="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1S.lib"/>
<Tool
Name="VCMIDLTool"
1.24 +5 -5 xml-xalan/c/Tests/Harness/Harness.dsp
Index: Harness.dsp
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/Harness.dsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- Harness.dsp 5 Dec 2003 18:09:19 -0000 1.23
+++ Harness.dsp 4 Apr 2004 18:30:03 -0000 1.24
@@ -56,7 +56,7 @@
# 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 xerces-c_2.lib /nologo /dll /pdb:none /machine:I386
/out:"..\..\Build\Win32\VC6\Release/Harness_1_7_0.dll"
/implib:"..\..\Build\Win32\VC6\Release/Harness_1.lib"
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
+# ADD LINK32 xerces-c_2.lib /nologo /dll /pdb:none /machine:I386
/out:"..\..\Build\Win32\VC6\Release/Harness_1_8_0.dll"
/implib:"..\..\Build\Win32\VC6\Release/Harness_1.lib"
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
!ELSEIF "$(CFG)" == "Harness - Win32 Debug"
@@ -82,7 +82,7 @@
# 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 xerces-c_2D.lib /nologo /dll /debug /machine:I386
/out:"..\..\Build\Win32\VC6\Debug/Harness_1_7_0D.dll"
/implib:"..\..\Build\Win32\VC6\Debug/Harness_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
+# ADD LINK32 xerces-c_2D.lib /nologo /dll /debug /machine:I386
/out:"..\..\Build\Win32\VC6\Debug/Harness_1_8_0D.dll"
/implib:"..\..\Build\Win32\VC6\Debug/Harness_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Harness - Win32 Release with symbols"
@@ -111,7 +111,7 @@
LINK32=link.exe
# ADD BASE LINK32
..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release\xerces-c_1.lib
..\..\Build\Win32\VC6\Release\PlatformSupport.lib
..\..\Build\Win32\VC6\Release\XalanDOM.lib 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 /incremental:yes /machine:I386
# SUBTRACT BASE LINK32 /debug
-# ADD LINK32 xerces-c_2.lib /nologo /dll /debug /machine:I386
/out:"..\..\Build\Win32\VC6\Release.symbols/Harness_1_7_0S.dll"
/implib:"..\..\Build\Win32\VC6\Release.symbols/Harness_1S.lib"
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
+# ADD LINK32 xerces-c_2.lib /nologo /dll /debug /machine:I386
/out:"..\..\Build\Win32\VC6\Release.symbols/Harness_1_8_0S.dll"
/implib:"..\..\Build\Win32\VC6\Release.symbols/Harness_1S.lib"
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release"
# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "Harness - Win64 Release"
@@ -138,7 +138,7 @@
# 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 xerces-c_2.lib /nologo /dll /pdb:none /machine:IX86
/out:"..\..\Build\Win64\VC6\Release/Harness_1_7_0.dll"
/implib:"..\..\Build\Win64\VC6\Release/Harness_1.lib"
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /machine:IA64
+# ADD LINK32 xerces-c_2.lib /nologo /dll /pdb:none /machine:IX86
/out:"..\..\Build\Win64\VC6\Release/Harness_1_8_0.dll"
/implib:"..\..\Build\Win64\VC6\Release/Harness_1.lib"
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /machine:IA64
!ELSEIF "$(CFG)" == "Harness - Win64 Debug"
@@ -164,7 +164,7 @@
# 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 xerces-c_2D.lib /nologo /dll /debug /machine:IX86
/out:"..\..\Build\Win64\VC6\Debug/Harness_1_7_0D.dll"
/implib:"..\..\Build\Win64\VC6\Debug/Harness_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /machine:IA64
+# ADD LINK32 xerces-c_2D.lib /nologo /dll /debug /machine:IX86
/out:"..\..\Build\Win64\VC6\Debug/Harness_1_8_0D.dll"
/implib:"..\..\Build\Win64\VC6\Debug/Harness_1D.lib" /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.7 +7 -7 xml-xalan/c/Tests/Harness/Harness.rc
Index: Harness.rc
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/Harness.rc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Harness.rc 9 Jan 2004 07:08:00 -0000 1.6
+++ Harness.rc 4 Apr 2004 18:30:03 -0000 1.7
@@ -29,8 +29,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,7,0,0
- PRODUCTVERSION 1,7,0,0
+ FILEVERSION 1,8,0,0
+ PRODUCTVERSION 1,8,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -47,15 +47,15 @@
BEGIN
VALUE "Comments", "Dynamic linked library for Xalan-C++\0"
VALUE "CompanyName", "Apache Software Foundation\0"
- VALUE "FileDescription", "Dynamic Link Library for Xalan-C++
Version 1.7.0\0"
- VALUE "FileVersion", "1, 7, 0, 0\0"
- VALUE "InternalName", "Harness_1_7_0.dll\0"
+ VALUE "FileDescription", "Dynamic Link Library for Xalan-C++
Version 1.8.0\0"
+ VALUE "FileVersion", "1, 8, 0, 0\0"
+ VALUE "InternalName", "Harness_1_8_0.dll\0"
VALUE "LegalCopyright", "Copyright � Apache Software Foundation
1999-2004. Subject to licensing terms\0"
VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "Harness_1_7_0.dll\0"
+ VALUE "OriginalFilename", "Harness_1_8_0.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Xalan-C++ Version 1.7.0\0"
- VALUE "ProductVersion", "1, 7, 0, 0\0"
+ VALUE "ProductVersion", "1, 8, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
1.2 +5 -5 xml-xalan/c/Tests/Harness/Harness.vcproj
Index: Harness.vcproj
===================================================================
RCS file: /home/cvs/xml-xalan/c/Tests/Harness/Harness.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Harness.vcproj 11 Feb 2004 01:14:19 -0000 1.1
+++ Harness.vcproj 4 Apr 2004 18:30:03 -0000 1.2
@@ -44,12 +44,12 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="xerces-c_2D.lib"
-
OutputFile="..\..\Build\Win32\VC7\Debug/Harness_1_7_0D.dll"
+
OutputFile="..\..\Build\Win32\VC7\Debug/Harness_1_8_0D.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7\Debug"
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\Build\Win32\VC7\Debug/Harness_1_7_0D.pdb"
+
ProgramDatabaseFile=".\..\..\Build\Win32\VC7\Debug/Harness_1_8_0D.pdb"
ImportLibrary="..\..\Build\Win32\VC7\Debug/Harness_1D.lib"/>
<Tool
Name="VCMIDLTool"
@@ -103,7 +103,7 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="xerces-c_2.lib"
-
OutputFile="..\..\Build\Win32\VC7\Release/Harness_1_7_0.dll"
+
OutputFile="..\..\Build\Win32\VC7\Release/Harness_1_8_0.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7\Release"
@@ -161,12 +161,12 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="xerces-c_2.lib"
-
OutputFile="..\..\Build\Win32\VC7\Release.symbols/Harness_1_7_0S.dll"
+
OutputFile="..\..\Build\Win32\VC7\Release.symbols/Harness_1_8_0S.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7\Release"
GenerateDebugInformation="TRUE"
-
ProgramDatabaseFile=".\..\..\Build\Win32\VC7\Release.symbols/Harness_1_7_0S.pdb"
+
ProgramDatabaseFile=".\..\..\Build\Win32\VC7\Release.symbols/Harness_1_8_0S.pdb"
ImportLibrary="..\..\Build\Win32\VC7\Release.symbols/Harness_1S.lib"/>
<Tool
Name="VCMIDLTool"
1.8 +1 -1 xml-xalan/c/src/xalanc/Include/XalanVersion.hpp
Index: XalanVersion.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/Include/XalanVersion.hpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanVersion.hpp 26 Feb 2004 22:30:58 -0000 1.7
+++ XalanVersion.hpp 4 Apr 2004 18:30:03 -0000 1.8
@@ -117,7 +117,7 @@
*/
#define XALAN_VERSION_MAJOR 1
-#define XALAN_VERSION_MINOR 7
+#define XALAN_VERSION_MINOR 8
#define XALAN_VERSION_REVISION 0
1.8 +1 -1 xml-xalan/c/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf
Index: XalanMsg_en_US.xlf
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XalanMsg_en_US.xlf 26 Feb 2004 22:29:02 -0000 1.7
+++ XalanMsg_en_US.xlf 4 Apr 2004 18:30:03 -0000 1.8
@@ -19,7 +19,7 @@
<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN"
"../xliff.dtd" >
<xliff version="1.1">
- <file source-language="en_US" target-language="en_US" datatype="cpp"
original="XalanC source files" product-name="XalanC" product-version="1.7.0">
+ <file source-language="en_US" target-language="en_US" datatype="cpp"
original="XalanC source files" product-name="XalanC" product-version="1.8.0">
<header></header>
<body>
1.36 +2 -2 xml-xalan/c/xdocs/sources/entities.ent
Index: entities.ent
===================================================================
RCS file: /home/cvs/xml-xalan/c/xdocs/sources/entities.ent,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- entities.ent 14 Jan 2004 22:17:57 -0000 1.35
+++ entities.ent 4 Apr 2004 18:30:03 -0000 1.36
@@ -57,11 +57,11 @@
-->
<!ENTITY xslt4c "Xalan-C++">
-<!ENTITY xslt4c-dist "Xalan-C_1_7_0">
+<!ENTITY xslt4c-dist "Xalan-C_1_8_0">
<!ENTITY xslt4c-win_root "xml-xalan\c">
<!ENTITY xslt4c-unix_root "xml-xalan/c">
<!ENTITY xslt4c-current "Xalan-C++ version 1.7">
-<!ENTITY xslt4c-windll "Xalan-C_1_7_0.dll">
+<!ENTITY xslt4c-windll "Xalan-C_1_8_0.dll">
<!ENTITY xslt4c-linuxlib "libxalan-c1_7.so">
<!ENTITY xslt4c-aixlib "libxalan-c1_7.so">
<!ENTITY xslt4c-hplib "libxalan-c1_7.sl">
1.53 +1 -1 xml-xalan/c/xdocs/sources/xalan/readme.xml
Index: readme.xml
===================================================================
RCS file: /home/cvs/xml-xalan/c/xdocs/sources/xalan/readme.xml,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- readme.xml 26 Feb 2004 22:24:07 -0000 1.52
+++ readme.xml 4 Apr 2004 18:30:03 -0000 1.53
@@ -270,7 +270,7 @@
<table>
<tr><th>Localization Build Type</th><th>File Name</th></tr>
<tr><td><ref>ICU or "in memory" method:</ref></td><td>libxalanMsg17.so
(for UNIX)<br/>
- XalanMessages_1_7_0.dll and XalanMessages_1_7_0.lib (for Windows)
+ XalanMessages_1_8_0.dll and XalanMessages_1_8_0.lib (for Windows)
</td></tr>
<tr><td><ref>NLS method:</ref></td><td>xalanMsg1_7.cat can be found in
$XALANCROOT/nls/<locale_name>/ directory</td></tr>
</table>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
