From 10323a2306a792513063807f4fe77d60de8b069b Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Fri, 1 Nov 2002 17:55:12 +0000 Subject: [PATCH] Inject logio into the win32 build git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97376 13f79535-47bb-0310-9956-ffa450edef68 --- Apache.dsw | 24 +++++++ Makefile.win | 3 + modules/loggers/mod_logio.dsp | 128 ++++++++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+) create mode 100644 modules/loggers/mod_logio.dsp diff --git a/Apache.dsw b/Apache.dsw index 22668b6b50..1bda2f0bea 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -150,6 +150,9 @@ Package=<4> Project_Dep_Name mod_log_config End Project Dependency Begin Project Dependency + Project_Dep_Name mod_logio + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_mem_cache End Project Dependency Begin Project Dependency @@ -1251,6 +1254,27 @@ Package=<4> ############################################################################### +Project: "mod_logio"=".\modules\loggers\mod_logio.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libapr + End Project Dependency + Begin Project Dependency + Project_Dep_Name libaprutil + End Project Dependency + Begin Project Dependency + Project_Dep_Name libhttpd + End Project Dependency +}}} + +############################################################################### + Project: "mod_mem_cache"=".\modules\experimental\mod_mem_cache.dsp" - Package Owner=<4> Package=<5> diff --git a/Makefile.win b/Makefile.win index 00633710b4..1d178eb6d4 100644 --- a/Makefile.win +++ b/Makefile.win @@ -247,6 +247,7 @@ _build: cd ..\.. cd modules\loggers $(MAKE) $(MAKEOPT) -f mod_log_config.mak CFG="mod_log_config - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f mod_logio.mak CFG="mod_logio - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd modules\mappers $(MAKE) $(MAKEOPT) -f mod_actions.mak CFG="mod_actions - Win32 $(LONG)" RECURSE=0 $(CTARGET) @@ -393,6 +394,7 @@ _install: copy modules\generators\$(LONG)\mod_status.so "$(INSTDIR)\modules" <.y copy modules\http\$(LONG)\mod_mime.so "$(INSTDIR)\modules" <.y copy modules\loggers\$(LONG)\mod_log_config.so "$(INSTDIR)\modules" <.y + copy modules\loggers\$(LONG)\mod_logio.so "$(INSTDIR)\modules" <.y copy modules\mappers\$(LONG)\mod_actions.so "$(INSTDIR)\modules" <.y copy modules\mappers\$(LONG)\mod_alias.so "$(INSTDIR)\modules" <.y copy modules\mappers\$(LONG)\mod_dir.so "$(INSTDIR)\modules" <.y @@ -448,6 +450,7 @@ _install: copy modules\generators\$(LONG)\mod_status.pdb "$(INSTDIR)\modules" <.y copy modules\http\$(LONG)\mod_mime.pdb "$(INSTDIR)\modules" <.y copy modules\loggers\$(LONG)\mod_log_config.pdb "$(INSTDIR)\modules" <.y + copy modules\loggers\$(LONG)\mod_logio.pdb "$(INSTDIR)\modules" <.y copy modules\mappers\$(LONG)\mod_actions.pdb "$(INSTDIR)\modules" <.y copy modules\mappers\$(LONG)\mod_alias.pdb "$(INSTDIR)\modules" <.y copy modules\mappers\$(LONG)\mod_dir.pdb "$(INSTDIR)\modules" <.y diff --git a/modules/loggers/mod_logio.dsp b/modules/loggers/mod_logio.dsp new file mode 100644 index 0000000000..7e46a1cde1 --- /dev/null +++ b/modules/loggers/mod_logio.dsp @@ -0,0 +1,128 @@ +# Microsoft Developer Studio Project File - Name="mod_logio" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 + +CFG=mod_logio - Win32 Release +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "mod_logio.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "mod_logio.mak" CFG="mod_logio - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mod_logio - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_logio - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "mod_logio - Win32 Release" + +# 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 "WIN32" /D "NDEBUG" /D "_WINDOWS" /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" /Fd"Release\mod_logio" /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 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_logio.so" /base:@..\..\os\win32\BaseAddr.ref,mod_logio +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /map /machine:I386 /out:"Release/mod_logio.so" /base:@..\..\os\win32\BaseAddr.ref,mod_logio + +!ELSEIF "$(CFG)" == "mod_logio - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# 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" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_logio" /FD /c +# ADD BASE MTL /nologo /D "_DEBUG" /win32 +# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" +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 /machine:I386 /out:"Debug/mod_logio.so" /base:@..\..\os\win32\BaseAddr.ref,mod_logio +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /map /debug /machine:I386 /out:"Debug/mod_logio.so" /base:@..\..\os\win32\BaseAddr.ref,mod_logio + +!ENDIF + +# Begin Target + +# Name "mod_logio - Win32 Release" +# Name "mod_logio - Win32 Debug" +# Begin Source File + +SOURCE=.\mod_logio.c +# End Source File +# Begin Source File + +SOURCE=.\mod_logio.rc +# End Source File +# Begin Source File + +SOURCE=..\..\build\win32\win32ver.awk + +!IF "$(CFG)" == "mod_logio - Win32 Release" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Creating Version Resource +InputPath=..\..\build\win32\win32ver.awk + +".\mod_logio.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + awk -f ../../build/win32/win32ver.awk mod_logio "logio_module for Apache" ../../include/ap_release.h > .\mod_logio.rc + +# End Custom Build + +!ELSEIF "$(CFG)" == "mod_logio - Win32 Debug" + +# PROP Ignore_Default_Tool 1 +# Begin Custom Build - Creating Version Resource +InputPath=..\..\build\win32\win32ver.awk + +".\mod_logio.rc" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)" + awk -f ../../build/win32/win32ver.awk mod_logio "logio_module for Apache" ../../include/ap_release.h > .\mod_logio.rc + +# End Custom Build + +!ENDIF + +# End Source File +# End Target +# End Project -- 2.40.0