From fe1555a4a8d71ee2a614cf4a066cb16706d6c033 Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sun, 28 May 2000 04:03:22 +0000 Subject: [PATCH] PR: Obtained from: Submitted by: Reviewed by: Kill the Win32 library project ap.dsp and slide http_main.c from the ApacheCore.dsp into Apache.dsp - this is in prepartion of the real services update, which will move registry.c and service.c back into ApacheCore.dsp, kill both headers and incorporate their symbols into the mpm/winnt/winnt.h file. main_win32.c will die as well, with it's few remaining functions moving into the mpm. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85329 13f79535-47bb-0310-9956-ffa450edef68 --- Apache.dsp | 15 +++++++++++++-- Apache.dsw | 24 +++--------------------- ApacheCore.dsp | 46 +++++++++++++++++++++++++++++++++++++++------- httpd.dsp | 46 +++++++++++++++++++++++++++++++++++++++------- 4 files changed, 94 insertions(+), 37 deletions(-) diff --git a/Apache.dsp b/Apache.dsp index 420b458bf5..5d92f33667 100644 --- a/Apache.dsp +++ b/Apache.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "NDEBUG" # ADD RSC /l 0x809 /d "NDEBUG" @@ -67,7 +67,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./include" /I "./lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "WIN32_LEAN_AND_MEAN" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "./include" /I "./os/win32" /I "./lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "SHARED_MODULE" /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x809 /d "_DEBUG" # ADD RSC /l 0x809 /d "_DEBUG" @@ -90,6 +90,10 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" # Begin Source File +SOURCE=.\main\http_main.c +# End Source File +# Begin Source File + SOURCE=.\os\win32\main_win32.c # End Source File # Begin Source File @@ -127,6 +131,13 @@ SOURCE=.\os\win32\apache.ico # Begin Source File SOURCE=.\os\win32\apache.rc + +!IF "$(CFG)" == "Apache - Win32 Release" + +!ELSEIF "$(CFG)" == "Apache - Win32 Debug" + +!ENDIF + # End Source File # End Group # End Target diff --git a/Apache.dsw b/Apache.dsw index 78f2550473..a2379cb308 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -1,4 +1,4 @@ -Microsoft Developer Studio Workspace File, Format Version 6.00 +Microsoft Developer Studio Workspace File, Format Version 5.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### @@ -33,9 +33,6 @@ Package=<4> Project_Dep_Name aprlibdll End Project Dependency Begin Project Dependency - Project_Dep_Name ap - End Project Dependency - Begin Project Dependency Project_Dep_Name gen_test_char End Project Dependency Begin Project Dependency @@ -345,22 +342,7 @@ Package=<4> Project_Dep_Name aprlib End Project Dependency Begin Project Dependency - Project_Dep_Name ap - End Project Dependency -}}} - -############################################################################### - -Project: "ap"=".\ap\ap.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ - Begin Project Dependency - Project_Dep_Name aprlib + Project_Dep_Name ApacheCore End Project Dependency }}} @@ -456,7 +438,7 @@ Package=<4> Project_Dep_Name aprlib End Project Dependency Begin Project Dependency - Project_Dep_Name ap + Project_Dep_Name ApacheCore End Project Dependency }}} diff --git a/ApacheCore.dsp b/ApacheCore.dsp index 4ec81c45d8..91db90b7c6 100644 --- a/ApacheCore.dsp +++ b/ApacheCore.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "API_EXPORT_SYMBOLS" /D "AP_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "os/win32" /I "lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore -# ADD LINK32 aprlib.lib ap.lib pcre.lib pcreposix.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"lib\pcre\LibR" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "API_EXPORT_SYMBOLS" /D "AP_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "os/win32" /I "lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -95,6 +95,18 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" # Begin Source File +SOURCE=.\ap\ap_base64.c +# End Source File +# Begin Source File + +SOURCE=.\ap\ap_hooks.c +# End Source File +# Begin Source File + +SOURCE=.\ap\ap_sha1.c +# End Source File +# Begin Source File + SOURCE=.\ApacheCore.def # End Source File # Begin Source File @@ -123,10 +135,6 @@ SOURCE=.\main\http_log.c # End Source File # Begin Source File -SOURCE=.\main\http_main.c -# End Source File -# Begin Source File - SOURCE=.\main\http_protocol.c # End Source File # Begin Source File @@ -267,6 +275,18 @@ SOURCE=.\modules\mpm\winnt\winnt.c # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" # Begin Source File +SOURCE=.\include\ap_base64.h +# End Source File +# Begin Source File + +SOURCE=.\include\ap_config.h +# End Source File +# Begin Source File + +SOURCE=.\include\ap_ctype.h +# End Source File +# Begin Source File + SOURCE=.\include\ap_hooks.h # End Source File # Begin Source File @@ -283,6 +303,18 @@ SOURCE=.\include\ap_md5.h # End Source File # Begin Source File +SOURCE=.\include\ap_mmn.h +# End Source File +# Begin Source File + +SOURCE=.\include\ap_mpm.h +# End Source File +# Begin Source File + +SOURCE=.\include\ap_sha1.h +# End Source File +# Begin Source File + SOURCE=.\include\buff.h # End Source File # Begin Source File diff --git a/httpd.dsp b/httpd.dsp index 4ec81c45d8..91db90b7c6 100644 --- a/httpd.dsp +++ b/httpd.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "NDEBUG" /D "API_EXPORT_SYMBOLS" /D "AP_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "os/win32" /I "lib/apr/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "NDEBUG" /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 @@ -54,7 +54,7 @@ BSC32=bscmake.exe # ADD BSC32 /nologo LINK32=link.exe # ADD BASE LINK32 aprlib.lib ap.lib pcreposix.lib pcre.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"regex\release" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore -# ADD LINK32 aprlib.lib ap.lib pcre.lib pcreposix.lib kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /libpath:"lib\apr\Release" /libpath:"lib\pcre\LibR" /libpath:"ap\Release" /base:@"os\win32\BaseAddr.ref",ApacheCore +# ADD LINK32 kernel32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll /map /machine:I386 /base:@"os\win32\BaseAddr.ref",ApacheCore !ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c -# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I ".\include" /I ".\lib\apr\include" /I ".\os\win32" /D "_DEBUG" /D "API_EXPORT_SYMBOLS" /D "AP_EXPORT_SYMBOLS" /D "WIN32" /D "_WINDOWS" /D "WIN32_LEAN_AND_MEAN" /FD /c +# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "os/win32" /I "lib/apr/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "API_EXPORT_SYMBOLS" /FD /c # SUBTRACT CPP /YX # ADD BASE MTL /nologo /D "_DEBUG" /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 @@ -95,6 +95,18 @@ LINK32=link.exe # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" # Begin Source File +SOURCE=.\ap\ap_base64.c +# End Source File +# Begin Source File + +SOURCE=.\ap\ap_hooks.c +# End Source File +# Begin Source File + +SOURCE=.\ap\ap_sha1.c +# End Source File +# Begin Source File + SOURCE=.\ApacheCore.def # End Source File # Begin Source File @@ -123,10 +135,6 @@ SOURCE=.\main\http_log.c # End Source File # Begin Source File -SOURCE=.\main\http_main.c -# End Source File -# Begin Source File - SOURCE=.\main\http_protocol.c # End Source File # Begin Source File @@ -267,6 +275,18 @@ SOURCE=.\modules\mpm\winnt\winnt.c # PROP Default_Filter "h;hpp;hxx;hm;inl;fi;fd" # Begin Source File +SOURCE=.\include\ap_base64.h +# End Source File +# Begin Source File + +SOURCE=.\include\ap_config.h +# End Source File +# Begin Source File + +SOURCE=.\include\ap_ctype.h +# End Source File +# Begin Source File + SOURCE=.\include\ap_hooks.h # End Source File # Begin Source File @@ -283,6 +303,18 @@ SOURCE=.\include\ap_md5.h # End Source File # Begin Source File +SOURCE=.\include\ap_mmn.h +# End Source File +# Begin Source File + +SOURCE=.\include\ap_mpm.h +# End Source File +# Begin Source File + +SOURCE=.\include\ap_sha1.h +# End Source File +# Begin Source File + SOURCE=.\include\buff.h # End Source File # Begin Source File -- 2.50.1