xalan-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbert...@apache.org
Subject cvs commit: xml-xalan/c/src/xalanc/PlatformSupport XalanICUMessageLoader.cpp
Date Fri, 05 Dec 2003 18:09:20 GMT
dbertoni    2003/12/05 10:09:20

  Modified:    c        version.incl
               c/Projects/Win32/Res/AllInOne AllInOne.rc
               c/Projects/Win32/VC6/AllInOne AllInOne.dsp
                        AllInOneWithICU.dsp
               c/Projects/Win32/VC6/Utils/Localization tools.ini
               c/Tests/Harness Harness.dsp Harness.rc
               c/samples/SerializeNodeSet SerializeNodeSet.dsp
               c/samples/SimpleXPathAPI SimpleXPathAPI.dsp
               c/samples/SimpleXPathCAPI SimpleXPathCAPI.dsp
               c/samples/TransformToXercesDOM TransformToXercesDOM.dsp
               c/samples/XPathWrapper TestDriver.dsp
               c/src/xalanc/Include XalanVersion.hpp
               c/src/xalanc/PlatformSupport XalanICUMessageLoader.cpp
  Log:
  Updated version number.
  
  Revision  Changes    Path
  1.2       +2 -2      xml-xalan/c/version.incl
  
  Index: version.incl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/version.incl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- version.incl	6 Nov 2003 01:28:34 -0000	1.1
  +++ version.incl	5 Dec 2003 18:09:19 -0000	1.2
  @@ -56,7 +56,7 @@
   ###################################################################
   
   PROJECT_NAME = xalan-c
  -LIB_MAJOR_VER = 16
  +LIB_MAJOR_VER = 17
   LIB_MINOR_VER = 0
  -VER = 1_6_0
  +VER = 1_7_0
   
  
  
  
  1.6       +6 -6      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AllInOne.rc	19 Sep 2003 21:05:19 -0000	1.5
  +++ AllInOne.rc	5 Dec 2003 18:09:19 -0000	1.6
  @@ -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.6.0\0"
  -            VALUE "FileVersion", "1, 6, 0, 0\0"
  -            VALUE "InternalName", "Xalan-C_1_6_0.dll\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 "LegalTrademarks", "\0"
  -            VALUE "OriginalFilename", "Xalan-C_1_6_0.dll\0"
  +            VALUE "OriginalFilename", "Xalan-C_1_7_0.dll\0"
               VALUE "PrivateBuild", "\0"
  -            VALUE "ProductName", "Xalan-C++ Version 1.6.0\0"
  -            VALUE "ProductVersion", "1, 6, 0, 0\0"
  +            VALUE "ProductName", "Xalan-C++ Version 1.7.0\0"
  +            VALUE "ProductVersion", "1, 7, 0, 0\0"
               VALUE "SpecialBuild", "\0"
           END
       END
  
  
  
  1.42      +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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- AllInOne.dsp	4 Dec 2003 06:54:50 -0000	1.41
  +++ AllInOne.dsp	5 Dec 2003 18:09:19 -0000	1.42
  @@ -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_6.lib /nologo /dll /pdb:none /machine:I386
/out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_6_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_7.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"
   
   !ELSEIF  "$(CFG)" == "AllInOne - Win32 Debug"
   
  @@ -82,7 +82,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_6D.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_6_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_7D.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"
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "AllInOne - Win32 Release with symbols"
  @@ -111,7 +111,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_6S.lib /nologo /dll /debug /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1_6_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_7S.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"
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "AllInOne - Win64 Release"
  @@ -139,7 +139,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_6.lib /nologo /dll /pdb:none /machine:IX86
