de-hungarian-ize server config member names which are going to stay

[apache] / libhttpd.dsp

diff --git a/libhttpd.dsp b/libhttpd.dsp
index ed4ddda537b598bfb673184d88ec5997995636b8..aa15cce9a4baf0c2579c05cddf68b20292bd8a06 100644 (file)
--- a/libhttpd.dsp
+++ b/libhttpd.dsp
@@ -42,12 +42,12 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I "./os/win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
-# ADD CPP /nologo /MD /W3 /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I "./server/mpm/winnt" /I "./srclib/expat-lite" /I "./os/win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /O2 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
+# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -68,13 +68,12 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# 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" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Debug\libhttpd" /FD /c
-# SUBTRACT CPP /YX
+# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /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" /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 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -88,7 +87,7 @@ LINK32=link.exe
 
 # Name "libhttpd - Win32 Release"
 # Name "libhttpd - Win32 Debug"
-# Begin Group "Configuration"
+# Begin Group "core"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
 # Begin Source File
@@ -101,11 +100,63 @@ SOURCE=.\include\ap_mmn.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\include\ap_release.h
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\buildmark.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\http_conf_globals.h
+SOURCE=.\server\config.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\connection.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\core.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\http_config.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\http_connection.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\http_core.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\http_log.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\http_main.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\http_protocol.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\http_request.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\http_vhost.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\httpd.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\log.c
 # End Source File
 # Begin Source File
 
@@ -115,8 +166,28 @@ SOURCE=.\os\win32\modules.c
 
 SOURCE=.\os\win32\os.h
 # End Source File
+# Begin Source File
+
+SOURCE=.\server\protocol.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\request.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\scoreboard.c
+# End Source File
+# Begin Source File
+
+SOURCE=.\include\scoreboard.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server\vhost.c
+# End Source File
 # End Group
-# Begin Group "Generated Files"
+# Begin Group "generated"
 
 # PROP Default_Filter ""
 # Begin Source File
@@ -125,6 +196,8 @@ SOURCE=.\server\gen_test_char.exe
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
+# PROP Ignore_Default_Tool 1
+USERDEP__WIN32=".\include\os.h"        
 # Begin Custom Build - Generating test_char.h
 InputPath=.\server\gen_test_char.exe
 
@@ -136,6 +209,8 @@ InputPath=.\server\gen_test_char.exe
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
+# PROP Ignore_Default_Tool 1
+USERDEP__WIN32=".\include\os.h"        
 # Begin Custom Build - Generating test_char.h
 InputPath=.\server\gen_test_char.exe
 
@@ -150,27 +225,31 @@ InputPath=.\server\gen_test_char.exe
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\gen_uri_delims.exe
+SOURCE=.\modules\http\mod_core.h
 
 !IF  "$(CFG)" == "libhttpd - Win32 Release"
 
-# Begin Custom Build - Generating uri_delims.h
-InputPath=.\server\gen_uri_delims.exe
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating mod_core.h
+InputPath=.\modules\http\mod_core.h
 
-".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       .\server\gen_uri_delims.exe >.\server\uri_delims.h 
-       echo Generated uri_delims.h from gen_uri_delims.exe 
+".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\mod_core.h
+       copy .\modules\http\mod_core.h .\include\mod_core.h
+       echo Created mod_core.h
        
 # End Custom Build
 
 !ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
-# Begin Custom Build - Generating uri_delims.h
-InputPath=.\server\gen_uri_delims.exe
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating mod_core.h
+InputPath=.\modules\http\mod_core.h
 
-".\server\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       .\server\gen_uri_delims.exe >.\server\uri_delims.h 
-       echo Generated uri_delims.h from gen_uri_delims.exe 
+".\include\mod_core.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\mod_core.h
+       copy .\modules\http\mod_core.h .\include\mod_core.h
+       echo Created mod_core.h
        
 # End Custom Build
 
@@ -179,167 +258,204 @@ InputPath=.\server\gen_uri_delims.exe
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\test_char.h
-# End Source File
-# Begin Source File
+SOURCE=.\modules\dav\main\mod_dav.h
 
