You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dm...@apache.org on 2004/04/25 02:48:50 UTC
cvs commit: xml-xalan/c/src/xalanc/PlatformSupport XalanICUMessageLoader.cpp
dmitryh 2004/04/24 17:48:50
Modified: c version.incl
c/Projects/Win32 tools.ini
c/Projects/Win32/VC6/AllInOne AllInOne.dsp
AllInOneWithICU.dsp
c/Projects/Win32/VC6/Utils/Localization BuildMessages.mak
c/Projects/Win32/VC7/AllInOne AllInOne.vcproj
AllInOneWithICU.vcproj
c/Projects/Win32/VC7/Utils/Localization BuildMessages.mak
c/Tests/Harness Harness.dsp Harness.vcproj
c/src/xalanc/Include XalanVersion.hpp
c/src/xalanc/PlatformSupport XalanICUMessageLoader.cpp
Log:
Change Win32 VC6/VC7 Lib/dll names from Xalan-C_1_8_0 to Xalan-C_1_8
Revision Changes Path
1.7 +1 -0 xml-xalan/c/version.incl
Index: version.incl
===================================================================
RCS file: /home/cvs/xml-xalan/c/version.incl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- version.incl 4 Apr 2004 18:30:02 -0000 1.6
+++ version.incl 25 Apr 2004 00:48:50 -0000 1.7
@@ -20,4 +20,5 @@
LIB_MAJOR_DOT_VER = 1.8
LIB_MINOR_VER = 0
VER = 1_8_0
+MS_VER = 1_8
1.3 +2 -2 xml-xalan/c/Projects/Win32/tools.ini
Index: tools.ini
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/tools.ini,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tools.ini 15 Apr 2004 21:32:09 -0000 1.2
+++ tools.ini 25 Apr 2004 00:48:50 -0000 1.3
@@ -33,8 +33,8 @@
INSTALL_MODE=Both
-XSLT_DLL_NAME=$(PROJECT_NAME)_$(VER)
-MSGLIB_DLL_NAME=$(MSGLIB_PREFIX)_$(VER)
+XSLT_DLL_NAME=$(PROJECT_NAME)_$(MS_VER)
+MSGLIB_DLL_NAME=$(MSGLIB_PREFIX)_$(MS_VER)
PACKAGE_NAME=$(XSLT_DLL_NAME)-windows_$(WINOS)_$(COMPILER_VER)
1.53 +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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- AllInOne.dsp 21 Apr 2004 19:30:01 -0000 1.52
+++ AllInOne.dsp 25 Apr 2004 00:48:50 -0000 1.53
@@ -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_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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_8.dll" /implib:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1.lib" /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"..\..\..\..\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!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_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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8D.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_8D.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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
# 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_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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8S.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1_8S.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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
# 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_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" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8.lib /nologo /dll /pdb:none /machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_8.dll" /implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib" /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"..\..\..\..\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /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_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" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8D.lib /nologo /dll /debug /machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_8D.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" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.50 +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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- AllInOneWithICU.dsp 21 Apr 2004 19:30:01 -0000 1.49
+++ AllInOneWithICU.dsp 25 Apr 2004 00:48:50 -0000 1.50
@@ -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_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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8.lib icuuc.lib icuin.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_8.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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
!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_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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
+# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8D.lib icuucd.lib icuind.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_8D.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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
# 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_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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8S.lib icuuc.lib icuin.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1_8S.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" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib"
# 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_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" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_2.lib XalanMessages_1_8.lib icuuc.lib icuin.lib /nologo /dll /pdb:none /machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_8.dll" /implib:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1.lib" /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"..\..\..\..\..\..\icu\lib" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\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_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" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_2D.lib XalanMessages_1_8D.lib icuucd.lib icuind.lib /nologo /dll /debug /machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_8D.dll" /implib:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"..\..\..\..\..\..\icu\lib" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /libpath:"$(ICUROOT)\lib" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.4 +3 -3 xml-xalan/c/Projects/Win32/VC6/Utils/Localization/BuildMessages.mak
Index: BuildMessages.mak
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/Utils/Localization/BuildMessages.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BuildMessages.mak 21 Apr 2004 19:30:02 -0000 1.3
+++ BuildMessages.mak 25 Apr 2004 00:48:50 -0000 1.4
@@ -68,11 +68,11 @@
MOVE=move
!IF "$(CFG)" == "Debug"
-PKGNAME=$(LIBNAME)_$(VER)D
+PKGNAME=$(LIBNAME)_$(MS_VER)D
!ELSEIF "$(CFG)" == "Release.symbols"
-PKGNAME=$(LIBNAME)_$(VER)S
+PKGNAME=$(LIBNAME)_$(MS_VER)S
!ELSE
-PKGNAME=$(LIBNAME)_$(VER)
+PKGNAME=$(LIBNAME)_$(MS_VER)
!ENDIF
XERCESPATH=$(XERCESCROOT)/bin;$(XERCESCROOT)\Build\Win32\VC6\Release;$(XERCESCROOT)\Build\Win32\VC6\Debug;$(XERCESCROOT)\Build\Win64\VC6\Release;$(XERCESCROOT)\Build\Win64\VC6\Debug
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AllInOne.vcproj 22 Apr 2004 23:38:23 -0000 1.6
+++ AllInOne.vcproj 25 Apr 2004 00:48:50 -0000 1.7
@@ -50,13 +50,13 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- AdditionalDependencies="xerces-c_2.lib XalanMessages_1_8_0S.lib"
- OutputFile="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8_0S.dll"
+ AdditionalDependencies="xerces-c_2.lib XalanMessages_1_8S.lib"
+ OutputFile="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8S.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC7\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC7\Release,..\..\..\..\Build\Win32\VC7\Release.symbols"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8_0S.pdb"
+ ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8S.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_8_0.lib"
- OutputFile="..\..\..\..\Build\Win32\VC7\Release/Xalan-C_1_8_0.dll"
+ AdditionalDependencies="xerces-c_2.lib XalanMessages_1_8.lib"
+ OutputFile="..\..\..\..\Build\Win32\VC7\Release/Xalan-C_1_8.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC7\Release;$(XERCESCROOT)\lib..\..\..\..\..\..\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_8_0D.lib"
- OutputFile="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8_0D.dll"
+ AdditionalDependencies="xerces-c_2D.lib XalanMessages_1_8D.lib"
+ OutputFile="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8D.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(XERCESCROOT)\Build\Win32\VC7\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC7\Debug,..\..\..\..\Build\Win32\VC7\Debug"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8_0D.pdb"
+ ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8D.pdb"
ImportLibrary="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1D.lib"/>
<Tool
Name="VCMIDLTool"
1.6 +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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AllInOneWithICU.vcproj 22 Apr 2004 23:38:23 -0000 1.5
+++ AllInOneWithICU.vcproj 25 Apr 2004 00:48:50 -0000 1.6
@@ -41,8 +41,8 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
- 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"
+ AdditionalDependencies="xerces-c_2.lib XalanMessages_1_8.lib icuuc.lib icuin.lib"
+ OutputFile="..\..\..\..\Build\Win32\VC7\Release/Xalan-C_1_8.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(ICUROOT)\lib;$(XERCESCROOT)\Build\Win32\VC7\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\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_8_0D.lib icuucd.lib icuind.lib"
- OutputFile="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8_0D.dll"
+ AdditionalDependencies="xerces-c_2D.lib XalanMessages_1_8D.lib icuucd.lib icuind.lib"
+ OutputFile="..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8D.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(ICUROOT)\lib;$(XERCESCROOT)\Build\Win32\VC7\Debug;$(XERCESCROOT)\lib;..\..\..\..\..\..\xml-xerces\c\Build\Win32\VC7\Debug,..\..\..\..\..\..\icu\lib,..\..\..\..\Build\Win32\VC7\Debug"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8_0D.pdb"
+ ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Debug/Xalan-C_1_8D.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_8_0S.lib icuuc.lib icuin.lib"
- OutputFile="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8_0S.dll"
+ AdditionalDependencies="xerces-c_2.lib XalanMessages_1_8S.lib icuuc.lib icuin.lib"
+ OutputFile="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8S.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="$(ICUROOT)\lib;$(XERCESCROOT)\Build\Win32\VC7\Release;$(XERCESCROOT)\lib;..\..\..\..\..\..\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_8_0S.pdb"
+ ProgramDatabaseFile=".\..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1_8S.pdb"
ImportLibrary="..\..\..\..\Build\Win32\VC7\Release.symbols/Xalan-C_1S.lib"/>
<Tool
Name="VCMIDLTool"
1.4 +3 -3 xml-xalan/c/Projects/Win32/VC7/Utils/Localization/BuildMessages.mak
Index: BuildMessages.mak
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC7/Utils/Localization/BuildMessages.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BuildMessages.mak 22 Apr 2004 23:38:24 -0000 1.3
+++ BuildMessages.mak 25 Apr 2004 00:48:50 -0000 1.4
@@ -68,11 +68,11 @@
MOVE=move
!IF "$(CFG)" == "Debug"
-PKGNAME=$(LIBNAME)_$(VER)D
+PKGNAME=$(LIBNAME)_$(MS_VER)D
!ELSEIF "$(CFG)" == "Release.symbols"
-PKGNAME=$(LIBNAME)_$(VER)S
+PKGNAME=$(LIBNAME)_$(MS_VER)S
!ELSE
-PKGNAME=$(LIBNAME)_$(VER)
+PKGNAME=$(LIBNAME)_$(MS_VER)
!ENDIF
XERCESPATH=$(XERCESCROOT)/bin;$(XERCESCROOT)\Build\Win32\VC7\Release;$(XERCESCROOT)\Build\Win32\VC7\Debug;$(XERCESCROOT)\Build\Win64\VC7\Release;$(XERCESCROOT)\Build\Win64\VC7\Debug
1.26 +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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Harness.dsp 21 Apr 2004 19:30:03 -0000 1.25
+++ Harness.dsp 25 Apr 2004 00:48:50 -0000 1.26
@@ -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_8_0.dll" /implib:"..\..\Build\Win32\VC6\Release/Harness_1.lib" /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_2.lib /nologo /dll /pdb:none /machine:I386 /out:"..\..\Build\Win32\VC6\Release/Harness_1_8.dll" /implib:"..\..\Build\Win32\VC6\Release/Harness_1.lib" /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
!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_8_0D.dll" /implib:"..\..\Build\Win32\VC6\Debug/Harness_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_2D.lib /nologo /dll /debug /machine:I386 /out:"..\..\Build\Win32\VC6\Debug/Harness_1_8D.dll" /implib:"..\..\Build\Win32\VC6\Debug/Harness_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Debug" /libpath:"$(XERCESCROOT)\lib"
# 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_8_0S.dll" /implib:"..\..\Build\Win32\VC6\Release.symbols/Harness_1S.lib" /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
+# ADD LINK32 xerces-c_2.lib /nologo /dll /debug /machine:I386 /out:"..\..\Build\Win32\VC6\Release.symbols/Harness_1_8S.dll" /implib:"..\..\Build\Win32\VC6\Release.symbols/Harness_1S.lib" /libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win32\VC6\Release" /libpath:"$(XERCESCROOT)\lib"
# 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_8_0.dll" /implib:"..\..\Build\Win64\VC6\Release/Harness_1.lib" /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_2.lib /nologo /dll /pdb:none /machine:IX86 /out:"..\..\Build\Win64\VC6\Release/Harness_1_8.dll" /implib:"..\..\Build\Win64\VC6\Release/Harness_1.lib" /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Release" /libpath:"$(XERCESCROOT)\lib" /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_8_0D.dll" /implib:"..\..\Build\Win64\VC6\Debug/Harness_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
+# ADD LINK32 xerces-c_2D.lib /nologo /dll /debug /machine:IX86 /out:"..\..\Build\Win64\VC6\Debug/Harness_1_8D.dll" /implib:"..\..\Build\Win64\VC6\Debug/Harness_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\Build\Win64\VC6\Debug" /libpath:"$(XERCESCROOT)\lib" /machine:IA64
# SUBTRACT LINK32 /pdb:none
!ENDIF
1.4 +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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Harness.vcproj 22 Apr 2004 23:38:24 -0000 1.3
+++ Harness.vcproj 25 Apr 2004 00:48:50 -0000 1.4
@@ -44,12 +44,12 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="xerces-c_2D.lib"
- OutputFile="..\..\Build\Win32\VC7\Debug/Harness_1_8_0D.dll"
+ OutputFile="..\..\Build\Win32\VC7\Debug/Harness_1_8D.dll"
LinkIncremental="2"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7\Debug;$(XERCESCROOT)\Build\Win32\VC7\Debug;$(XERCESCROOT)\lib"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\..\Build\Win32\VC7\Debug/Harness_1_8_0D.pdb"
+ ProgramDatabaseFile=".\..\..\Build\Win32\VC7\Debug/Harness_1_8D.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_8_0.dll"
+ OutputFile="..\..\Build\Win32\VC7\Release/Harness_1_8.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7\Release;$(XERCESCROOT)\Build\Win32\VC7\Release;$(XERCESCROOT)\lib"
@@ -161,12 +161,12 @@
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="xerces-c_2.lib"
- OutputFile="..\..\Build\Win32\VC7\Release.symbols/Harness_1_8_0S.dll"
+ OutputFile="..\..\Build\Win32\VC7\Release.symbols/Harness_1_8S.dll"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\..\xml-xerces\c\Build\Win32\VC7\Release;$(XERCESCROOT)\Build\Win32\VC7\Release;$(XERCESCROOT)\lib"
GenerateDebugInformation="TRUE"
- ProgramDatabaseFile=".\..\..\Build\Win32\VC7\Release.symbols/Harness_1_8_0S.pdb"
+ ProgramDatabaseFile=".\..\..\Build\Win32\VC7\Release.symbols/Harness_1_8S.pdb"
ImportLibrary="..\..\Build\Win32\VC7\Release.symbols/Harness_1S.lib"/>
<Tool
Name="VCMIDLTool"
1.9 +2 -0 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanVersion.hpp 4 Apr 2004 18:30:03 -0000 1.8
+++ XalanVersion.hpp 25 Apr 2004 00:48:50 -0000 1.9
@@ -138,12 +138,14 @@
#define CAT2_SEP_PERIOD(a, b) #a "." #b
#define CAT2_SEP_NIL(a, b) #a #b
#define CAT2_RAW_NUMERIC(a, b) a ## b
+#define CAT2_RAW_NUMERIC_SEP_UNDERSCORE(a, b) a ## _ ## b
// two argument macro invokers
#define INVK_CAT2_SEP_UNDERSCORE(a,b) CAT2_SEP_UNDERSCORE(a,b)
#define INVK_CAT2_SEP_PERIOD(a,b) CAT2_SEP_PERIOD(a,b)
#define INVK_CAT2_STR_SEP_NIL(a,b) CAT2_SEP_NIL(a,b)
#define INVK_CAT2_RAW_NUMERIC(a,b) CAT2_RAW_NUMERIC(a,b)
+#define INVK_CAT2_RAW_NUMERIC_SEP_UNDERSCORE(a,b) CAT2_RAW_NUMERIC_SEP_UNDERSCORE(a,b)
// ---------------------------------------------------------------------------
// T H R E E A R G U M E N T C O N C A T E N A T I O N M A C R O S
1.9 +7 -12 xml-xalan/c/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp
Index: XalanICUMessageLoader.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/PlatformSupport/XalanICUMessageLoader.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XalanICUMessageLoader.cpp 26 Feb 2004 22:34:18 -0000 1.8
+++ XalanICUMessageLoader.cpp 25 Apr 2004 00:48:50 -0000 1.9
@@ -18,23 +18,18 @@
// Class header file.
-#include "XalanICUMessageLoader.hpp"
-
-#include "PlatformSupportInit.hpp"
+#include "xalanc/Include/XalanVersion.hpp"
-#include "DOMStringHelper.hpp"
+#include <xalanc/PlatformSupport/XalanICUMessageLoader.hpp>
+#include <xalanc/PlatformSupport/PlatformSupportInit.hpp>
+#include <xalanc/PlatformSupport/DOMStringHelper.hpp>
#include "unicode/uloc.h"
-
#include "unicode/udata.h"
-#include <xercesc/util/XMLMsgLoader.hpp> //
-
+#include <xercesc/util/XMLMsgLoader.hpp>
#include <xercesc/util/XMLString.hpp>
-#include "xalanc/Include/XalanVersion.hpp"
-
-
#define XALAN_MESSAGES_NAME XalanMessages_
#define MAKE_STRING(a) #a
@@ -61,11 +56,11 @@
#define ICUDLL_ENTRYPOINT_NAME INVK_CAT3_RAW_NUMERIC(XALAN_MESSAGES_NAME,\
- INVK_CAT3_RAW_NUMERIC_SEP_UNDERSCORE(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR,XALAN_VERSION_REVISION),\
+ INVK_CAT2_RAW_NUMERIC_SEP_UNDERSCORE(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR),\
ENTRY_POINT_SUFFIX)
#define PACKAGE_NAME INVK_CAT3_RAW_NUMERIC(XALAN_MESSAGES_NAME,\
- INVK_CAT3_RAW_NUMERIC_SEP_UNDERSCORE(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR,XALAN_VERSION_REVISION),\
+ INVK_CAT2_RAW_NUMERIC_SEP_UNDERSCORE(XALAN_VERSION_MAJOR,XALAN_VERSION_MINOR),\
PACKAGE_NAME_SUFFIX)
extern "C" const char U_IMPORT ICUDLL_ENTRYPOINT_NAME [];
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org