Commit 48967889 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  The purpose of this patch is to toggle the debugging mode (default) to
  Program Database (from Program Database for Modify on the fly debugging).

  The net effect of this patch is to clean up all of the irrelevant entries
  associated with either the debugging or release command line switches, and
  generally straighten the projects as they would be exported from VC6/SP5.

  The outcome of this patch is that VC5 users -should- be able to load and
  build the workspace without any errors (as they used to have no symbols
  database at all, the /ZI option doesn't work, they had to use cvtdsp.pl
  to toggle these to /Zi.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90269 13f79535-47bb-0310-9956-ffa450edef68
parent e84fdaa2

Apache.dsp

+3 −6
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ LINK32=link.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "./os/win32" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Debug\Apache" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "./os/win32" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /Fd"Debug\Apache" /FD /c

# SUBTRACT CPP /YX

# ADD BASE RSC /l 0x409 /d "_DEBUG"

# ADD RSC /l 0x409 /d "_DEBUG"
@@ -90,7 +90,6 @@ SOURCE=.\build\win32\Apache.ico 
# Begin Source File



SOURCE=.\build\win32\Apache.rc



# End Source File

# Begin Source File
@@ -107,8 +106,7 @@ SOURCE=.\build\win32\win32ver.awk 
InputPath=.\build\win32\win32ver.awk



".\build\win32\Apache.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk Apache "Apache HTTP Server"\

 ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc

	awk -f ./build/win32/win32ver.awk Apache "Apache HTTP Server"  ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc



# End Custom Build
@@ -119,8 +117,7 @@ InputPath=.\build\win32\win32ver.awk 
InputPath=.\build\win32\win32ver.awk



".\build\win32\Apache.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk Apache "Apache HTTP Server"\

 ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc

	awk -f ./build/win32/win32ver.awk Apache "Apache HTTP Server"  ./include/ap_release.h icon=apache.ico > .\build\win32\Apache.rc



# End Custom Build

libhttpd.dsp

+7 −10
Original line number Diff line number Diff line
@@ -68,8 +68,8 @@ LINK32=link.exe 
# PROP Intermediate_Dir "Debug"

# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I "./os/win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /ZI /c

# ADD CPP /nologo /MDd /W3 /GX /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I "./os/win32" /I "./modules/http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /ZI /c

# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I "./os/win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I "./os/win32" /I "./modules/http" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -409,15 +409,15 @@ SOURCE=.\include\ap_mpm.h 
# End Source File

# Begin Source File



SOURCE=.\server\mpm_common.c

SOURCE=.\server\listen.c

# End Source File

# Begin Source File



SOURCE=.\server\listen.c

SOURCE=.\server\mpm\winnt\mpm.h

# End Source File

# Begin Source File



SOURCE=.\server\mpm\winnt\mpm.h

SOURCE=.\server\mpm_common.c

# End Source File

# Begin Source File
@@ -451,7 +451,6 @@ SOURCE=.\server\mpm\winnt\service.c 
# Begin Source File



SOURCE=.\build\win32\libhttpd.rc



# End Source File

# Begin Source File
@@ -464,8 +463,7 @@ SOURCE=.\build\win32\win32ver.awk 
InputPath=.\build\win32\win32ver.awk



".\build\win32\libhttpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk libhttpd "Apache HTTP Server Core"\

 ./include/ap_release.h > .\build\win32\libhttpd.rc

	awk -f ./build/win32/win32ver.awk libhttpd "Apache HTTP Server Core"  ./include/ap_release.h > .\build\win32\libhttpd.rc



# End Custom Build
@@ -476,8 +474,7 @@ InputPath=.\build\win32\win32ver.awk 
InputPath=.\build\win32\win32ver.awk



".\build\win32\libhttpd.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ./build/win32/win32ver.awk libhttpd "Apache HTTP Server Core"\

 ./include/ap_release.h > .\build\win32\libhttpd.rc

	awk -f ./build/win32/win32ver.awk libhttpd "Apache HTTP Server Core"  ./include/ap_release.h > .\build\win32\libhttpd.rc



# End Custom Build

modules/aaa/mod_auth_anon.dsp

+7 −9
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_anon.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_anon.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon



!ELSEIF  "$(CFG)" == "mod_auth_anon - Win32 Debug"
@@ -69,7 +69,7 @@ LINK32=link.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "..\..\srclib\apr-util\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth_anon" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "..\..\srclib\apr-util\include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth_anon" /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -78,8 +78,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_anon.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_anon.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_anon.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_anon



!ENDIF
@@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk 
InputPath=..\..\build\win32\win32ver.awk



".\mod_auth_anon.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ../../build/win32/win32ver.awk mod_auth_anon\

 "auth_anon_module for Apache" ../../include/ap_release.h > .\mod_auth_anon.rc

	awk -f ../../build/win32/win32ver.awk mod_auth_anon  "auth_anon_module for Apache" ../../include/ap_release.h > .\mod_auth_anon.rc



# End Custom Build
@@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk 
InputPath=..\..\build\win32\win32ver.awk



".\mod_auth_anon.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ../../build/win32/win32ver.awk mod_auth_anon\

 "auth_anon_module for Apache" ../../include/ap_release.h > .\mod_auth_anon.rc

	awk -f ../../build/win32/win32ver.awk mod_auth_anon  "auth_anon_module for Apache" ../../include/ap_release.h > .\mod_auth_anon.rc



# End Custom Build

modules/aaa/mod_auth_dbm.dsp

+7 −9
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_dbm.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_dbm.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm



!ELSEIF  "$(CFG)" == "mod_auth_dbm - Win32 Debug"
@@ -69,7 +69,7 @@ LINK32=link.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "..\..\srclib\sdbm" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_AUTH_DBM_USE_APR" /Fd"Debug\mod_auth_dbm" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /I "..\..\srclib\sdbm" /I "..\..\os\win32" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_AUTH_DBM_USE_APR" /Fd"Debug\mod_auth_dbm" /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /win32

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32

# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -78,8 +78,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_dbm.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_dbm.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_dbm.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_dbm



!ENDIF
@@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk 
InputPath=..\..\build\win32\win32ver.awk



".\mod_auth_dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ../../build/win32/win32ver.awk mod_auth_dbm\

 "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_dbm.rc

	awk -f ../../build/win32/win32ver.awk mod_auth_dbm  "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_dbm.rc



# End Custom Build
@@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk 
InputPath=..\..\build\win32\win32ver.awk



".\mod_auth_dbm.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ../../build/win32/win32ver.awk mod_auth_dbm\

 "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_dbm.rc

	awk -f ../../build/win32/win32ver.awk mod_auth_dbm  "auth_dbm_module for Apache" ../../include/ap_release.h > .\mod_auth_dbm.rc



# End Custom Build

modules/aaa/mod_auth_digest.dsp

+7 −9
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_digest.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /out:"Release/mod_auth_digest.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_digest.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_auth_digest.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest



!ELSEIF  "$(CFG)" == "mod_auth_digest - Win32 Debug"
@@ -69,7 +69,7 @@ LINK32=link.exe 
# PROP Ignore_Export_Lib 0

# PROP Target_Dir ""

# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth_digest" /FD /c

# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "..\..\include" /I "..\..\os\win32" /I "..\..\srclib\apr\include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_auth_digest" /FD /c

# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"

# ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -78,8 +78,8 @@ BSC32=bscmake.exe 
# ADD BASE BSC32 /nologo

# ADD BSC32 /nologo

LINK32=link.exe

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_digest.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /out:"Debug/mod_auth_digest.so" /machine:I386 /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest

# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_digest.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest

# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_auth_digest.so" /base:@..\..\os\win32\BaseAddr.ref,mod_auth_digest



!ENDIF
@@ -106,8 +106,7 @@ SOURCE=..\..\build\win32\win32ver.awk 
InputPath=..\..\build\win32\win32ver.awk



".\mod_auth_digest.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ../../build/win32/win32ver.awk mod_auth_digest\

 "auth_digest_module for Apache" ../../include/ap_release.h > .\mod_auth_digest.rc

	awk -f ../../build/win32/win32ver.awk mod_auth_digest  "auth_digest_module for Apache" ../../include/ap_release.h > .\mod_auth_digest.rc



# End Custom Build
@@ -118,8 +117,7 @@ InputPath=..\..\build\win32\win32ver.awk 
InputPath=..\..\build\win32\win32ver.awk



".\mod_auth_digest.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

	awk -f ../../build/win32/win32ver.awk mod_auth_digest\

 "auth_digest_module for Apache" ../../include/ap_release.h > .\mod_auth_digest.rc

	awk -f ../../build/win32/win32ver.awk mod_auth_digest  "auth_digest_module for Apache" ../../include/ap_release.h > .\mod_auth_digest.rc



# End Custom Build