You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2016/12/16 19:58:03 UTC
svn commit: r1774657 - in /httpd/httpd/trunk: Apache-apr2.dsw Apache.dsw
CMakeLists.txt Makefile.win
Author: wrowe
Date: Fri Dec 16 19:58:03 2016
New Revision: 1774657
URL: http://svn.apache.org/viewvc?rev=1774657&view=rev
Log:
Follow up to r1768070, wire mod_socache_redis into windows build schemes
Modified:
httpd/httpd/trunk/Apache-apr2.dsw
httpd/httpd/trunk/Apache.dsw
httpd/httpd/trunk/CMakeLists.txt
httpd/httpd/trunk/Makefile.win
Modified: httpd/httpd/trunk/Apache-apr2.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache-apr2.dsw?rev=1774657&r1=1774656&r2=1774657&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache-apr2.dsw (original)
+++ httpd/httpd/trunk/Apache-apr2.dsw Fri Dec 16 19:58:03 2016
@@ -348,6 +348,9 @@ Package=<4>
Project_Dep_Name mod_socache_shmcb
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name mod_socache_redis
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name mod_speling
End Project Dependency
Begin Project Dependency
@@ -2850,6 +2853,24 @@ Project: "mod_socache_shmcb"=.\modules\c
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_socache_redis"=.\modules\cache\mod_socache_redis.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
}}}
Package=<4>
Modified: httpd/httpd/trunk/Apache.dsw
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Apache.dsw?rev=1774657&r1=1774656&r2=1774657&view=diff
==============================================================================
--- httpd/httpd/trunk/Apache.dsw (original)
+++ httpd/httpd/trunk/Apache.dsw Fri Dec 16 19:58:03 2016
@@ -363,6 +363,9 @@ Package=<4>
Project_Dep_Name mod_socache_shmcb
End Project Dependency
Begin Project Dependency
+ Project_Dep_Name mod_socache_redis
+ End Project Dependency
+ Begin Project Dependency
Project_Dep_Name mod_speling
End Project Dependency
Begin Project Dependency
@@ -3336,6 +3339,27 @@ Project: "mod_socache_shmcb"=.\modules\c
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_redis"=.\modules\cache\mod_socache_redis.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
}}}
Package=<4>
Modified: httpd/httpd/trunk/CMakeLists.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CMakeLists.txt?rev=1774657&r1=1774656&r2=1774657&view=diff
==============================================================================
--- httpd/httpd/trunk/CMakeLists.txt (original)
+++ httpd/httpd/trunk/CMakeLists.txt Fri Dec 16 19:58:03 2016
@@ -278,6 +278,7 @@ SET(MODULE_LIST
"modules/cache/mod_socache_dc+O+distcache small object cache provider"
"modules/cache/mod_socache_memcache+I+memcache small object cache provider"
"modules/cache/mod_socache_shmcb+I+ shmcb small object cache provider"
+ "modules/cache/mod_socache_redis+I+redis small object cache provider"
"modules/cluster/mod_heartbeat+I+Generates Heartbeats"
"modules/cluster/mod_heartmonitor+I+Collects Heartbeats"
"modules/core/mod_macro+I+Define and use macros in configuration files"
Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/Makefile.win?rev=1774657&r1=1774656&r2=1774657&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Fri Dec 16 19:58:03 2016
@@ -473,6 +473,7 @@ _build:
# $(MAKE) $(MAKEOPT) -f mod_socache_dc.mak CFG="mod_socache_dc - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_socache_memcache.mak CFG="mod_socache_memcache - Win32 $(LONG)" RECURSE=0 $(CTARGET)
$(MAKE) $(MAKEOPT) -f mod_socache_shmcb.mak CFG="mod_socache_shmcb - Win32 $(LONG)" RECURSE=0 $(CTARGET)
+ $(MAKE) $(MAKEOPT) -f mod_socache_redis.mak CFG="mod_socache_redis - Win32 $(LONG)" RECURSE=0 $(CTARGET)
cd ..\..
cd modules\core
$(MAKE) $(MAKEOPT) -f mod_macro.mak CFG="mod_macro - Win32 $(LONG)" RECURSE=0 $(CTARGET)
@@ -784,6 +785,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\cache\$(LONG)\mod_socache_redis.$(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