[CalendarServer-changes] [4620] CalendarServer/branches/egg-info-351

source_changes at macosforge.org source_changes at macosforge.org
Tue Oct 20 15:04:58 PDT 2009


Revision: 4620
          http://trac.macosforge.org/projects/calendarserver/changeset/4620
Author:   glyph at apple.com
Date:     2009-10-20 15:04:54 -0700 (Tue, 20 Oct 2009)
Log Message:
-----------
avoid unnecessary echoing, necessary for 'run -p' (and therefore ./test, ./python) to work properly.

Modified Paths:
--------------
    CalendarServer/branches/egg-info-351/run
    CalendarServer/branches/egg-info-351/support/build.sh
    CalendarServer/branches/egg-info-351/support/py.sh

Modified: CalendarServer/branches/egg-info-351/run
===================================================================
--- CalendarServer/branches/egg-info-351/run	2009-10-20 21:47:30 UTC (rev 4619)
+++ CalendarServer/branches/egg-info-351/run	2009-10-20 22:04:54 UTC (rev 4620)
@@ -1,4 +1,5 @@
 #!/bin/bash
+# -*- sh-basic-offset: 2 -*-
 
 ##
 # Copyright (c) 2005-2009 Apple Inc. All rights reserved.
@@ -106,11 +107,6 @@
 # Actually run the server.  (Or, exit, if things aren't sufficiently set up in
 # order to do that.)
 run () {
-  if "${print_path}"; then
-    echo "${PYTHONPATH}";
-    exit 0;
-  fi;
-
   echo "";
   echo "Using ${python} as Python";
 
@@ -187,6 +183,13 @@
   # possibly download and/or install) the dependencies.
   dependencies;
 
+  # Now that all the dependencies are set up, let's see if we're just being
+  # asked to print the path.
+  if "${print_path}"; then
+    echo "${PYTHONPATH}";
+    exit 0;
+  fi;
+
   # If we're installing, install the calendar server itself.
   py_install "Calendar Server" "${caldav}";
 

Modified: CalendarServer/branches/egg-info-351/support/build.sh
===================================================================
--- CalendarServer/branches/egg-info-351/support/build.sh	2009-10-20 21:47:30 UTC (rev 4619)
+++ CalendarServer/branches/egg-info-351/support/build.sh	2009-10-20 22:04:54 UTC (rev 4620)
@@ -355,11 +355,11 @@
   if "${override_system}" || ! py_have_module "${module}"; then
     "${get_type}_get" "${name}" "${srcdir}" "${get_uri}" "${revision}"
     if "${inplace}"; then
-      if "${override_system}" && ! "${skip_egg}"; then
+      if "${do_setup}" && "${override_system}" && ! "${skip_egg}"; then
         echo;
         echo "Building ${name}... [overrides system, building egg-info metadata only]";
         cd "${srcdir}";
-        "${python}" ./setup.py -q egg_info 2>| grep -v 'Unrecognized .svn/entries';
+        "${python}" ./setup.py -q egg_info 2>&1 | grep -v 'Unrecognized .svn/entries';
         cd /;
       fi;
     else
@@ -497,7 +497,6 @@
   # Tool dependencies.  The code itself doesn't depend on these, but you probably want them.
   svn_get "CalDAVTester" "${top}/CalDAVTester" "${svn_uri_base}/CalDAVTester/trunk" 4517;
   svn_get "Pyflakes" "${top}/Pyflakes" http://divmod.org/svn/Divmod/trunk/Pyflakes 17198;
-  echo 'Dependencies done.';
 }
 
 

Modified: CalendarServer/branches/egg-info-351/support/py.sh
===================================================================
--- CalendarServer/branches/egg-info-351/support/py.sh	2009-10-20 21:47:30 UTC (rev 4619)
+++ CalendarServer/branches/egg-info-351/support/py.sh	2009-10-20 22:04:54 UTC (rev 4620)
@@ -88,8 +88,6 @@
   if [ -z "${python:-}" ]; then
     echo "No suitable python found. Python 2.5 is required.";
     exit 1;
-  else
-    echo "Using ${python} as Python";
   fi
 
          py_platform="$("${python}" -c "from distutils.util import get_platform; print get_platform()")";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20091020/84209155/attachment-0001.html>


More information about the calendarserver-changes mailing list