We build through Apache.exe!!! Onwards...

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

diff --git a/ApacheCore.dsp b/ApacheCore.dsp
index e5afb18b7ecb5df43233840a3c51a101c8b0d3c6..56dfa35dc339f052e1a52818a299a6f3653e20dd 100644 (file)
--- a/ApacheCore.dsp
+++ b/ApacheCore.dsp
@@ -26,7 +26,6 @@ CFG=ApacheCore - Win32 Debug
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
-RSC=rc.exe
 
 !IF  "$(CFG)" == "ApacheCore - Win32 Release"
 
@@ -40,10 +39,11 @@ RSC=rc.exe
 # PROP Output_Dir "LibR"
 # PROP Intermediate_Dir "LibR"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
+RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -64,10 +64,11 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LibD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /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 ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
+RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /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 ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -119,35 +120,6 @@ SOURCE=.\os\win32\os.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=".\srclib\apr-util\apu_private.hw"
-
-!IF  "$(CFG)" == "ApacheCore - Win32 Release"
-
-# Begin Custom Build
-InputPath=".\srclib\apr-util\apu_private.hw"
-
-".\srclib\apr-util\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy .\srclib\apr-util\apu_private.hw .\srclib\apr-util\apu_private.h >nul 
-       echo Created apr-util apu_private.h from apu_private.hw 
-       
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
-
-# Begin Custom Build
-InputPath=".\srclib\apr-util\apu_private.hw"
-
-".\srclib\apr-util\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy .\srclib\apr-util\apu_private.hw .\srclib\apr-util\apu_private.h >nul 
-       echo Created apr-util apu_private.h from apu_private.hw 
-       
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\server\gen_test_char.exe
 
 !IF  "$(CFG)" == "ApacheCore - Win32 Release"
@@ -218,15 +190,15 @@ SOURCE=.\server\uri_delims.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\server\http_config.c
+SOURCE=.\server\config.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\http_config.h
+SOURCE=.\server\connection.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\http_connection.c
+SOURCE=.\include\http_config.h
 # End Source File
 # Begin Source File
 
@@ -242,10 +214,6 @@ SOURCE=.\include\http_core.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\http_log.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\include\http_log.h
 # End Source File
 # Begin Source File
@@ -278,6 +246,10 @@ SOURCE=.\include\httpd.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\log.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\vhost.c
 # End Source File
 # End Group

diff --git a/httpd.dsp b/httpd.dsp
index e5afb18b7ecb5df43233840a3c51a101c8b0d3c6..56dfa35dc339f052e1a52818a299a6f3653e20dd 100644 (file)
--- a/httpd.dsp
+++ b/httpd.dsp
@@ -26,7 +26,6 @@ CFG=ApacheCore - Win32 Debug
 # PROP Scc_ProjName ""
 # PROP Scc_LocalPath ""
 CPP=cl.exe
-RSC=rc.exe
 
 !IF  "$(CFG)" == "ApacheCore - Win32 Release"
 
@@ -40,10 +39,11 @@ RSC=rc.exe
 # PROP Output_Dir "LibR"
 # PROP Intermediate_Dir "LibR"
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
+RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\srclib\apr\include" /I ".\srclib\apr-util\include" /I ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -64,10 +64,11 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "LibD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /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 ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
+RSC=rc.exe
 # ADD BASE RSC /l 0x409
 # ADD RSC /l 0x409
+# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /I ".\include" /I ".\srclib\apr\include" /I ".\os\win32" /D "NDEBUG" /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 ".\srclib\sdbm" /I ".\os\win32" /I ".\server\mpm\winnt" /I ".\srclib\expat-lite" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /FD /c
 BSC32=bscmake.exe
 # ADD BASE BSC32 /nologo
 # ADD BSC32 /nologo
@@ -119,35 +120,6 @@ SOURCE=.\os\win32\os.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=".\srclib\apr-util\apu_private.hw"
-
-!IF  "$(CFG)" == "ApacheCore - Win32 Release"
-
-# Begin Custom Build
-InputPath=".\srclib\apr-util\apu_private.hw"
-
-".\srclib\apr-util\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy .\srclib\apr-util\apu_private.hw .\srclib\apr-util\apu_private.h >nul 
-       echo Created apr-util apu_private.h from apu_private.hw 
-       
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "ApacheCore - Win32 Debug"
-
-# Begin Custom Build
-InputPath=".\srclib\apr-util\apu_private.hw"
-
-".\srclib\apr-util\apu_private.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-       copy .\srclib\apr-util\apu_private.hw .\srclib\apr-util\apu_private.h >nul 
-       echo Created apr-util apu_private.h from apu_private.hw 
-       
-# End Custom Build
-
-!ENDIF 
-
-# End Source File
-# Begin Source File
-
 SOURCE=.\server\gen_test_char.exe
 
 !IF  "$(CFG)" == "ApacheCore - Win32 Release"
@@ -218,15 +190,15 @@ SOURCE=.\server\uri_delims.h
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=.\server\http_config.c
+SOURCE=.\server\config.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\http_config.h
+SOURCE=.\server\connection.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\http_connection.c
+SOURCE=.\include\http_config.h
 # End Source File
 # Begin Source File
 
@@ -242,10 +214,6 @@ SOURCE=.\include\http_core.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\server\http_log.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\include\http_log.h
 # End Source File
 # Begin Source File
@@ -278,6 +246,10 @@ SOURCE=.\include\httpd.h
 # End Source File
 # Begin Source File
 
+SOURCE=.\server\log.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\server\vhost.c
 # End Source File
 # End Group