/out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_6_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_7.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
   
   !ELSEIF  "$(CFG)" == "AllInOne - Win64 Debug"
   
  @@ -165,7 +165,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_6D.lib /nologo /dll /debug /machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_6_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_7D.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
   # SUBTRACT LINK32 /pdb:none
   
   !ENDIF 
  
  
  
  1.39      +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.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- AllInOneWithICU.dsp	4 Dec 2003 06:54:50 -0000	1.38
  +++ AllInOneWithICU.dsp	5 Dec 2003 18:09:19 -0000	1.39
  @@ -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_6.lib icuuc.lib icuin.lib /nologo /dll /pdb:none
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release/Xalan-C_1_6_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_7.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"
   
   !ELSEIF  "$(CFG)" == "AllInOneWithICU - Win32 Debug"
   
  @@ -82,7 +82,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_6D.lib icuucd.lib icuind.lib /nologo /dll
/debug /machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Debug/Xalan-C_1_6_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_7D.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"
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "AllInOneWithICU - Win32 Release with symbols"
  @@ -111,7 +111,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_6S.lib icuuc.lib icuin.lib /nologo /dll /debug
/machine:I386 /out:"..\..\..\..\Build\Win32\VC6\Release.symbols/Xalan-C_1_6_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"
  +# ADD LINK32 xerces-c_2.lib XalanMessages_1_7S.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"
   # SUBTRACT LINK32 /pdb:none
   
   !ELSEIF  "$(CFG)" == "AllInOneWithICU - Win64 Release"
  @@ -139,7 +139,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_6.lib icuuc.lib icuin.lib /nologo /dll /pdb:none
/machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Release/Xalan-C_1_6_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_7.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
   
   !ELSEIF  "$(CFG)" == "AllInOneWithICU - Win64 Debug"
   
  @@ -165,7 +165,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_6D.lib icuucd.lib icuind.lib /nologo /dll
/debug /machine:IX86 /out:"..\..\..\..\Build\Win64\VC6\Debug/Xalan-C_1_6_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_7D.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
   # SUBTRACT LINK32 /pdb:none
   
   !ENDIF 
  
  
  
  1.2       +1 -1      xml-xalan/c/Projects/Win32/VC6/Utils/Localization/tools.ini
  
  Index: tools.ini
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/Utils/Localization/tools.ini,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tools.ini	2 Dec 2003 19:58:51 -0000	1.1
  +++ tools.ini	5 Dec 2003 18:09:19 -0000	1.2
  @@ -2,7 +2,7 @@
   CFG=Release
   # can be Win32 or Win64
   BITS=Win32
  -VER=1_6
  +VER=1_7
   LIBNAME=xalanMsg
   PKGNAME = $(LIBNAME)_$(VER)
   # ICU root should be defined by user
  
  
  
  1.23      +15 -7     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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- Harness.dsp	22 Jul 2003 18:42:45 -0000	1.22
  +++ Harness.dsp	5 Dec 2003 18:09:19 -0000	1.23
  @@ -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_6_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_7_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_6_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_7_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_6_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_7_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"
  @@ -128,7 +128,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS"
/D "_USRDLL" /D "HARNESS_EXPORTS" /Yu"stdafx.h" /FD /c
  -# ADD CPP /D "WIN64" /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src\\" /I ".." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HARNESS_EXPORTS"
/FD /c
  +# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src\\"
/I ".." /D "WIN64" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HARNESS_EXPORTS"
/FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  @@ -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:IA64 /out:"..\..\Build\Win64\VC6\Release/Harness_1_6_0.dll"
/implib:"..\..\Build\Win64\VC6\Release/Harness_1.lib" /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
  +# 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
   
   !ELSEIF  "$(CFG)" == "Harness - Win64 Debug"
   
  @@ -154,7 +154,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D
"_MBCS" /D "_USRDLL" /D "HARNESS_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
  -# ADD CPP /D "WIN64" /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /Gf /Gy /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src\\" /I ".." /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HARNESS_EXPORTS"
/Yc /FD /GZ /c
  +# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /Gf /Gy /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src\\" /I ".." /D "WIN64" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL"
