[CalendarServer-changes] [2697] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 2697
          http://trac.macosforge.org/projects/calendarserver/changeset/2697
Author:   wsanchez at apple.com
Date:     2008-07-11 19:07:24 -0700 (Fri, 11 Jul 2008)
Log Message:
-----------
Only build memcached if we can't find it in your PATH.

Modified Paths:
--------------
    CalendarServer/trunk/conf/caldavd-test.plist
    CalendarServer/trunk/run
    CalendarServer/trunk/twistedcaldav/config.py

Modified: CalendarServer/trunk/conf/caldavd-test.plist
===================================================================
--- CalendarServer/trunk/conf/caldavd-test.plist	2008-07-11 20:13:33 UTC (rev 2696)
+++ CalendarServer/trunk/conf/caldavd-test.plist	2008-07-12 02:07:24 UTC (rev 2697)
@@ -486,7 +486,8 @@
     <key>MaxClients</key>
     <integer>5</integer>
     <key>memcached</key>
-    <string>../memcached-1.2.5/_root/bin/memcached</string>
+    <string>memcached</string> <!-- Find in PATH -->
+    <!-- <string>../memcached-1.2.5/_root/bin/memcached</string> --> <!-- If memcached was build by run script -->
     <key>Options</key>
     <array>
       <!--<string>-vv</string>-->

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2008-07-11 20:13:33 UTC (rev 2696)
+++ CalendarServer/trunk/run	2008-07-12 02:07:24 UTC (rev 2697)
@@ -173,8 +173,8 @@
   local key="$1"; shift;
 
   # FIXME: This only works for simple values (no arrays, dicts)
-  tr '\n' ' ' < "${config}"                                                    \
-    | xpath "/plist/dict/*[preceding-sibling::key[1]='${key}'" 2>/dev/null \
+  tr '\n' ' ' < "${config}"                                                 \
+    | xpath "/plist/dict/*[preceding-sibling::key[1]='${key}'" 2> /dev/null \
     | sed -n 's|^<[^<][^<]*>\([^<]*\)</[^<][^<]*>.*$|\1|p';
 }
 
@@ -215,7 +215,7 @@
   install="$(pwd)/${install}";
 fi;
 
-svn_uri_base="$(svn info "${caldav}" --xml 2>/dev/null | sed -n 's|^.*<root>\(.*\)</root>.*$|\1|p')";
+svn_uri_base="$(svn info "${caldav}" --xml 2> /dev/null | sed -n 's|^.*<root>\(.*\)</root>.*$|\1|p')";
 
 if [ -z "${svn_uri_base}" ]; then
   svn_uri_base="http://svn.calendarserver.org/repository/calendarserver";
@@ -539,42 +539,44 @@
   export PYTHONPATH="${PYTHONPATH}:${select26}/build/${py_platform_libdir}";
 fi;
 
-#
-# libevent
-#
-libevent="${top}/libevent-1.4.4-stable"
+if ! type memcached >& /dev/null; then
+  #
+  # libevent
+  #
+  libevent="${top}/libevent-1.4.4-stable"
 
-www_get "libevent" "${libevent}" http://www.monkey.org/~provos/libevent-1.4.4-stable.tar.gz
+  www_get "libevent" "${libevent}" http://www.monkey.org/~provos/libevent-1.4.4-stable.tar.gz
 
-if "${do_setup}" && (
-  "${force_setup}" || [ ! -d "${libevent}/_root" ]
-); then
-  echo "";
-  echo "Building libevent...";
-  cd "${libevent}";
-  ./configure --prefix="${libevent}/_root";
-  make CFLAGS=-m64;
-  make install;
-fi;
+  if "${do_setup}" && (
+    "${force_setup}" || [ ! -d "${libevent}/_root" ]
+  ); then
+    echo "";
+    echo "Building libevent...";
+    cd "${libevent}";
+    ./configure --prefix="${libevent}/_root";
+    make;
+    make install;
+  fi;
 
-#
-# memcached
-#
-memcached="${top}/memcached-1.2.5"
+  #
+  # memcached
+  #
+  memcached="${top}/memcached-1.2.5"
 
-www_get "memcached" "${memcached}" http://www.danga.com/memcached/dist/memcached-1.2.5.tar.gz;
+  www_get "memcached" "${memcached}" http://www.danga.com/memcached/dist/memcached-1.2.5.tar.gz;
 
-if "${do_setup}" && (
-  "${force_setup}" || [ ! -d "${memcached}/_root" ]
-); then
-  echo "";
-  echo "Building memcached...";
-  cd "${memcached}";
-  ./configure --prefix="${memcached}/_root" \
-              --with-libevent="${libevent}/_root" \
-              --enable-threads CFLAGS=-m64;
-  make CFLAGS=-m64;
-  make install;
+  if "${do_setup}" && (
+    "${force_setup}" || [ ! -d "${memcached}/_root" ]
+  ); then
+    echo "";
+    echo "Building memcached...";
+    cd "${memcached}";
+    ./configure --prefix="${memcached}/_root" \
+                --with-libevent="${libevent}/_root" \
+                --enable-threads CFLAGS=-m64;
+    make;
+    make install;
+  fi;
 fi;
 
 #

Modified: CalendarServer/trunk/twistedcaldav/config.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/config.py	2008-07-11 20:13:33 UTC (rev 2696)
+++ CalendarServer/trunk/twistedcaldav/config.py	2008-07-12 02:07:24 UTC (rev 2697)
@@ -256,7 +256,7 @@
         "ServerEnabled": False,
         "BindAddress": "127.0.0.1",
         "Port": 11211,
-        "memcached": "/usr/share/caldavd/bin/memcached",
+        "memcached": "memcached", # Find in PATH
         "MaxMemory": 0, # Megabytes
         "Options": [],
     },
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080711/0e123e62/attachment.html