httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gsm...@apache.org
Subject svn commit: r1418867 - in /httpd/httpd/trunk: Apache-apr2.dsw Apache.dsw Makefile.win build/installwinconf.awk modules/aaa/mod_allowhandlers.dsp os/win32/BaseAddr.ref
Date Sun, 09 Dec 2012 09:46:48 GMT
Author: gsmith
Date: Sun Dec  9 09:46:47 2012
New Revision: 1418867

URL: http://svn.apache.org/viewvc?rev=1418867&view=rev
Log:
Add mod_allowhandlers to Windows build

Added:
    httpd/httpd/trunk/modules/aaa/mod_allowhandlers.dsp   (with props)
Modified:
    httpd/httpd/trunk/Apache-apr2.dsw
    httpd/httpd/trunk/Apache.dsw
    httpd/httpd/trunk/Makefile.win
    httpd/httpd/trunk/build/installwinconf.awk
    httpd/httpd/trunk/os/win32/BaseAddr.ref

Modified: httpd/httpd/trunk/Apache-apr2.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache-apr2.dsw?rev=1418867&r1=1418866&r2=1418867&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache-apr2.dsw (original)
+++ httpd/httpd/trunk/Apache-apr2.dsw Sun Dec  9 09:46:47 2012
@@ -99,6 +99,9 @@ Package=<4>
     Project_Dep_Name mod_alias
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_allowhandlers
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_allowmethods
     End Project Dependency
     Begin Project Dependency
@@ -792,6 +795,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_allowhandlers"=.\modules\aaa\mod_allowhandlers.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_allowmethods"=.\modules\aaa\mod_allowmethods.dsp - Package Owner=<4>
 
 Package=<5>

Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=1418867&r1=1418866&r2=1418867&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Sun Dec  9 09:46:47 2012
@@ -111,6 +111,9 @@ Package=<4>
     Project_Dep_Name mod_alias
     End Project Dependency
     Begin Project Dependency
+    Project_Dep_Name mod_allowhandlers
+    End Project Dependency
+    Begin Project Dependency
     Project_Dep_Name mod_allowmethods
     End Project Dependency
     Begin Project Dependency
@@ -966,6 +969,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_allowhandlers"=.\modules\aaa\mod_allowhandlers.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_allowmethods"=.\modules\aaa\mod_allowmethods.dsp - Package Owner=<4>
 
 Package=<5>

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=1418867&r1=1418866&r2=1418867&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Sun Dec  9 09:46:47 2012
@@ -408,6 +408,7 @@ _build:
 	cd ..\..
 	cd modules\aaa
 	 $(MAKE) $(MAKEOPT) -f mod_access_compat.mak CFG="mod_access_compat - Win32 $(LONG)" RECURSE=0
$(CTARGET)
+	 $(MAKE) $(MAKEOPT) -f mod_allowhandlers.mak CFG="mod_allowhandlers - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_allowmethods.mak CFG="mod_allowmethods - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_auth_basic.mak  CFG="mod_auth_basic - Win32 $(LONG)" RECURSE=0
$(CTARGET)
 	 $(MAKE) $(MAKEOPT) -f mod_auth_digest.mak CFG="mod_auth_digest - Win32 $(LONG)" RECURSE=0
$(CTARGET)
@@ -700,6 +701,7 @@ _copybin:
 !ENDIF
 	copy srclib\pcre\pcre.$(src_dll)			"$(inst_dll)" <.y
 	copy modules\aaa\$(LONG)\mod_access_compat.$(src_so) 	"$(inst_so)" <.y
+	copy modules\aaa\$(LONG)\mod_allowhandlers.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_allowmethods.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_auth_basic.$(src_so) 	"$(inst_so)" <.y
 	copy modules\aaa\$(LONG)\mod_auth_digest.$(src_so) 	"$(inst_so)" <.y