/D "HARNESS_EXPORTS" /Yc /FD /GZ /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
   # ADD BASE RSC /l 0x409 /d "_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:IA64 /out:"..\..\Build\Win64\VC6\Debug/Harness_1_6_0D.dll"
/implib:"..\..\Build\Win64\VC6\Debug/Harness_1D.lib" /pdbtype:sept /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
  +# 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
   # SUBTRACT LINK32 /pdb:none
   
   !ENDIF 
  @@ -191,6 +191,10 @@
   
   !ELSEIF  "$(CFG)" == "Harness - Win32 Release with symbols"
   
  +!ELSEIF  "$(CFG)" == "Harness - Win64 Release"
  +
  +!ELSEIF  "$(CFG)" == "Harness - Win64 Debug"
  +
   !ENDIF 
   
   # End Source File
  @@ -209,6 +213,10 @@
   # ADD CPP /YX
   
   !ELSEIF  "$(CFG)" == "Harness - Win32 Release with symbols"
  +
  +!ELSEIF  "$(CFG)" == "Harness - Win64 Release"
  +
  +!ELSEIF  "$(CFG)" == "Harness - Win64 Debug"
   
   !ENDIF 
   
  
  
  
  1.5       +8 -8      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Harness.rc	19 Sep 2003 20:33:03 -0000	1.4
  +++ Harness.rc	5 Dec 2003 18:09:19 -0000	1.5
  @@ -29,8 +29,8 @@
   //
   
   VS_VERSION_INFO VERSIONINFO
  - FILEVERSION 1,6,0,0
  - PRODUCTVERSION 1,6,0,0
  + FILEVERSION 1,7,0,0
  + PRODUCTVERSION 1,7,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.6.0\0"
  -            VALUE "FileVersion", "1, 6, 0, 0\0"
  -            VALUE "InternalName", "Harness_1_6_0.dll\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 "LegalCopyright", "Copyright  Apache Software Foundation 1999-2003.
Subject to licensing terms\0"
               VALUE "LegalTrademarks", "\0"
  -            VALUE "OriginalFilename", "Harness_1_6_0.dll\0"
  +            VALUE "OriginalFilename", "Harness_1_7_0.dll\0"
               VALUE "PrivateBuild", "\0"
  -            VALUE "ProductName", "Xalan-C++ Version 1.6.0\0"
  -            VALUE "ProductVersion", "1, 6, 0, 0\0"
  +            VALUE "ProductName", "Xalan-C++ Version 1.7.0\0"
  +            VALUE "ProductVersion", "1, 7, 0, 0\0"
               VALUE "SpecialBuild", "\0"
           END
       END
  
  
  
  1.4       +6 -5      xml-xalan/c/samples/SerializeNodeSet/SerializeNodeSet.dsp
  
  Index: SerializeNodeSet.dsp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/samples/SerializeNodeSet/SerializeNodeSet.dsp,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SerializeNodeSet.dsp	17 Jul 2003 18:02:50 -0000	1.3
  +++ SerializeNodeSet.dsp	5 Dec 2003 18:09:19 -0000	1.4
  @@ -77,7 +77,8 @@
   # 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:I386 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
  +# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
  +# SUBTRACT LINK32 /map
   
   !ELSEIF  "$(CFG)" == "SerializeNodeSet - Win64 Release"
   
  @@ -93,7 +94,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX
/FD /c
  -# ADD CPP /D "WIN64" /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src"
/D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -102,7 +103,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 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 /subsystem:console /machine:I386
  -# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
  +# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/machine:IA64
   
   !ELSEIF  "$(CFG)" == "SerializeNodeSet - Win64 Debug"
   
  @@ -118,7 +119,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /GZ /c
  -# ADD CPP /D "WIN64" /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src"