-SOURCE=.\server\uri_delims.h
-# End Source File
-# End Group
-# Begin Group "httpd"
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
 
-# PROP Default_Filter ""
-# Begin Source File
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating mod_dav.h
+InputPath=.\modules\dav\main\mod_dav.h
 
-SOURCE=.\server\config.c
-# End Source File
-# Begin Source File
+".\include\mod_dav.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\mod_dav.h
+       copy .\modules\dav\main\mod_dav.h .\include\mod_dav.h
+       echo Created mod_dav.h
+       
+# End Custom Build
 
-SOURCE=.\server\connection.c
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
-SOURCE=.\include\http_config.h
-# End Source File
-# Begin Source File
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating mod_dav.h
+InputPath=.\modules\dav\main\mod_dav.h
 
-SOURCE=.\include\http_connection.h
-# End Source File
-# Begin Source File
+".\include\mod_dav.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\mod_dav.h
+       copy .\modules\dav\main\mod_dav.h .\include\mod_dav.h
+       echo Created mod_dav.h
+       
+# End Custom Build
 
-SOURCE=.\include\http_log.h
-# End Source File
-# Begin Source File
+!ENDIF 
 
-SOURCE=.\include\http_main.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\http_vhost.h
-# End Source File
-# Begin Source File
+SOURCE=.\modules\proxy\mod_proxy.h
 
-SOURCE=.\include\httpd.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
 
-SOURCE=.\server\log.c
-# End Source File
-# Begin Source File
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating mod_proxy.h
+InputPath=.\modules\proxy\mod_proxy.h
 
-SOURCE=.\server\scoreboard.c
-# End Source File
-# Begin Source File
+".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\mod_proxy.h
+       copy .\modules\proxy\mod_proxy.h .\include\mod_proxy.h
+       echo Created mod_proxy.h
+       
+# End Custom Build
 
-SOURCE=.\server\vhost.c
-# End Source File
-# End Group
-# Begin Group "modules"
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
-# PROP Default_Filter ""
-# Begin Source File
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating mod_proxy.h
+InputPath=.\modules\proxy\mod_proxy.h
 
-SOURCE=.\modules\http\http_core.c
-# End Source File
-# Begin Source File
+".\include\mod_proxy.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\mod_proxy.h
+       copy .\modules\proxy\mod_proxy.h .\include\mod_proxy.h
+       echo Created mod_proxy.h
+       
+# End Custom Build
 
-SOURCE=.\include\http_core.h
-# End Source File
-# Begin Source File
+!ENDIF 
 
-SOURCE=.\modules\http\http_protocol.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\http_protocol.h
-# End Source File
-# Begin Source File
+SOURCE=.\server\mpm\winnt\mpm.h
 
-SOURCE=.\modules\http\http_request.c
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
 
-SOURCE=.\include\http_request.h
-# End Source File
-# Begin Source File
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating mpm.h
+InputPath=.\server\mpm\winnt\mpm.h
 
-SOURCE=.\modules\aaa\mod_access.c
-# End Source File
-# Begin Source File
+".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\mpm.h
+       copy .\server\mpm\winnt\mpm.h .\include\mpm.h
+       echo Created mpm.h
+       
+# End Custom Build
 
-SOURCE=.\modules\mappers\mod_actions.c
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
 
-SOURCE=.\modules\mappers\mod_alias.c
-# End Source File
-# Begin Source File
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating mpm.h
+InputPath=.\server\mpm\winnt\mpm.h
 
-SOURCE=.\modules\generators\mod_asis.c
-# End Source File
-# Begin Source File
+".\include\mpm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\mpm.h
+       copy .\server\mpm\winnt\mpm.h .\include\mpm.h
+       echo Created mpm.h
+       
+# End Custom Build
 
-SOURCE=.\modules\aaa\mod_auth.c
-# End Source File
-# Begin Source File
+!ENDIF 
 
-SOURCE=.\modules\generators\mod_autoindex.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\generators\mod_cgi.c
-# End Source File
-# Begin Source File
+SOURCE=.\server\mpm\winnt\mpm_default.h
 