Modified: httpd/httpd/trunk/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/build/installwinconf.awk?rev=1418867&r1=1418866&r2=1418867&view=diff
==============================================================================
--- httpd/httpd/trunk/build/installwinconf.awk (original)
+++ httpd/httpd/trunk/build/installwinconf.awk Sun Dec  9 09:46:47 2012
@@ -96,6 +96,7 @@ BEGIN {
           print "LoadModule access_compat_module modules/mod_access_compat.so" > dstfl;
           print "LoadModule actions_module modules/mod_actions.so" > dstfl;
           print "LoadModule alias_module modules/mod_alias.so" > dstfl;
+          print "#LoadModule allowhandlers_module modules/mod_allowhandlers.so" > dstfl;
           print "LoadModule allowmethods_module modules/mod_allowmethods.so" > dstfl;
           print "LoadModule asis_module modules/mod_asis.so" > dstfl;
           print "LoadModule auth_basic_module modules/mod_auth_basic.so" > dstfl;

Added: httpd/httpd/trunk/modules/aaa/mod_allowhandlers.dsp
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/aaa/mod_allowhandlers.dsp?rev=1418867&view=auto
==============================================================================
--- httpd/httpd/trunk/modules/aaa/mod_allowhandlers.dsp (added)
+++ httpd/httpd/trunk/modules/aaa/mod_allowhandlers.dsp Sun Dec  9 09:46:47 2012
@@ -0,0 +1,111 @@
+# Microsoft Developer Studio Project File - Name="mod_allowhandlers" - 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_allowhandlers - Win32 Debug
+!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_allowhandlers.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_allowhandlers.mak" CFG="mod_allowhandlers - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "mod_allowhandlers - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "mod_allowhandlers - 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_allowhandlers - 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_allowhandlers_src"
/FD /c
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /fo"Release/mod_allowhandlers.res" /i "../../include" /i "../../srclib/apr/include"
/d "NDEBUG" /d BIN_NAME="mod_allowhandlers.so" /d LONG_NAME="allowhandlers_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_allowhandlers.so"
/base:@..\..\os\win32\BaseAddr.ref,mod_allowhandlers.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Release\mod_allowhandlers.so"
/base:@..\..\os\win32\BaseAddr.ref,mod_allowhandlers.so /opt:ref
+# Begin Special Build Tool
+TargetPath=.\Release\mod_allowhandlers.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_allowhandlers - 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_allowhandlers_src"
/FD /c
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /fo"Debug/mod_allowhandlers.res" /i "../../include" /i "../../srclib/apr/include"
/d "_DEBUG" /d BIN_NAME="mod_allowhandlers.so" /d LONG_NAME="allowhandlers_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_allowhandlers.so"
/base:@..\..\os\win32\BaseAddr.ref,mod_allowhandlers.so
+# ADD LINK32 kernel32.lib /nologo /subsystem:windows /dll /incremental:no /debug /out:".\Debug\mod_allowhandlers.so"
/base:@..\..\os\win32\BaseAddr.ref,mod_allowhandlers.so
+# Begin Special Build Tool
+TargetPath=.\Debug\mod_allowhandlers.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_allowhandlers - Win32 Release"
+# Name "mod_allowhandlers - Win32 Debug"
+# Begin Source File
+
+SOURCE=.\mod_allowhandlers.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\build\win32\httpd.rc
+# End Source File
+# End Target
+# End Project

Propchange: httpd/httpd/trunk/modules/aaa/mod_allowhandlers.dsp
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/BaseAddr.ref?rev=1418867&r1=1418866&r2=1418867&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/trunk/os/win32/BaseAddr.ref Sun Dec  9 09:46:47 2012
@@ -120,3 +120,4 @@ mod_xml2enc.so              0x6F720000  
 mod_data.so                 0x6F710000    0x00010000
 mod_allowmethods.so         0x6F700000    0x00010000
 mod_cache_socache.so        0x6F6F0000    0x00010000
+mod_allowhandlers.so        0x6F6E0000    0x00010000



Mime
View raw message