/D "WIN64" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -126,7 +127,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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:IA64 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
  +# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:IX86 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /machine:IA64
   
   !ENDIF 
   
  
  
  
  1.5       +6 -5      xml-xalan/c/samples/SimpleXPathAPI/SimpleXPathAPI.dsp
  
  Index: SimpleXPathAPI.dsp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/samples/SimpleXPathAPI/SimpleXPathAPI.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleXPathAPI.dsp	17 Jul 2003 18:02:50 -0000	1.4
  +++ SimpleXPathAPI.dsp	5 Dec 2003 18:09:19 -0000	1.5
  @@ -77,7 +77,8 @@
   # 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:I386 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
  +# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
  +# SUBTRACT LINK32 /map
   
   !ELSEIF  "$(CFG)" == "SimpleXPathAPI - Win64 Release"
   
  @@ -93,7 +94,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX
/FD /c
  -# ADD CPP /D "WIN64" /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src"
/D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -102,7 +103,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 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 /subsystem:console /machine:I386
  -# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
  +# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/machine:IA64
   
   !ELSEIF  "$(CFG)" == "SimpleXPathAPI - Win64 Debug"
   
  @@ -118,7 +119,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /GZ /c
  -# ADD CPP /D "WIN64" /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src"
/D "WIN64" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -126,7 +127,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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:IA64 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
  +# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:IX86 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /machine:IA64
   
   !ENDIF 
   
  
  
  
  1.5       +6 -5      xml-xalan/c/samples/SimpleXPathCAPI/SimpleXPathCAPI.dsp
  
  Index: SimpleXPathCAPI.dsp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/samples/SimpleXPathCAPI/SimpleXPathCAPI.dsp,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SimpleXPathCAPI.dsp	17 Jul 2003 18:02:50 -0000	1.4
  +++ SimpleXPathCAPI.dsp	5 Dec 2003 18:09:19 -0000	1.5
  @@ -77,7 +77,8 @@
   # 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:I386 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
  +# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
  +# SUBTRACT LINK32 /map
   
   !ELSEIF  "$(CFG)" == "SimpleXPathCAPI - Win64 Release"
   
  @@ -93,7 +94,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX
/FD /c
  -# ADD CPP /D "WIN64" /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src"
/D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -102,7 +103,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 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 /subsystem:console /machine:I386
  -# ADD LINK32 /nologo /subsystem:console /machine:IA64
  +# ADD LINK32 /nologo /subsystem:console /machine:IX86 /machine:IA64
   
   !ELSEIF  "$(CFG)" == "SimpleXPathCAPI - Win64 Debug"
   
  @@ -118,7 +119,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /GZ /c
  -# ADD CPP /D "WIN64" /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src"
/D "WIN64" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -126,7 +127,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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:IA64 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
  +# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:IX86 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /machine:IA64
   
   !ENDIF 
   
  
  
  
  1.3       +6 -5      xml-xalan/c/samples/TransformToXercesDOM/TransformToXercesDOM.dsp
  
  Index: TransformToXercesDOM.dsp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/samples/TransformToXercesDOM/TransformToXercesDOM.dsp,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TransformToXercesDOM.dsp	17 Jul 2003 18:02:50 -0000	1.2
  +++ TransformToXercesDOM.dsp	5 Dec 2003 18:09:20 -0000	1.3
  @@ -77,7 +77,8 @@
   # 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:I386 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
  +# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
  +# SUBTRACT LINK32 /map
   
   !ELSEIF  "$(CFG)" == "TransformToXercesDOM - Win64 Release"
   
  @@ -93,7 +94,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX
/FD /c
  -# ADD CPP /D "WIN64" /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src"
/D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -102,7 +103,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 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 /subsystem:console /machine:I386
  -# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
  +# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/machine:IA64
   
   !ELSEIF  "$(CFG)" == "TransformToXercesDOM - Win64 Debug"
   
  @@ -118,7 +119,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /GZ /c
  -# ADD CPP /D "WIN64" /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src"