-SOURCE=.\modules\http\mod_core.h
-# End Source File
-# Begin Source File
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
 
-SOURCE=.\modules\mappers\mod_dir.c
-# End Source File
-# Begin Source File
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating mpm_default.h
+InputPath=.\server\mpm\winnt\mpm_default.h
 
-SOURCE=.\modules\metadata\mod_env.c
-# End Source File
-# Begin Source File
+".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\mpm_default.h
+       copy .\server\mpm\winnt\mpm_default.h .\include\mpm_default.h
+       echo Created mpm_default.h
+       
+# End Custom Build
 
-SOURCE=.\modules\mappers\mod_imap.c
-# End Source File
-# Begin Source File
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating mpm_default.h
+InputPath=.\server\mpm\winnt\mpm_default.h
+
+".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\mpm_default.h
+       copy .\server\mpm\winnt\mpm_default.h .\include\mpm_default.h
+       echo Created mpm_default.h
+       
+# End Custom Build
+
+!ENDIF 
 
-SOURCE=.\modules\filters\mod_include.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\filters\mod_include.h
+SOURCE=.\os\win32\os.h
+
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating os.h
+InputPath=.\os\win32\os.h
+
+".\include\os.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\os.h
+       copy .\os\win32\os.h .\include\os.h
+       echo Created os.h
+       
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Generating os.h
+InputPath=.\os\win32\os.h
+
+".\include\os.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+       del .\include\os.h
+       copy .\os\win32\os.h .\include\os.h
+       echo Created os.h
+       
+# End Custom Build
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=.\os\win32\mod_isapi.c
+SOURCE=.\server\test_char.h
 # End Source File
+# End Group
+# Begin Group "httpd"
+
+# PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\modules\loggers\mod_log_config.c
+SOURCE=.\modules\http\http_core.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\http\mod_mime.c
+SOURCE=.\modules\http\http_protocol.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\mappers\mod_negotiation.c
+SOURCE=.\modules\http\http_request.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\metadata\mod_setenvif.c
+SOURCE=.\modules\http\mod_core.h
 # End Source File
+# End Group
+# Begin Group "modules"
+
+# PROP Default_Filter ""
 # Begin Source File
 
 SOURCE=.\modules\mappers\mod_so.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\modules\mappers\mod_userdir.c
+SOURCE=.\modules\arch\win32\mod_win32.c
 # End Source File
 # End Group
 # Begin Group "util"
@@ -375,14 +491,6 @@ SOURCE=.\include\util_charset.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\util_date.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\util_date.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\include\util_ebcdic.h
 # End Source File
 # Begin Source File
@@ -411,11 +519,7 @@ SOURCE=.\include\util_script.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\util_uri.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\include\util_uri.h
+SOURCE=.\server\util_time.c
 # End Source File
 # Begin Source File
 
@@ -451,6 +555,10 @@ SOURCE=.\server\mpm\winnt\mpm.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\mpm_common.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\include\mpm_common.h
 # End Source File
 # Begin Source File
@@ -471,6 +579,10 @@ SOURCE=.\server\mpm\winnt\mpm_winnt.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\mpm\winnt\nt_eventlog.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\mpm\winnt\registry.c
 # End Source File
 # Begin Source File
@@ -478,5 +590,38 @@ SOURCE=.\server\mpm\winnt\registry.c
 SOURCE=.\server\mpm\winnt\service.c
 # End Source File
 # End Group
+# Begin Source File
+
+SOURCE=.\build\win32\libhttpd.rc
+# End Source File
+# Begin Source File
+
+SOURCE=.\build\win32\win32ver.awk
+
+!IF  "$(CFG)" == "libhttpd - Win32 Release"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+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
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "libhttpd - Win32 Debug"
+
+# PROP Ignore_Default_Tool 1
+# Begin Custom Build - Creating Version Resource
+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
+
+# End Custom Build
+
+!ENDIF 
+
+# End Source File
 # End Target
 # End Project