[CalendarServer-changes] [1317] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1317
          http://trac.macosforge.org/projects/calendarserver/changeset/1317
Author:   wsanchez at apple.com
Date:     2007-03-05 16:33:48 -0800 (Mon, 05 Mar 2007)

Log Message:
-----------
Update setuptools.
Install setuptools egg in xattr.

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

Added Paths:
-----------
    CalendarServer/trunk/support/setuptools-0.6c5-py2.5.egg

Removed Paths:
-------------
    CalendarServer/trunk/support/setuptools-0.6c1-py2.4.egg

Modified: CalendarServer/trunk/run
===================================================================
--- CalendarServer/trunk/run	2007-03-06 00:21:26 UTC (rev 1316)
+++ CalendarServer/trunk/run	2007-03-06 00:33:48 UTC (rev 1317)
@@ -351,6 +351,14 @@
     PYTHONPATH="" "${python}" -c "import ${module}" > /dev/null 2>&1;
 }
 
+put_setuptools () {
+    local where="$1"; shift;
+
+    if ! "${disable_setup}"; then
+      cp "${caldav}/support/setuptools-0.6c5-py2.5.egg" "${where}/";
+    fi;
+}
+
 #
 # Zope Interface
 #
@@ -449,6 +457,7 @@
   xattr="${top}/xattr";
 
   svn_get "xattr" "${xattr}" http://svn.red-bean.com/bob/xattr/releases/xattr-0.4 992;
+  put_setuptools "${xattr}";
   py_build "xattr" "${xattr}" false;
   py_install "xattr" "${xattr}";
 
@@ -515,12 +524,8 @@
 esac;
 svn_uri="${base}/vobject/branches/users/cdaboo/vavailability-173";
 svn_get "vObject" "${vobject}" "${svn_uri}" 178;
+put_setuptools "${vobject}";
 
-if ! "${disable_setup}"; then
-  # Avoid having to download setuptools to build vobject
-  cp "${caldav}/support/setuptools-0.6c1-py2.4.egg" "${vobject}/";
-fi;
-
 py_install "vObject" "${vobject}";
 
 export PYTHONPATH="${PYTHONPATH}:${vobject}/src";

Deleted: CalendarServer/trunk/support/setuptools-0.6c1-py2.4.egg
===================================================================
(Binary files differ)

Added: CalendarServer/trunk/support/setuptools-0.6c5-py2.5.egg
===================================================================
(Binary files differ)


Property changes on: CalendarServer/trunk/support/setuptools-0.6c5-py2.5.egg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070305/e9a12969/attachment.html