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 2003/11/21 12:31:19 UTC

cvs commit: xml-xerces/c/Projects/Win32/VC6/xerces-all/xerces-com xerces-com.dsp

amassari    2003/11/21 03:31:19

  Modified:    c/Projects/Win32/VC6/xerces-all/xerces-com xerces-com.dsp
  Log:
  Updated project to copy xerces-c_2_4_0, not xerces-c_2_3_0
  
  Revision  Changes    Path
  1.22      +29 -28    xml-xerces/c/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp
  
  Index: xerces-com.dsp
  ===================================================================
  RCS file: /home/cvs/xml-xerces/c/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- xerces-com.dsp	14 Mar 2003 21:13:11 -0000	1.21
  +++ xerces-com.dsp	21 Nov 2003 11:31:19 -0000	1.22
  @@ -7,19 +7,19 @@
   CFG=xml4com - Win32 Debug
   !MESSAGE This is not a valid makefile. To build this project using NMAKE,
   !MESSAGE use the Export Makefile command and run
  -!MESSAGE
  +!MESSAGE 
   !MESSAGE NMAKE /f "xerces-com.mak".
  -!MESSAGE
  +!MESSAGE 
   !MESSAGE You can specify a configuration when running NMAKE
   !MESSAGE by defining the macro CFG on the command line. For example:
  -!MESSAGE
  +!MESSAGE 
   !MESSAGE NMAKE /f "xerces-com.mak" CFG="xml4com - Win32 Debug"
  -!MESSAGE
  +!MESSAGE 
   !MESSAGE Possible choices for configuration are:
  -!MESSAGE
  +!MESSAGE 
   !MESSAGE "xml4com - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
   !MESSAGE "xml4com - Win32 Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
  -!MESSAGE
  +!MESSAGE 
   
   # Begin Project
   # PROP AllowPerConfigDependencies 0
  @@ -42,16 +42,14 @@
   # PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\xml4com\Debug"
   # 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 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 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  /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
  -# 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 /out:"..\..\..\..\..\Build\Win32\xml4com\Debug/xerces-com.dll" /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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
  +# 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=.\..\..\..\..\..\Build\Win32\xml4com\Debug
  @@ -59,14 +57,19 @@
   InputPath=.\..\..\..\..\..\Build\Win32\xml4com\Debug\xerces-com.dll
   SOURCE="$(InputPath)"
   
  -"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	echo copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_3_0D.dll "$(TargetDir)"
  -	copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_3_0D.dll "$(TargetDir)"
  -	regsvr32 /s /c "$(TargetPath)"
  -	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
  +BuildCmds= \
  +	echo copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_4_0D.dll "$(TargetDir)" \
  +	copy ..\..\..\..\..\Build\Win32\VC6\Debug\xerces-c_2_4_0D.dll "$(TargetDir)" \
  +	regsvr32 /s /c "$(TargetPath)" \
  +	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" \
   	
  -# End Custom Build
   
  +"$(TargetDir)\xerces-c_2_4_0D.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +   $(BuildCmds)
  +
  +"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +   $(BuildCmds)
  +# End Custom Build
   
   !ELSEIF  "$(CFG)" == "xml4com - Win32 Release MinDependency"
   
  @@ -81,16 +84,14 @@
   # PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency"
   # 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 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 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  /subsystem:windows /dll /machine:I386
  -# 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 /out:"..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency/xerces-com.dll" /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 /subsystem:windows /dll /machine:I386
  +# 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=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
  @@ -99,20 +100,20 @@
   SOURCE="$(InputPath)"
   
   BuildCmds= \
  -	echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_3_0.dll $(TargetDir) \
  -	copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_3_0.dll $(TargetDir) \
  +	echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_4_0.dll $(TargetDir) \
  +	copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_4_0.dll $(TargetDir) \
   	regsvr32 /s /c "$(TargetPath)" \
   	echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" \
   	
   
  -"$(TargetDir)\xerces-c_2_2_0.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +"$(TargetDir)\xerces-c_2_4_0.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
      $(BuildCmds)
   
   "$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
      $(BuildCmds)
   # End Custom Build
   
  -!ENDIF
  +!ENDIF 
   
   # Begin Target
   
  
  
  

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