/D "WIN64" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -126,7 +127,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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:IA64 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
  +# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:IX86 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /machine:IA64
   
   !ENDIF 
   
  
  
  
  1.11      +6 -5      xml-xalan/c/samples/XPathWrapper/TestDriver.dsp
  
  Index: TestDriver.dsp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/samples/XPathWrapper/TestDriver.dsp,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- TestDriver.dsp	17 Jul 2003 18:02:50 -0000	1.10
  +++ TestDriver.dsp	5 Dec 2003 18:09:20 -0000	1.11
  @@ -77,7 +77,8 @@
   # 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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:I386 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
  +# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win32\VC6\Debug"
  +# SUBTRACT LINK32 /map
   
   !ELSEIF  "$(CFG)" == "TestDriver - Win64 Release"
   
  @@ -93,7 +94,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX
/FD /c
  -# ADD CPP /D "WIN64" /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
  +# ADD CPP /nologo /MD /W4 /GR /GX /O2 /Ob2 /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src"
/D "WIN64" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c
   # SUBTRACT CPP /YX
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
   # ADD RSC /l 0x409 /d "NDEBUG"
  @@ -102,7 +103,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 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 /subsystem:console /machine:I386
  -# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IA64 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
  +# ADD LINK32 xerces-c_2.lib /nologo /subsystem:console /machine:IX86 /libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Release"
/machine:IA64
   
   !ELSEIF  "$(CFG)" == "TestDriver - Win64 Debug"
   
  @@ -118,7 +119,7 @@
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
   # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS"
/YX /FD /GZ /c
  -# ADD CPP /D "WIN64" /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src"
/I "..\..\src" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
  +# ADD CPP /nologo /MDd /W4 /Gm /GR /GX /Zi /Od /I "..\..\..\..\xml-xerces\c\src" /I "..\..\src"
/D "WIN64" /D "_CONSOLE" /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
   # ADD RSC /l 0x409 /d "_DEBUG"
   BSC32=bscmake.exe
  @@ -126,7 +127,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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
  -# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:IA64 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug"
  +# ADD LINK32 xerces-c_2D.lib /nologo /subsystem:console /map /debug /machine:IX86 /pdbtype:sept
/libpath:"..\..\..\..\xml-xerces\c\Build\Win64\VC6\Debug" /machine:IA64
   
   !ENDIF 
   
  
  
  
  1.4       +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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- XalanVersion.hpp	19 Sep 2003 21:05:21 -0000	1.3
  +++ XalanVersion.hpp	5 Dec 2003 18:09:20 -0000	1.4
  @@ -157,7 +157,7 @@
    */
   
   #define XALAN_VERSION_MAJOR 1
  -#define XALAN_VERSION_MINOR 6
  +#define XALAN_VERSION_MINOR 7
   #define XALAN_VERSION_REVISION 0
   
   
  
  
  
  1.3       +3 -3      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- XalanICUMessageLoader.cpp	3 Dec 2003 05:28:41 -0000	1.2
  +++ XalanICUMessageLoader.cpp	5 Dec 2003 18:09:20 -0000	1.3
  @@ -74,8 +74,8 @@
   #include <xercesc/util/XMLString.hpp>
   
   #ifdef WIN32
  -extern "C" const char U_IMPORT  xalanMsg_1_6_dat []; 
  -static const char* const	sPackageName="xalanMsg_1_6";
  +extern "C" const char U_IMPORT  xalanMsg_1_7_dat []; 
  +static const char* const	sPackageName="xalanMsg_1_7";
   #else
   extern "C" const char U_IMPORT  xalanMsg_dat [];
   static const char* const	sPackageName="xalanMsg";
  @@ -116,7 +116,7 @@
    	UErrorCode err = U_ZERO_ERROR;
   
   #ifdef WIN32
  -	udata_setAppData(sPackageName, &xalanMsg_1_6_dat, &err);
  +	udata_setAppData(sPackageName, &xalanMsg_1_7_dat, &err);
   #else
   	udata_setAppData(sPackageName, &xalanMsg_dat, &err);
   #endif
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org


Mime
View raw message