[CalendarServer-changes] [3878] CalendarServer/trunk/run

source_changes at macosforge.org source_changes at macosforge.org
Tue Mar 17 11:38:57 PDT 2009


Revision: 3878
          http://trac.macosforge.org/projects/calendarserver/changeset/3878
Author:   wsanchez at apple.com
Date:     2009-03-17 11:38:57 -0700 (Tue, 17 Mar 2009)
Log Message:
-----------
Build things with -q all the time instead of checking for the build dir.

Modified Paths:
--------------
    CalendarServer/trunk/run

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2009-03-17 18:34:46 UTC (rev 3877)
+++ CalendarServer/trunk/run	2009-03-17 18:38:57 UTC (rev 3878)
@@ -243,7 +243,7 @@
 fi;
 
 ##
-# Download and set up dependancies
+# Routines
 ##
 
 run () {
@@ -252,6 +252,7 @@
     exit 0;
   fi;
 
+  echo "";
   echo "Using ${python} as Python";
 
   if "${do_run}"; then
@@ -271,6 +272,7 @@
     fi;
 
     echo "";
+    echo "Starting server...";
     exec ${caldavd_wrapper_command}                   \
         "${caldav}/bin/caldavd" ${daemonize}          \
         -f "${config}"                                \
@@ -442,13 +444,11 @@
     local     path="$1"; shift;
     local optional="$1"; shift;
 
-    if "${do_setup}" && (
-        "${force_setup}" || [ ! -d "${path}/build/${py_platform_libdir}" ]
-    ); then
+    if "${do_setup}"; then
       echo "";
       echo "Building ${name}...";
       cd "${path}";
-      if ! "${python}" ./setup.py build --build-lib "build/${py_platform_libdir}" "$@"; then
+      if ! "${python}" ./setup.py -q build --build-lib "build/${py_platform_libdir}" "$@"; then
           if "${optional}"; then
               echo "WARNING: ${name} failed to build.";
               echo "WARNING: ${name} is not required to run the server; continuing without it.";
@@ -479,6 +479,10 @@
     PYTHONPATH="" "${python}" -c "import ${module}" > /dev/null 2>&1;
 }
 
+##
+# Download and set up dependancies
+##
+
 #
 # Zope Interface
 #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090317/56bd1209/attachment.html>


More information about the calendarserver-changes mailing list