You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by gs...@apache.org on 2013/03/27 19:45:48 UTC

svn commit: r1461781 - in /httpd/httpd/branches/2.4.x: ./ Apache-apr2.dsw Apache.dsw Makefile.win build/installwinconf.awk modules/core/mod_macro.dsp os/win32/BaseAddr.ref

Author: gsmith
Date: Wed Mar 27 18:45:47 2013
New Revision: 1461781

URL: http://svn.apache.org/r1461781
Log:
Add mod_macro to Windows Build. merge/backport r1436058

Added:
    httpd/httpd/branches/2.4.x/modules/core/mod_macro.dsp
      - copied unchanged from r1436058, httpd/httpd/trunk/modules/core/mod_macro.dsp
Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/Apache-apr2.dsw
    httpd/httpd/branches/2.4.x/Apache.dsw
    httpd/httpd/branches/2.4.x/Makefile.win
    httpd/httpd/branches/2.4.x/build/installwinconf.awk
    httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1436058

Modified: httpd/httpd/branches/2.4.x/Apache-apr2.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Apache-apr2.dsw?rev=1461781&r1=1461780&r2=1461781&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Apache-apr2.dsw (original)
+++ httpd/httpd/branches/2.4.x/Apache-apr2.dsw Wed Mar 27 18:45:47 2013
@@ -249,6 +249,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
@@ -2050,6 +2053,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>

Modified: httpd/httpd/branches/2.4.x/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Apache.dsw?rev=1461781&r1=1461780&r2=1461781&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Apache.dsw (original)
+++ httpd/httpd/branches/2.4.x/Apache.dsw Wed Mar 27 18:45:47 2013
@@ -264,6 +264,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
@@ -2416,6 +2419,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>

Modified: httpd/httpd/branches/2.4.x/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/Makefile.win?rev=1461781&r1=1461780&r2=1461781&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/Makefile.win (original)
+++ httpd/httpd/branches/2.4.x/Makefile.win Wed Mar 27 18:45:47 2013
@@ -414,6 +414,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
@@ -694,6 +695,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

Modified: httpd/httpd/branches/2.4.x/build/installwinconf.awk
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/build/installwinconf.awk?rev=1461781&r1=1461780&r2=1461781&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/build/installwinconf.awk (original)
+++ httpd/httpd/branches/2.4.x/build/installwinconf.awk Wed Mar 27 18:45:47 2013
@@ -151,6 +151,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;

Modified: httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref?rev=1461781&r1=1461780&r2=1461781&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/branches/2.4.x/os/win32/BaseAddr.ref Wed Mar 27 18:45:47 2013
@@ -118,3 +118,4 @@ mod_proxy_html.so           0x6F740000  
 mod_xml2enc.so              0x6F730000    0x00010000
 mod_data.so                 0x6F720000    0x00010000
 mod_allowmethods.so         0x6F710000    0x00010000
+mod_macro.so                0x6F700000    0x00010000