Follow up to r1768070, wire mod_socache_redis into windows build schemes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1774657 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Apache-apr2.dsw b/Apache-apr2.dsw
index c552a21280d6ac4b3f6f3a8477b4b1951517e6e4..6182f98671592bc0ef034a50b2735a8eeef25f34 100644 (file)
--- a/Apache-apr2.dsw
+++ b/Apache-apr2.dsw
@@ -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
@@ -2864,6 +2867,24 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_socache_redis"=.\modules\cache\mod_socache_redis.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_speling"=.\modules\mappers\mod_speling.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/Apache.dsw b/Apache.dsw
index 0df73f66e778a36ca5736260d08309fd099a303c..74a7051fab058bc55fce56444620399a0ebd2b20 100644 (file)
--- a/Apache.dsw
+++ b/Apache.dsw
@@ -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
@@ -3353,6 +3356,27 @@ Package=<4>
 
 ###############################################################################
 
+Project: "mod_socache_redis"=.\modules\cache\mod_socache_redis.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_speling"=.\modules\mappers\mod_speling.dsp - Package Owner=<4>
 
 Package=<5>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 890618f4657c3e33668215886918bd44750bb1d0..bd51d9a5be065f6498ad12f001e7f335d49debad 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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"

diff --git a/Makefile.win b/Makefile.win
index 1afb48761c66a4c32373e8c039e2291861c35d33..9d261ae3df99c2d0479754ecf9cd2e7b9853634a 100644 (file)
--- a/Makefile.win
+++ b/Makefile.win
@@ -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