From 8e0c2d91e04ed8ffd9258564a0367377715e411a Mon Sep 17 00:00:00 2001 From: Gregg Lewis Smith Date: Mon, 21 Jan 2013 01:20:33 +0000 Subject: [PATCH] Add mod_macro to Windows build. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1436058 13f79535-47bb-0310-9956-ffa450edef68 --- Apache-apr2.dsw | 21 +++++++ Apache.dsw | 24 ++++++++ Makefile.win | 2 + build/installwinconf.awk | 1 + modules/core/mod_macro.dsp | 111 +++++++++++++++++++++++++++++++++++++ os/win32/BaseAddr.ref | 1 + 6 files changed, 160 insertions(+) create mode 100644 modules/core/mod_macro.dsp diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw index 55c0ab9e50..8c41cec044 100644 --- a/Apache-apr2.dsw +++ b/Apache-apr2.dsw @@ -255,6 +255,9 @@ Package=<4> Project_Dep_Name mod_logio End Project Dependency Begin Project Dependency + Project_Dep_Name mod_macro + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_mime End Project Dependency Begin Project Dependency @@ -2095,6 +2098,24 @@ Package=<4> ############################################################################### +Project: "mod_macro"=.\modules\core\mod_macro.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ + Begin Project Dependency + Project_Dep_Name libapr + End Project Dependency + Begin Project Dependency + Project_Dep_Name libhttpd + End Project Dependency +}}} + +############################################################################### + Project: "mod_mime"=.\modules\http\mod_mime.dsp - Package Owner=<4> Package=<5> diff --git a/Apache.dsw b/Apache.dsw index b733b3d771..52cc61eada 100644 --- a/Apache.dsw +++ b/Apache.dsw @@ -270,6 +270,9 @@ Package=<4> Project_Dep_Name mod_logio End Project Dependency Begin Project Dependency + Project_Dep_Name mod_macro + End Project Dependency + Begin Project Dependency Project_Dep_Name mod_mime End Project Dependency Begin Project Dependency @@ -2467,6 +2470,27 @@ Package=<4> ############################################################################### +Project: "mod_macro"=.\modules\core\mod_macro.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_mime"=.\modules\http\mod_mime.dsp - Package Owner=<4> Package=<5> diff --git a/Makefile.win b/Makefile.win index 4bf3abffdd..f52f90587b 100644 --- a/Makefile.win +++ b/Makefile.win @@ -446,6 +446,7 @@ _build: $(MAKE) $(MAKEOPT) -f mod_socache_shmcb.mak CFG="mod_socache_shmcb - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd modules\core + $(MAKE) $(MAKEOPT) -f mod_macro.mak CFG="mod_macro - Win32 $(LONG)" RECURSE=0 $(CTARGET) $(MAKE) $(MAKEOPT) -f mod_watchdog.mak CFG="mod_watchdog - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd modules\cluster @@ -741,6 +742,7 @@ _copybin: # copy modules\cache\$(LONG)\mod_socache_dc.$(src_so) "$(inst_so)" <.y copy modules\cache\$(LONG)\mod_socache_memcache.$(src_so) "$(inst_so)" <.y copy modules\cache\$(LONG)\mod_socache_shmcb.$(src_so) "$(inst_so)" <.y + copy modules\core\$(LONG)\mod_macro.$(src_so) "$(inst_so)" <.y copy modules\core\$(LONG)\mod_watchdog.$(src_so) "$(inst_so)" <.y copy modules\cluster\$(LONG)\mod_heartbeat.$(src_so) "$(inst_so)" <.y copy modules\cluster\$(LONG)\mod_heartmonitor.$(src_so) "$(inst_so)" <.y diff --git a/build/installwinconf.awk b/build/installwinconf.awk index 8a9cb6e912..198cf2616c 100644 --- a/build/installwinconf.awk +++ b/build/installwinconf.awk @@ -154,6 +154,7 @@ BEGIN { print "#LoadModule log_debug_module modules/mod_log_debug.so" > dstfl; print "#LoadModule log_forensic_module modules/mod_log_forensic.so" > dstfl; print "#LoadModule lua_module modules/mod_lua.so" > dstfl; + print "#LoadModule macro_module modules/mod_macro.so" > dstfl; print "LoadModule mime_module modules/mod_mime.so" > dstfl; print "#LoadModule mime_magic_module modules/mod_mime_magic.so" > dstfl; print "LoadModule negotiation_module modules/mod_negotiation.so" > dstfl; diff --git a/modules/core/mod_macro.dsp b/modules/core/mod_macro.dsp new file mode 100644 index 0000000000..e6c1a8c78e --- /dev/null +++ b/modules/core/mod_macro.dsp @@ -0,0 +1,111 @@ +# Microsoft Developer Studio Project File - Name="mod_macro" - 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_macro - 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_macro.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_macro.mak" CFG="mod_macro - Win32 Release" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "mod_macro - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") +!MESSAGE "mod_macro - 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_macro - 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 /Oy- /Zi /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Release\mod_macro_src" /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" /i "../../include" /i "../../srclib/apr/include" /d BIN_NAME="mod_macro.so" /d LONG_NAME="macro_module for Apache" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /out:".\Release\mod_macro.so" /base:@..\..\os\win32\BaseAddr.ref,mod_macro.so +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_macro.so" /base:@..\..\os\win32\BaseAddr.ref,mod_macro.so /opt:ref +# Begin Special Build Tool +TargetPath=.\Release\mod_macro.so +SOURCE="$(InputPath)" +PostBuild_Desc=Embed .manifest +PostBuild_Cmds=if exist $(TargetPath).manifest mt.exe -manifest $(TargetPath).manifest -outputresource:$(TargetPath);2 +# End Special Build Tool + +!ELSEIF "$(CFG)" == "mod_macro - 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 /EHsc /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c +# ADD CPP /nologo /MDd /W3 /EHsc /Zi /Od /I "../../include" /I "../../srclib/apr/include" /I "../../srclib/apr-util/include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /Fd"Debug\mod_macro_src" /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" /i "../../include" /i "../../srclib/apr/include" /d BIN_NAME="mod_macro.so" /d LONG_NAME="macro_module for Apache" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_macro.so" /base:@..\..\os\win32\BaseAddr.ref,mod_macro.so +# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_macro.so" /base:@..\..\os\win32\BaseAddr.ref,mod_macro.so +# Begin Special Build Tool +TargetPath=.\Debug\mod_macro.so +SOURCE="$(InputPath)" +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 "mod_macro - Win32 Release" +# Name "mod_macro - Win32 Debug" +# Begin Source File + +SOURCE=.\mod_macro.c +# End Source File +# Begin Source File + +SOURCE=..\..\build\win32\httpd.rc +# End Source File +# End Target +# End Project diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index 5589d74a16..1da0c43f66 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -121,3 +121,4 @@ mod_data.so 0x6F710000 0x00010000 mod_allowmethods.so 0x6F700000 0x00010000 mod_cache_socache.so 0x6F6F0000 0x00010000 mod_allowhandlers.so 0x6F6E0000 0x00010000 +mod_macro.so 0x6F6D0000 0x00010000 -- 2.40.0