You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by am...@apache.org on 2005/06/08 23:49:10 UTC
svn commit: r189647 [3/3] - in /xerces/c/branches/jberry/3.0-unstable: ./
Projects/Win32/VC6/xerces-all/CreateDOMDocument/
Projects/Win32/VC6/xerces-all/DOMCount/
Projects/Win32/VC6/xerces-all/DOMMemTest/
Projects/Win32/VC6/xerces-all/DOMNormalizerTest/
Projects/Win32/VC6/xerces-all/DOMPrint/
Projects/Win32/VC6/xerces-all/DOMTest/
Projects/Win32/VC6/xerces-all/DOMTraversalTest/
Projects/Win32/VC6/xerces-all/DOMTypeInfoTest/
Projects/Win32/VC6/xerces-all/DeprecatedDOMCount/
Projects/Win32/VC6/xerces-all/EncodingTest/
Projects/Win32/VC6/xerces-all/EnumVal/
Projects/Win32/VC6/xerces-all/InitTermTest/
Projects/Win32/VC6/xerces-all/MemHandlerTest/
Projects/Win32/VC6/xerces-all/MemParse/ Projects/Win32/VC6/xerces-all/PParse/
Projects/Win32/VC6/xerces-all/PSVIWriter/
Projects/Win32/VC6/xerces-all/RangeTest/
Projects/Win32/VC6/xerces-all/Redirect/
Projects/Win32/VC6/xerces-all/SAX2Count/
Projects/Win32/VC6/xerces-all/SAX2Print/
Projects/Win32/VC6/xerces-all/SAXCount/
Projects/Win32/VC6/xerces-all/SAXPrint/
Projects/Win32/VC6/xerces-all/SCMPrint/
Projects/Win32/VC6/xerces-all/SEnumVal/
Projects/Win32/VC6/xerces-all/StdInParse/
Projects/Win32/VC6/xerces-all/ThreadTest/
Projects/Win32/VC6/xerces-all/XSValueTest/
Projects/Win32/VC6/xerces-all/XSerializerTest/
Projects/Win32/VC6/xerces-all/XercesLib/
Projects/Win32/VC6/xerces-all/xerces-com/ samples/src/CreateDOMDocument/
src/ src/xercesc/util/ src/xercesc/util/MsgLoaders/Win32/
src/xercesc/util/Transcoders/Win32/
Modified: xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/StdInParse/StdInParse.dsp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/StdInParse/StdInParse.dsp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/StdInParse/StdInParse.dsp (original)
+++ xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/StdInParse/StdInParse.dsp Wed Jun 8 14:49:07 2005
@@ -43,17 +43,15 @@
# PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\VC6\Release\obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# ADD BASE CPP /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
-# ADD BASE BSC32
-# ADD BSC32
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 /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+# 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 /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
!ELSEIF "$(CFG)" == "StdInParse - Win32 Debug"
@@ -68,17 +66,15 @@
# PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\VC6\Debug\obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD BASE CPP /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /G6 /MDd /Ze /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
-# ADD BASE BSC32
-# ADD BSC32
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 /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
!ELSEIF "$(CFG)" == "StdInParse - Win64 Debug"
@@ -94,18 +90,16 @@
# PROP Intermediate_Dir "..\..\..\..\..\Build\Win64\VC6\Debug\obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD BASE CPP /G6 /MDd /Za /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD CPP /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
-# ADD BASE BSC32
-# ADD BSC32
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /debug /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /debug /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
-# SUBTRACT LINK32 /pdb:none
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /version:3.0 /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "StdInParse - Win64 Release"
@@ -121,18 +115,16 @@
# PROP Intermediate_Dir "..\..\..\..\..\Build\Win64\VC6\Release\obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# ADD BASE CPP /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# ADD CPP /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
-# ADD BASE BSC32
-# ADD BSC32
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-# SUBTRACT LINK32 /pdb:none
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /machine:IX86 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /version:1.0 /subsystem:console /incremental:yes /machine:IX86 /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -147,11 +139,11 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\..\..\samples\StdInParse\StdInParse.cpp
+SOURCE=..\..\..\..\..\samples\src\StdInParse\StdInParse.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\samples\StdInParse\StdInParseHandlers.cpp
+SOURCE=..\..\..\..\..\samples\src\StdInParse\StdInParseHandlers.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -159,11 +151,11 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\..\..\..\samples\StdInParse\StdInParse.Hpp
+SOURCE=..\..\..\..\..\samples\src\StdInParse\StdInParse.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\samples\StdInParse\StdInParseHandlers.hpp
+SOURCE=..\..\..\..\..\samples\src\StdInParse\StdInParseHandlers.hpp
# End Source File
# End Group
# Begin Group "Resource Files"
Modified: xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/ThreadTest/ThreadTest.dsp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/ThreadTest/ThreadTest.dsp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/ThreadTest/ThreadTest.dsp (original)
+++ xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/ThreadTest/ThreadTest.dsp Wed Jun 8 14:49:07 2005
@@ -43,17 +43,15 @@
# PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\VC6\Release\obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# ADD BASE CPP /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
+# ADD CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
-# ADD BASE BSC32
-# ADD BSC32
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 /subsystem:console /machine:I386
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+# 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 /subsystem:console /machine:I386
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
!ELSEIF "$(CFG)" == "ThreadTest - Win32 Debug"
@@ -68,17 +66,15 @@
# PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\VC6\Debug\obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD BASE CPP /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
+# ADD CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
-# ADD BASE BSC32
-# ADD BSC32
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 /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# 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 /subsystem:console /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
# SUBTRACT LINK32 /incremental:no
!ELSEIF "$(CFG)" == "ThreadTest - Win64 Debug"
@@ -95,19 +91,17 @@
# PROP Intermediate_Dir "..\..\..\..\..\Build\Win64\VC6\Debug\obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD BASE CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD CPP /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
-# ADD BASE BSC32
-# ADD BSC32
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /debug /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
# SUBTRACT BASE LINK32 /incremental:no
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /debug /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
-# SUBTRACT LINK32 /pdb:none
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2D.lib /subsystem:console /debug /machine:IX86 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win64\VC6\Debug" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
!ELSEIF "$(CFG)" == "ThreadTest - Win64 Release"
@@ -123,18 +117,16 @@
# PROP Intermediate_Dir "..\..\..\..\..\Build\Win64\VC6\Release\obj"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
-# ADD BASE CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# ADD BASE CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# ADD CPP /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
-# ADD BASE BSC32
-# ADD BSC32
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
-# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
-# SUBTRACT LINK32 /pdb:none
+# ADD BASE LINK32 kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /machine:IX86 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+# ADD LINK32 kernel32.lib user32.lib xerces-c_2.lib /subsystem:console /incremental:yes /machine:IX86 /libpath:"..\..\..\..\..\Build\Win64\VC6\Release" /machine:IA64
+# SUBTRACT LINK32 /pdb:none
!ENDIF
@@ -149,7 +141,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\..\..\tests\ThreadTest\ThreadTest.cpp
+SOURCE=..\..\..\..\..\tests\src\ThreadTest\ThreadTest.cpp
# End Source File
# End Group
# Begin Group "Header Files"
Modified: xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XSValueTest/XSValueTest.dsp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XSValueTest/XSValueTest.dsp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XSValueTest/XSValueTest.dsp (original)
+++ xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XSValueTest/XSValueTest.dsp Wed Jun 8 14:49:07 2005
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# ADD CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /GZ /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -93,7 +93,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD CPP /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -119,7 +119,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# ADD CPP /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -141,7 +141,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\..\..\tests\XSValueTest\XSValueTest.cpp
+SOURCE=..\..\..\..\..\tests\src\XSValueTest\XSValueTest.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -149,7 +149,7 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\..\..\..\tests\XSValueTest\XSValueTest.hpp
+SOURCE=..\..\..\..\..\tests\src\XSValueTest\XSValueTest.hpp
# End Source File
# End Group
# Begin Group "Resource Files"
Modified: xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XSerializerTest/XSerializerTest.dsp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XSerializerTest/XSerializerTest.dsp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XSerializerTest/XSerializerTest.dsp (original)
+++ xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XSerializerTest/XSerializerTest.dsp Wed Jun 8 14:49:07 2005
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# ADD CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -67,7 +67,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /GZ /c
# SUBTRACT CPP /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -93,7 +93,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /G6 /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /GZ /c
+# ADD CPP /MDd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -119,7 +119,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
# SUBTRACT BASE CPP /YX
-# ADD CPP /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "WIN32" /D "_WINDOWS" /D "PLATFORM_WIN32" /FD /c
+# ADD CPP /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CONSOLE" /D "PLATFORM_WIN32" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -141,11 +141,11 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
# Begin Source File
-SOURCE=..\..\..\..\..\tests\XSerializerTest\XSerializerHandlers.cpp
+SOURCE=..\..\..\..\..\tests\src\XSerializerTest\XSerializerHandlers.cpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\tests\XSerializerTest\XSerializerTest.cpp
+SOURCE=..\..\..\..\..\tests\src\XSerializerTest\XSerializerTest.cpp
# End Source File
# End Group
# Begin Group "Header Files"
@@ -153,11 +153,11 @@
# PROP Default_Filter "h;hpp;hxx;hm;inl"
# Begin Source File
-SOURCE=..\..\..\..\..\tests\XSerializerTest\XSerializerHandlers.hpp
+SOURCE=..\..\..\..\..\tests\src\XSerializerTest\XSerializerHandlers.hpp
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\tests\XSerializerTest\XSerializerTest.hpp
+SOURCE=..\..\..\..\..\tests\src\XSerializerTest\XSerializerTest.hpp
# End Source File
# End Group
# Begin Group "Resource Files"
Modified: xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.dsp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.dsp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.dsp (original)
+++ xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XercesLib/XercesDeprecatedDOMLib.dsp Wed Jun 8 14:49:07 2005
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_DEPRECATED_DOM" /FD /c
+# ADD CPP /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "_CRTDBG_MAP_ALLOC" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /D "XERCES_BUILDING_DEPRECATED_LIBRARY" /FD /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_DEPRECATED_DOM" /FD /c
+# ADD CPP /G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "_CRTDBG_MAP_ALLOC" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /D "XERCES_BUILDING_DEPRECATED_LIBRARY" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -99,7 +99,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c
# SUBTRACT BASE CPP /Fr /YX
-# ADD CPP /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_DEPRECATED_DOM" /FD /c
+# ADD CPP /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "_CRTDBG_MAP_ALLOC" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /D "XERCES_BUILDING_DEPRECATED_LIBRARY" /FD /c
# ADD BASE MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -126,7 +126,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /G6 /MD /Za /W3 /GX /O2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c
-# ADD CPP /MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_DEPRECATED_DOM" /FD /c
+# ADD CPP /MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "_CRTDBG_MAP_ALLOC" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /D "XERCES_BUILDING_DEPRECATED_LIBRARY" /FD /c
# ADD BASE MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
Modified: xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp (original)
+++ xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp Wed Jun 8 14:49:07 2005
@@ -45,7 +45,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c
+# ADD CPP /G6 /MD /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "XERCES_NO_CONFIGURE_SUPPORT" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "WIN32" /D "_WINDOWS" /D "XERCES_BUILDING_LIBRARY" /FD /c
# SUBTRACT CPP /Fr
# ADD BASE MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -71,7 +71,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
-# ADD CPP /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FR /FD /c
+# ADD CPP /G6 /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_DEBUG" /D "XERCES_NO_CONFIGURE_SUPPORT" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "WIN32" /D "_WINDOWS" /D "XERCES_BUILDING_LIBRARY" /FR /FD /c
# ADD BASE MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -98,7 +98,7 @@
# PROP Target_Dir ""
# ADD BASE CPP /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c
# SUBTRACT BASE CPP /Fr /YX
-# ADD CPP /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c
+# ADD CPP /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_DEBUG" /D "XERCES_NO_CONFIGURE_SUPPORT" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "WIN32" /D "_WINDOWS" /D "XERCES_BUILDING_LIBRARY" /FD /c
# ADD BASE MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -125,7 +125,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /G6 /MD /Za /W3 /GX /O2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c
-# ADD CPP /MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c
+# ADD CPP /MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "XERCES_NO_CONFIGURE_SUPPORT" /D "_CRTDBG_MAP_ALLOC" /D "XERCES_USE_FILEMGR_WINDOWS" /D "XERCES_USE_MUTEXMGR_WINDOWS" /D "XERCES_USE_ATOMICOPMGR_WINDOWS" /D "XERCES_USE_NETACCESSOR_WINSOCK" /D "XERCES_USE_WIN32_MSGLOADER" /D "XERCES_USE_TRANSCODER_WINDOWS" /D "WIN32" /D "_WINDOWS" /D "XERCES_BUILDING_LIBRARY" /FD /c
# ADD BASE MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32
# ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -153,21 +153,20 @@
# PROP Default_Filter ".cpp,.hpp"
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\resource.h
+SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Win32Defs.hpp
# End Source File
+# End Group
+# Begin Group "MsgLoaders"
+
+# PROP Default_Filter ".cpp,.hpp"
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Win32Defs.hpp
+SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\resource.h
# End Source File
# Begin Source File
-SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Win32PlatformUtils.cpp
-# ADD CPP /Ze
+SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Version.rc
# End Source File
-# End Group
-# Begin Group "MsgLoaders"
-
-# PROP Default_Filter ".cpp,.hpp"
# Begin Source File
SOURCE=..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32\Win32MsgLoader.cpp
@@ -433,6 +432,42 @@
SOURCE=..\..\..\..\..\src\xercesc\util\regx\XMLUniCharacter.hpp
# End Source File
# End Group
+# Begin Group "FileManager"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\util\FileManagers\WindowsFileMgr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\util\FileManagers\WindowsFileMgr.hpp
+# End Source File
+# End Group
+# Begin Group "MutexManager"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\util\MutexManagers\WindowsMutexMgr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\util\MutexManagers\WindowsMutexMgr.hpp
+# End Source File
+# End Group
+# Begin Group "AtomicOpManager"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\util\AtomicOpManagers\WindowsAtomicOpMgr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\..\src\xercesc\util\AtomicOpManagers\WindowsAtomicOpMgr.hpp
+# End Source File
+# End Group
# Begin Source File
SOURCE=..\..\..\..\..\src\xercesc\util\ArrayIndexOutOfBoundsException.hpp
@@ -3078,9 +3113,5 @@
SOURCE=..\..\..\..\..\src\xercesc\dom\DOMXPathResult.hpp
# End Source File
# End Group
-# Begin Source File
-
-SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Version.rc
-# End Source File
# End Target
# End Project
Modified: xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp (original)
+++ xerces/c/branches/jberry/3.0-unstable/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp Wed Jun 8 14:49:07 2005
@@ -43,7 +43,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Yu"stdafx.h" /FD /GZ /c
+# ADD CPP /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "_DEBUG" /D "_MBCS" /D "_ATL_DEBUG_INTERFACES" /D "_ATL_DEBUG_QI" /D "_ATL_DEBUG_REFCOUNT" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /Yu"stdafx.h" /FD /GZ /c
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
BSC32=bscmake.exe
@@ -52,9 +52,9 @@
# ADD 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 wininet.lib shlwapi.lib xerces-c_2D.lib /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
# Begin Custom Build - Performing registration
OutDir=.\..\..\..\..\..\Build\Win32\xml4com\Debug
-TargetDir=\Xerces\xml-xerces\c\Build\Win32\xml4com\Debug
-TargetPath=\Xerces\xml-xerces\c\Build\Win32\xml4com\Debug\xerces-com.dll
-InputPath=\Xerces\xml-xerces\c\Build\Win32\xml4com\Debug\xerces-com.dll
+TargetDir=\Xerces\3.0-unstable\Build\Win32\xml4com\Debug
+TargetPath=\Xerces\3.0-unstable\Build\Win32\xml4com\Debug\xerces-com.dll
+InputPath=\Xerces\3.0-unstable\Build\Win32\xml4com\Debug\xerces-com.dll
SOURCE="$(InputPath)"
BuildCmds= \
@@ -85,7 +85,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Yu"stdafx.h" /FD /c
+# ADD CPP /MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\xercesc\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_STATIC_REGISTRY" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "WIN32" /D "_WINDOWS" /D "XERCES_NO_CONFIGURE_SUPPORT" /Yu"stdafx.h" /FD /c
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
BSC32=bscmake.exe
@@ -94,9 +94,9 @@
# ADD 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 wininet.lib shlwapi.lib xerces-c_2.lib /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
# Begin Custom Build - Performing registration
OutDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
-TargetDir=\Xerces\xml-xerces\c\Build\Win32\xml4com\ReleaseMinDependency
-TargetPath=\Xerces\xml-xerces\c\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.dll
-InputPath=\Xerces\xml-xerces\c\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.dll
+TargetDir=\Xerces\3.0-unstable\Build\Win32\xml4com\ReleaseMinDependency
+TargetPath=\Xerces\3.0-unstable\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.dll
+InputPath=\Xerces\3.0-unstable\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.dll
SOURCE="$(InputPath)"
BuildCmds= \
Modified: xerces/c/branches/jberry/3.0-unstable/samples/src/CreateDOMDocument/CreateDOMDocument.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/samples/src/CreateDOMDocument/CreateDOMDocument.cpp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/samples/src/CreateDOMDocument/CreateDOMDocument.cpp (original)
+++ xerces/c/branches/jberry/3.0-unstable/samples/src/CreateDOMDocument/CreateDOMDocument.cpp Wed Jun 8 14:49:07 2005
@@ -30,12 +30,14 @@
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XMLString.hpp>
#include <xercesc/dom/DOM.hpp>
+#include <xercesc/util/OutOfMemoryException.hpp>
+
#if defined(XERCES_NEW_IOSTREAMS)
#include <iostream>
#else
#include <iostream.h>
#endif
-#include <xercesc/util/OutOfMemoryException.hpp>
+
XERCES_CPP_NAMESPACE_USE
Modified: xerces/c/branches/jberry/3.0-unstable/src/Makefile.am
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/Makefile.am?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.am (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.am Wed Jun 8 14:49:07 2005
@@ -18,6 +18,7 @@
# $Id$
#
+DEFS += -DXERCES_BUILDING_LIBRARY
#
# Specify the convenience libraries for various xerces components
Modified: xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/Makefile.in?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.in Wed Jun 8 14:49:07 2005
@@ -846,7 +846,7 @@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
+DEFS = @DEFS@ -DXERCES_BUILDING_LIBRARY
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp Wed Jun 8 14:49:07 2005
@@ -22,12 +22,12 @@
// ---------------------------------------------------------------------------
// Includes
// ---------------------------------------------------------------------------
-#include <xercesc/util/XercesDefs.hpp>
+#include <windows.h>
+
#include <xercesc/util/PlatformUtils.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
#include <xercesc/util/XMLString.hpp>
#include <xercesc/util/XMLUni.hpp>
-#include <windows.h>
#include "Win32MsgLoader.hpp"
Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp Wed Jun 8 14:49:07 2005
@@ -58,6 +58,7 @@
#if !defined(WIN32MSGLOADER_HPP)
#define WIN32MSGLOADER_HPP
+#include <windows.h>
#include <xercesc/util/XercesDefs.hpp>
#include <xercesc/util/XMLMsgLoader.hpp>
Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.cpp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.cpp (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/PlatformUtils.cpp Wed Jun 8 14:49:07 2005
@@ -25,6 +25,8 @@
// ---------------------------------------------------------------------------
#if HAVE_CONFIG_H
# include <config.h>
+#else
+# include <xercesc/util/Xerces_no_autoconf_config.hpp>
#endif
#if HAVE_LIMITS_H
@@ -112,6 +114,9 @@
#if XERCES_USE_MSGLOADER_INMEMORY
# include <xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.hpp>
#endif
+#if XERCES_USE_WIN32_MSGLOADER
+# include <xercesc/util/MsgLoaders/Win32/Win32MsgLoader.hpp>
+#endif
#include <xercesc/util/TransService.hpp>
#if XERCES_USE_TRANSCODER_ICU
@@ -428,6 +433,8 @@
ms = new ICUMsgLoader(msgDomain);
#elif defined (XERCES_USE_MSGLOADER_ICONV)
ms = new MsgCatalogLoader(msgDomain);
+ #elif defined (XERCES_USE_WIN32_MSGLOADER)
+ ms = new Win32MsgLoader(msgDomain);
#else // XERCES_USE_MSGLOADER_INMEMORY
ms = new InMemMsgLoader(msgDomain);
#endif
@@ -685,7 +692,7 @@
timeb aTime;
ftime(&aTime);
ms = (unsigned long)(aTime.time*1000 + aTime.millitm);
- #lse
+ #else
// Make this a warning instead?
#error No timing support is configured for this platform. You must configure it.
#endif
Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Transcoders/Win32/Win32TransService.cpp Wed Jun 8 14:49:07 2005
@@ -821,34 +821,6 @@
return ::WideCharToMultiByte(CP_ACP, 0, srcText, -1, NULL, 0, NULL, NULL);
}
-// Return value using global operator new
-// Revisit: deprecate ?
-char* Win32LCPTranscoder::transcode(const XMLCh* const toTranscode)
-{
- if (!toTranscode)
- return 0;
-
- char* retVal = 0;
- if (*toTranscode)
- {
- // Calc the needed size
- const unsigned int neededLen = calcRequiredSize(toTranscode);
-
- // Allocate a buffer of that size plus one for the null and transcode
- retVal = new char[neededLen + 1];
- ::WideCharToMultiByte(CP_ACP, 0, (LPCWSTR)toTranscode, -1, retVal, neededLen+1, NULL, NULL);
-
- // And cap it off anyway just to make sure
- retVal[neededLen] = 0;
- }
- else
- {
- retVal = new char[1];
- retVal[0] = 0;
- }
- return retVal;
-}
-
char* Win32LCPTranscoder::transcode(const XMLCh* const toTranscode,
MemoryManager* const manager)
{
@@ -871,40 +843,6 @@
else
{
retVal = (char*) manager->allocate(sizeof(char)); //new char[1];
- retVal[0] = 0;
- }
- return retVal;
-}
-
-// Return value using global operator new
-// Revisit: deprecate ?
-XMLCh* Win32LCPTranscoder::transcode(const char* const toTranscode)
-{
- if (!toTranscode)
- return 0;
-
- XMLCh* retVal = 0;
- if (*toTranscode)
- {
- // Calculate the buffer size required
- const unsigned int neededLen = calcRequiredSize(toTranscode);
- if (neededLen == 0)
- {
- retVal = new XMLCh[1];
- retVal[0] = 0;
- return retVal;
- }
-
- // Allocate a buffer of that size plus one for the null and transcode
- retVal = new XMLCh[neededLen + 1];
- ::MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, toTranscode, -1, (LPWSTR)retVal, neededLen + 1);
-
- // Cap it off just to make sure. We are so paranoid!
- retVal[neededLen] = 0;
- }
- else
- {
- retVal = new XMLCh[1];
retVal[0] = 0;
}
return retVal;
Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLString.cpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLString.cpp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLString.cpp (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XMLString.cpp Wed Jun 8 14:49:07 2005
@@ -24,6 +24,8 @@
// ---------------------------------------------------------------------------
#if HAVE_CONFIG_H
# include <config.h>
+#else
+# include <xercesc/util/Xerces_no_autoconf_config.hpp>
#endif
#if !HAVE_STRICMP
Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp?rev=189647&r1=189646&r2=189647&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp Wed Jun 8 14:49:07 2005
@@ -43,8 +43,8 @@
// Otherwise we include a preconfigured config appropriate for the particular
// platform.
//
-#if FLAG_TO_INDICATE_WINDOWS_BUILD
-# include <xercesc/util/Xerces_windows_config.hpp>
+#ifdef XERCES_NO_CONFIGURE_SUPPORT
+# include <xercesc/util/Xerces_no_autoconf_config.hpp>
#else
// If the next line generates an error then you haven't run ./configure
# include <xercesc/util/Xerces_autoconf_config.hpp>
@@ -137,63 +137,39 @@
// The DLL_EXPORT flag should be defined on the command line during the build of a DLL
// configure conspires to make this happen.
-#if DLL_EXPORT
-#define PROJ_XMLUTIL
-#define PROJ_XMLPARSER
-#define PROJ_SAX4C
-#define PROJ_SAX2
-#define PROJ_DOM
-#define PROJ_DEPRECATED_DOM
-#define PROJ_PARSERS
-#define PROJ_VALIDATORS
-#endif
-
-#if defined(PROJ_XMLUTIL)
-#define XMLUTIL_EXPORT XERCES_PLATFORM_EXPORT
-#else
-#define XMLUTIL_EXPORT XERCES_PLATFORM_IMPORT
-#endif
-
-#if defined(PROJ_XMLPARSER)
-#define XMLPARSER_EXPORT XERCES_PLATFORM_EXPORT
-#else
-#define XMLPARSER_EXPORT XERCES_PLATFORM_IMPORT
-#endif
-
-#if defined(PROJ_SAX4C)
-#define SAX_EXPORT XERCES_PLATFORM_EXPORT
-#else
-#define SAX_EXPORT XERCES_PLATFORM_IMPORT
-#endif
-
-#if defined(PROJ_SAX2)
-#define SAX2_EXPORT XERCES_PLATFORM_EXPORT
-#else
-#define SAX2_EXPORT XERCES_PLATFORM_IMPORT
-#endif
-
-#if defined(PROJ_DOM)
-#define CDOM_EXPORT XERCES_PLATFORM_EXPORT
-#else
-#define CDOM_EXPORT XERCES_PLATFORM_IMPORT
-#endif
-
-#if defined(PROJ_DEPRECATED_DOM)
-#define DEPRECATED_DOM_EXPORT XERCES_PLATFORM_EXPORT
-#else
-#define DEPRECATED_DOM_EXPORT XERCES_PLATFORM_IMPORT
-#endif
-
-#if defined(PROJ_PARSERS)
-#define PARSERS_EXPORT XERCES_PLATFORM_EXPORT
-#else
-#define PARSERS_EXPORT XERCES_PLATFORM_IMPORT
-#endif
-#if defined(PROJ_VALIDATORS)
-#define VALIDATORS_EXPORT XERCES_PLATFORM_EXPORT
+#if defined(DLL_EXPORT)
+ #if defined(XERCES_BUILDING_LIBRARY)
+ #define XMLUTIL_EXPORT XERCES_PLATFORM_EXPORT
+ #define XMLPARSER_EXPORT XERCES_PLATFORM_EXPORT
+ #define SAX_EXPORT XERCES_PLATFORM_EXPORT
+ #define SAX2_EXPORT XERCES_PLATFORM_EXPORT
+ #define CDOM_EXPORT XERCES_PLATFORM_EXPORT
+ #define PARSERS_EXPORT XERCES_PLATFORM_EXPORT
+ #define VALIDATORS_EXPORT XERCES_PLATFORM_EXPORT
+ #else
+ #define XMLUTIL_EXPORT XERCES_PLATFORM_IMPORT
+ #define XMLPARSER_EXPORT XERCES_PLATFORM_IMPORT
+ #define SAX_EXPORT XERCES_PLATFORM_IMPORT
+ #define SAX2_EXPORT XERCES_PLATFORM_IMPORT
+ #define CDOM_EXPORT XERCES_PLATFORM_IMPORT
+ #define PARSERS_EXPORT XERCES_PLATFORM_IMPORT
+ #define VALIDATORS_EXPORT XERCES_PLATFORM_IMPORT
+ #endif
+ #if defined(XERCES_BUILDING_DEPRECATED_LIBRARY)
+ #define DEPRECATED_DOM_EXPORT XERCES_PLATFORM_EXPORT
+ #else
+ #define DEPRECATED_DOM_EXPORT XERCES_PLATFORM_IMPORT
+ #endif
#else
-#define VALIDATORS_EXPORT XERCES_PLATFORM_IMPORT
+ #define XMLUTIL_EXPORT
+ #define XMLPARSER_EXPORT
+ #define SAX_EXPORT
+ #define SAX2_EXPORT
+ #define CDOM_EXPORT
+ #define DEPRECATED_DOM_EXPORT
+ #define PARSERS_EXPORT
+ #define VALIDATORS_EXPORT
#endif
#endif
Added: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_no_autoconf_config.hpp
URL: http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_no_autoconf_config.hpp?rev=189647&view=auto
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_no_autoconf_config.hpp (added)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_no_autoconf_config.hpp Wed Jun 8 14:49:07 2005
@@ -0,0 +1,91 @@
+/*
+ * Copyright 1999-2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * $Id$
+ */
+
+// For non-autoconf based builds, this header is provided to set a reasonable set of defaults
+
+#ifndef XERCES_NO_AUTOCONFIG_CONFIG_HPP
+#define XERCES_NO_AUTOCONFIG_CONFIG_HPP
+
+#include <basetsd.h>
+
+/* #undef XERCES_AUTOCONF */
+/* #undef XERCES_HAVE_SYS_TYPES_H */
+#define HAVE_STRICMP 1
+#define HAVE_STRNICMP 1
+#define HAVE_SYS_TIMEB_H 1
+#define HAVE_FTIME 1
+#define HAVE_LIMITS_H 1
+
+#define XERCES_16BIT_INT short int
+#define XERCES_32BIT_INT int
+#define XERCES_XMLCH_T unsigned short
+#define XERCES_SIZE_T SIZE_T
+#define XERCES_SSIZE_T SSIZE_T
+
+#define XERCES_HAS_CPP_NAMESPACE
+#define XERCES_STD_NAMESPACE
+#define XERCES_NEW_IOSTREAMS
+/* #undef XERCES_NO_NATIVE_BOOL */
+#define XERCES_LSTRSUPPORT
+
+#ifdef XERCES_STATIC_LIBRARY
+#define XERCES_PLATFORM_EXPORT
+#define XERCES_PLATFORM_IMPORT
+#else
+#define XERCES_PLATFORM_EXPORT __declspec(dllexport)
+#define XERCES_PLATFORM_IMPORT __declspec(dllimport)
+#define DLL_EXPORT
+#endif
+
+// ---------------------------------------------------------------------------
+// XMLSize_t is the unsigned integral type.
+// ---------------------------------------------------------------------------
+typedef XERCES_SIZE_T XMLSize_t;
+typedef XERCES_SSIZE_T XMLSSize_t;
+
+// ---------------------------------------------------------------------------
+// Define our version of the XML character
+// ---------------------------------------------------------------------------
+typedef XERCES_XMLCH_T XMLCh;
+
+// ---------------------------------------------------------------------------
+// Define unsigned 16 and 32 bit integers
+// ---------------------------------------------------------------------------
+typedef unsigned XERCES_16BIT_INT XMLUInt16;
+typedef unsigned XERCES_32BIT_INT XMLUInt32;
+
+// ---------------------------------------------------------------------------
+// Define signed 32 bit integers
+// ---------------------------------------------------------------------------
+typedef XERCES_32BIT_INT XMLInt32;
+
+// ---------------------------------------------------------------------------
+// XMLFilePos is the type used to represent a file position.
+// ---------------------------------------------------------------------------
+typedef unsigned XERCES_32BIT_INT XMLFilePos;
+
+// ---------------------------------------------------------------------------
+// Force on the Xerces debug token if it is on in the build environment
+// ---------------------------------------------------------------------------
+#if defined(_DEBUG)
+#define XERCES_DEBUG
+#endif
+
+#endif
Propchange: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_no_autoconf_config.hpp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_no_autoconf_config.hpp
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org