You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by fu...@apache.org on 2011/01/26 00:05:47 UTC
svn commit: r1063507 - in /httpd/httpd/trunk: Apache.dsw Makefile.win
build/installwinconf.awk os/win32/BaseAddr.ref
Author: fuankg
Date: Tue Jan 25 23:05:46 2011
New Revision: 1063507
URL: http://svn.apache.org/viewvc?rev=1063507&view=rev
Log:
Added slotmem* modules to Win32 build.
Submitted by Gregg L. Smith - gregg AT apachehaus.com.
Modified:
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.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=1063507&r1=1063506&r2=1063507&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Tue Jan 25 23:05:46 2011
@@ -312,6 +312,12 @@ Package=<4>
Project_Dep_Name mod_setenvif
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name mod_slotmem_plain
+ End Project Dependency
+ Begin Project Dependency
+ Project_Dep_Name mod_slotmem_shm
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name mod_socache_dbm
End Project Dependency
Begin Project Dependency
@@ -2858,6 +2864,48 @@ Package=<4>
###############################################################################
+Project: "mod_slotmem_plain"=.\modules\slotmem\mod_slotmem_plain.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_slotmem_shm"=.\modules\slotmem\mod_slotmem_shm.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_socache_dbm"=.\modules\cache\mod_socache_dbm.dsp - Package Owner=<4>
Package=<5>
Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=1063507&r1=1063506&r2=1063507&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Tue Jan 25 23:05:46 2011
@@ -508,6 +508,10 @@ _build:
$(MAKE) $(MAKEOPT) -f mod_session_cookie.mak CFG="mod_session_cookie - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_session_dbd.mak CFG="mod_session_dbd - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
+ cd modules\slotmem
+ $(MAKE) $(MAKEOPT) -f mod_slotmem_plain.mak CFG="mod_slotmem_plain - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_slotmem_shm.mak CFG="mod_slotmem_shm - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ cd ..\..
!IF EXIST("srclib\openssl")
# cd modules\session
# $(MAKE) $(MAKEOPT) -f mod_session_crypto.mak CFG="mod_session_crypto - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -736,6 +740,8 @@ _copybin:
copy modules\session\$(LONG)\mod_session.$(src_so) "$(inst_so)" <.y
copy modules\session\$(LONG)\mod_session_cookie.$(src_so) "$(inst_so)" <.y
copy modules\session\$(LONG)\mod_session_dbd.$(src_so) "$(inst_so)" <.y
+ copy modules\slotmem\$(LONG)\mod_slotmem_plain.$(src_so) "$(inst_so)" <.y
+ copy modules\slotmem\$(LONG)\mod_slotmem_shm.$(src_so) "$(inst_so)" <.y
!IF EXIST("srclib\openssl")
# copy modules\session\$(LONG)\mod_session_crypto.$(src_so) "$(inst_so)" <.y
copy modules\ssl\$(LONG)\mod_ssl.$(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=1063507&r1=1063506&r2=1063507&view=diff
==============================================================================
--- httpd/httpd/trunk/build/installwinconf.awk (original)
+++ httpd/httpd/trunk/build/installwinconf.awk Tue Jan 25 23:05:46 2011
@@ -153,6 +153,8 @@ BEGIN {
print "#LoadModule reflector_module modules/mod_reflector.so" > dstfl;
print "#LoadModule rewrite_module modules/mod_rewrite.so" > dstfl;
print "LoadModule setenvif_module modules/mod_setenvif.so" > dstfl;
+ print "#LoadModule slotmem_plain_module modules/mod_slotmem_plain.so" > dstfl;
+ print "#LoadModule slotmem_shm_module modules/mod_slotmem_shm.so" > dstfl;
print "#LoadModule speling_module modules/mod_speling.so" > dstfl;
print "#LoadModule ssl_module modules/mod_ssl.so" > dstfl;
print "#LoadModule status_module modules/mod_status.so" > dstfl;
Modified: httpd/httpd/trunk/os/win32/BaseAddr.ref
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/win32/BaseAddr.ref?rev=1063507&r1=1063506&r2=1063507&view=diff
==============================================================================
--- httpd/httpd/trunk/os/win32/BaseAddr.ref (original)
+++ httpd/httpd/trunk/os/win32/BaseAddr.ref Tue Jan 25 23:05:46 2011
@@ -110,3 +110,5 @@ mod_proxy_scgi.so 0x6F7C0000
mod_serf.so 0x6F7B0000 0x00010000
mod_reqtimeout.so 0x6F7A0000 0x00010000
mod_reflector.so 0x6F790000 0x00010000
+mod_slotmem_plain.so 0x6F780000 0x00010000
+mod_slotmem_shm.so 0x6F770000 0x00010000