[CalendarServer-changes] [5473] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 5473
          http://trac.macosforge.org/projects/calendarserver/changeset/5473
Author:   wsanchez at apple.com
Date:     2010-04-12 15:00:08 -0700 (Mon, 12 Apr 2010)
Log Message:
-----------
Don't assume that twistd is in ../Twisted.  Let's prepend to PATH if a built project has built a scripts directory and then rely on that.
Prepend (instead of postpend) to PYTHONPATH.

Modified Paths:
--------------
    CalendarServer/trunk/run
    CalendarServer/trunk/support/build.sh
    CalendarServer/trunk/support/py.sh

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2010-04-12 21:57:48 UTC (rev 5472)
+++ CalendarServer/trunk/run	2010-04-12 22:00:08 UTC (rev 5473)
@@ -135,7 +135,6 @@
     exec ${caldavd_wrapper_command}                   \
         "${caldav}/bin/${DAVD}davd" ${daemonize}      \
         -f "${config}"                                \
-        -T "${twisted}/bin/twistd"                    \
         -P "${plugin_name}"                           \
         -t "${service_type}"                          \
         ${reactor}                                    \

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2010-04-12 21:57:48 UTC (rev 5472)
+++ CalendarServer/trunk/support/build.sh	2010-04-12 22:00:08 UTC (rev 5473)
@@ -82,7 +82,6 @@
 
       top="$(cd "${caldav}/.." && pwd -L)";
   patches="${caldav}/lib-patches";
-  twisted="${top}/Twisted";
 
   # Find a command that can hash up a string for us
   if type -t openssl > /dev/null; then
@@ -378,12 +377,17 @@
     fi;
     py_install "${name}" "${srcdir}";
 
-    if "$inplace"; then
-      local add_path="${srcdir}";
+    if "${inplace}"; then
+      local add_pythonpath="${srcdir}";
+      local add_path="${srcdir}/bin";
     else
-      local add_path="${srcdir}/build/${py_platform_libdir}";
+      local add_pythonpath="${srcdir}/build/${py_platform_libdir}";
+      local add_path="${srcdir}/build/${py_platform_scripts}";
     fi;
-    export PYTHONPATH="${PYTHONPATH}:${add_path}";
+    export PYTHONPATH="${add_pythonpath}:${PYTHONPATH}";
+    if [ -d "${add_path}" ]; then
+      export PATH="${add_path}:${PATH}";
+    fi;
   else
     if ! "${print_path}"; then
       echo "Using system version of ${name}.";

Modified: CalendarServer/trunk/support/py.sh
===================================================================
--- CalendarServer/trunk/support/py.sh	2010-04-12 21:57:48 UTC (rev 5472)
+++ CalendarServer/trunk/support/py.sh	2010-04-12 22:00:08 UTC (rev 5473)
@@ -156,11 +156,12 @@
     exit 1;
   fi
 
-         py_platform="$("${python}" -c "from distutils.util import get_platform; print get_platform()")";
-          py_version="$(py_version "${python}")";
-  py_platform_libdir="lib.${py_platform}-${py_version}";
-           py_prefix="$("${python}" -c "import sys; print sys.prefix;")";
-           py_libdir="$("${python}" -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1);")";
+          py_platform="$("${python}" -c "from distutils.util import get_platform; print get_platform()")";
+           py_version="$(py_version "${python}")";
+   py_platform_libdir="lib.${py_platform}-${py_version}";
+  py_platform_scripts="scripts-${py_version}";
+            py_prefix="$("${python}" -c "import sys; print sys.prefix;")";
+            py_libdir="$("${python}" -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1);")";
 }
 
 init_py;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100412/a477251c/attachment.html>