X-Git-Url: https://granicus.if.org/sourcecode?a=blobdiff_plain;f=libhttpd.dsp;h=ae4b17bedeb5440a6773ee5b338397c7b3854f82;hb=eee5bc3f1f9126baf340775c77a6d9900ef36473;hp=01d7524fdedf62b69c3ae028b3340ed7757b5b0a;hpb=bc8cdc7896dbff2f4dd4af5df3cc8c5a409f7291;p=apache diff --git a/libhttpd.dsp b/libhttpd.dsp index 01d7524fde..ae4b17bede 100644 --- a/libhttpd.dsp +++ b/libhttpd.dsp @@ -19,6 +19,7 @@ CFG=libhttpd - Win32 Release !MESSAGE !MESSAGE "libhttpd - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "libhttpd - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "libhttpd - Win32 Lexical" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE # Begin Project @@ -97,12 +98,48 @@ PostBuild_Desc=Embed .manifest PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 # End Special Build Tool +!ELSEIF "$(CFG)" == "libhttpd - Win32 Lexical" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Ignore_Export_Lib 0 +# PROP Target_Dir "" +# 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 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd_cl" /FD /c +# ADD BASE MTL /nologo /D "NDEBUG" /win32 +# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /fo"Release/libhttpd.res" /i "./include" /i "./srclib/apr/include" /d "NDEBUG" /d BIN_NAME="libhttpd.dll" /d LONG_NAME="Apache HTTP Server Core" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib /nologo /subsystem:windows /dll +# ADD LINK32 pcre.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib mswsock.lib "Release\buildmark.obj" /nologo /subsystem:windows /dll /debug /libpath:"./srclib/pcre" /base:@"os\win32\BaseAddr.ref",libhttpd.dll /opt:ref +# Begin Special Build Tool +TargetPath=.\Release\libhttpd.dll +SOURCE="$(InputPath)" +PreLink_Desc=Compiling buildmark +PreLink_Cmds=cl.exe /nologo /MD /W3 /O2 /Oy- /Zi /I "./include" /I "./srclib/apr/include" /I "./srclib/apr-util/include" /I "./srclib/pcre" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "AP_DECLARE_EXPORT" /Fd"Release\libhttpd" /FD /c server\buildmark.c /Fo"Release\buildmark.obj" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +# End Special Build Tool + + !ENDIF # Begin Target # Name "libhttpd - Win32 Release" # Name "libhttpd - Win32 Debug" +# Name "libhttpd - Win32 Lexical" # Begin Group "headers" # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" @@ -164,6 +201,35 @@ SOURCE=.\include\httpd.h # End Source File # Begin Source File +SOURCE=.\os\win32\win32_config_layout.h + +!IF "$(CFG)" == "libhttpd - Win32 Release" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Creating include/ap_config_layout.h +InputPath=.\os\win32\win32_config_layout.h + +".\include\ap_config_layout.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + type .\os\win32\win32_config_layout.h > .\include\ap_config_layout.h + +# End Custom Build + +!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Creating include/ap_config_layout.h +InputPath=.\os\win32\win32_config_layout.h + +".\include\ap_config_layout.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + type .\os\win32\win32_config_layout.h > .\include\ap_config_layout.h + +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\modules\generators\mod_cgi.h !IF "$(CFG)" == "libhttpd - Win32 Release" @@ -419,7 +485,7 @@ SOURCE=.\server\vhost.c # PROP Default_Filter "" # Begin Source File -SOURCE=.\modules\mappers\mod_so.c +SOURCE=.\modules\core\mod_so.c # End Source File # Begin Source File @@ -479,7 +545,35 @@ SOURCE=.\include\util_ebcdic.h # End Source File # Begin Source File -SOURCE=.\server\util_expr.c +SOURCE=.\server\util_expr_private.h +# End Source File +# Begin Source File + +SOURCE=.\server\util_expr_eval.c +# End Source File +# Begin Source File + +SOURCE=.\server\util_expr_scan.h +# End Source File +# Begin Source File + +SOURCE=.\server\util_expr_scan.c +# End Source File +# Begin Source File + +SOURCE=.\server\util_expr_parse.h +# End Source File +# Begin Source File + +SOURCE=.\server\util_expr_parse.c +# End Source File +# Begin Source File + +SOURCE=.\server\util_fcgi.c +# End Source File +# Begin Source File + +SOURCE=.\include\util_fcgi.h # End Source File # Begin Source File @@ -511,6 +605,10 @@ SOURCE=.\server\util_pcre.c # End Source File # Begin Source File +SOURCE=.\server\util_regex.c +# End Source File +# Begin Source File + SOURCE=.\server\util_script.c # End Source File # Begin Source File @@ -523,6 +621,10 @@ SOURCE=.\server\util_time.c # End Source File # Begin Source File +SOURCE=.\include\util_varbuf.h +# End Source File +# Begin Source File + SOURCE=.\os\win32\util_win32.c # End Source File # Begin Source File @@ -569,30 +671,6 @@ SOURCE=.\include\mpm_common.h SOURCE=.\server\mpm\winnt\mpm_default.h -!IF "$(CFG)" == "libhttpd - Win32 Release" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating include/mpm_default.h -InputPath=.\server\mpm\winnt\mpm_default.h - -".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\server\mpm\winnt\mpm_default.h > .\include\mpm_default.h - -# End Custom Build - -!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" - -# PROP Ignore_Default_Tool 1 -# Begin Custom Build - Creating include/mpm_default.h -InputPath=.\server\mpm\winnt\mpm_default.h - -".\include\mpm_default.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" - type .\server\mpm\winnt\mpm_default.h > .\include\mpm_default.h - -# End Custom Build - -!ENDIF - # End Source File # Begin Source File @@ -651,9 +729,82 @@ InputPath=.\server\gen_test_char.exe # End Custom Build +!ELSEIF "$(CFG)" == "libhttpd - Win32 Lexical" + +# PROP Ignore_Default_Tool 1 +USERDEP__GEN_T=".\include\os.h" +# Begin Custom Build - Generating test_char.h from gen_test_char.exe +InputPath=.\server\gen_test_char.exe + +".\server\test_char.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + .\server\gen_test_char.exe >.\server\test_char.h + +# End Custom Build + !ENDIF # End Source File +# Begin Group "Generated Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\server\util_expr_parse.y + +!IF "$(CFG)" == "libhttpd - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "libhttpd - Win32 Lexical" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Generating util_expr_parse.c/.h from util_expr_parse.y +InputPath=.\server\util_expr_parse.y + +BuildCmds= \ + bison -pap_expr_yy --defines=.\server\util_expr_parse.h -o .\server\util_expr_parse.c .\server\util_expr_parse.y + +".\server\util_expr_parse.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) + +".\server\util_expr_parse.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + $(BuildCmds) +# End Custom Build + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\server\util_expr_scan.l + +!IF "$(CFG)" == "libhttpd - Win32 Release" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "libhttpd - Win32 Debug" + +# PROP Exclude_From_Build 1 + +!ELSEIF "$(CFG)" == "libhttpd - Win32 Lexical" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Generating util_expr_scan.c from util_expr_scan.l +InputPath=.\server\util_expr_scan.l + +".\server\util_expr_scan.c" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + flex -Pap_expr_yy -o .\server\util_expr_scan.c .\server\util_expr_scan.l + +# End Custom Build + +!ENDIF + +# End Source File +# End Group # Begin Source File SOURCE=.\build\win32\httpd.rc