[CalendarServer-changes] [7639] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 7639
          http://trac.macosforge.org/projects/calendarserver/changeset/7639
Author:   wsanchez at apple.com
Date:     2011-06-20 13:10:19 -0700 (Mon, 20 Jun 2011)
Log Message:
-----------
Make CalDAVClientLibrary a dependancy instead of just a download.
Add pytz dependancy.
Make tool dependancies optional.

Modified Paths:
--------------
    CalendarServer/trunk/benchmark
    CalendarServer/trunk/support/build.sh

Modified: CalendarServer/trunk/benchmark
===================================================================
--- CalendarServer/trunk/benchmark	2011-06-20 20:03:49 UTC (rev 7638)
+++ CalendarServer/trunk/benchmark	2011-06-20 20:10:19 UTC (rev 7639)
@@ -21,6 +21,6 @@
 
 wd="$(cd "$(dirname "$0")" && pwd -L)";
 
-export PYTHONPATH="$("${wd}/run" -p):${wd}/../CalDAVClientLibrary/src";
+export PYTHONPATH="$("${wd}/run" -p)";
 
 exec "${wd}/contrib/performance/benchmark" "$@";

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2011-06-20 20:03:49 UTC (rev 7638)
+++ CalendarServer/trunk/support/build.sh	2011-06-20 20:10:19 UTC (rev 7639)
@@ -741,22 +741,27 @@
   # they are useful to developers.
   #
 
-  py_dependency -v 0.1.2 -m "aa9852ad81822723adcd9f96838de14e" \
+  py_dependency -o -v 0.1.2 -m "aa9852ad81822723adcd9f96838de14e" \
     "SQLParse" "sqlparse" "sqlparse-0.1.2" \
     "http://python-sqlparse.googlecode.com/files/sqlparse-0.1.2.tar.gz";
 
-  py_dependency -v 0.4.0 -m "630a72510aae8758f48cf60e4fa17176" \
+  py_dependency -o -v 0.4.0 -m "630a72510aae8758f48cf60e4fa17176" \
     "Pyflakes" "pyflakes" "pyflakes-0.4.0" \
     "${pypi}/p/pyflakes/pyflakes-0.4.0.tar.gz";
+ 
+  py_dependency -o -r HEAD \
+    "CalDAVClientLibrary" "CalDAVClientLibrary" "CalDAVClientLibrary" \
+    "${svn_uri_base}/CalDAVClientLibrary/trunk";
 
+  py_dependency -o -v 2011g -m "9ffda6e87b5f067a7ca37c54629c9e58" \
+    "pytz" "pytz" "pytz-2011g" \
+    "http://pypi.python.org/packages/source/p/pytz/pytz-2011g.tar.gz";
+
   svn_get "CalDAVTester" "${top}/CalDAVTester" \
       "${svn_uri_base}/CalDAVTester/trunk" HEAD;
 
-  svn_get "CalDAVClientLibrary" "${top}/CalDAVClientLibrary" \
-      "${svn_uri_base}/CalDAVClientLibrary/trunk" HEAD;
-
   local pd="pydoctor-0.3";
-  py_dependency -m "b000aa1fb458fe25952dadf26049ae68" \
+  py_dependency -o -m "b000aa1fb458fe25952dadf26049ae68" \
     "pydoctor" "pydoctor" "${pd}" \
     "http://launchpadlibrarian.net/42323121/${pd}.tar.gz";
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110620/eb7c7384/attachment.html>