[CalendarServer-changes] [7170] CalendarServer/branches/users/cdaboo/pycalendar/support/build.sh

[source_changes at macosforge.org]

Revision: 7170
          http://trac.macosforge.org/projects/calendarserver/changeset/7170
Author:   cdaboo at apple.com
Date:     2011-03-09 19:49:31 -0800 (Wed, 09 Mar 2011)
Log Message:
-----------
Add pycalendar, merge recent trunk changes.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/pycalendar/support/build.sh

Property Changed:
----------------
    CalendarServer/branches/users/cdaboo/pycalendar/support/build.sh

Modified: CalendarServer/branches/users/cdaboo/pycalendar/support/build.sh
===================================================================
--- CalendarServer/branches/users/cdaboo/pycalendar/support/build.sh	2011-03-10 02:43:38 UTC (rev 7169)
+++ CalendarServer/branches/users/cdaboo/pycalendar/support/build.sh	2011-03-10 03:49:31 UTC (rev 7170)
@@ -181,8 +181,8 @@
     if [ -n "${cache_deps}" ] && [ -n "${hash}" ]; then
       mkdir -p "${cache_deps}";
 
-      local cache_basename="$(echo "${url}" | hash)-$(basename "${url}")";
-      local cache_file="${cache_deps}/${name}-${cache_basename}";
+      local cache_basename="${name}-$(echo "${url}" | hash)-$(basename "${url}")";
+      local cache_file="${cache_deps}/${cache_basename}";
 
       check_hash () {
         local file="$1"; shift;
@@ -622,8 +622,8 @@
     "dateutil" "dateutil" "${du}" \
     "http://www.labix.org/download/python-dateutil/${du}.tar.gz";
 
-  local ld="python-ldap-2.3.12";
-  py_dependency -v "2.3.12" -m "2dadc521b2c2590d9b033894ba5c6f31" \
+  local ld="python-ldap-2.3.13";
+  py_dependency -v "2.3.13" -m "895223d32fa10bbc29aa349bfad59175" \
     "python-ldap" "python-ldap" "${ld}" \
     "http://pypi.python.org/packages/source/p/python-ldap/${ld}.tar.gz";
 
@@ -632,6 +632,11 @@
     "vobject" "vobject" "vobject" \
     "http://svn.osafoundation.org/vobject/trunk";
 
+  # XXX actually PyCalendar should be imported in-place.
+  py_dependency -fie -r 137 \
+    "pycalendar" "pycalendar" "pycalendar" \
+    "http://svn.mulberrymail.com/repos/PyCalendar/branches/server";
+
   #
   # Tool dependencies.  The code itself doesn't depend on these, but
   # they are useful to developers.
@@ -647,6 +652,8 @@
 
   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" \
     "pydoctor" "pydoctor" "${pd}" \


Property changes on: CalendarServer/branches/users/cdaboo/pycalendar/support/build.sh
___________________________________________________________________
Added: svn:mergeinfo
   + /CalendarServer/branches/config-separation/support/build.sh:4379-4443
/CalendarServer/branches/egg-info-351/support/build.sh:4589-4625
/CalendarServer/branches/generic-sqlstore/support/build.sh:6167-6191
/CalendarServer/branches/new-store-no-caldavfile-2/support/build.sh:5936-5981
/CalendarServer/branches/new-store-no-caldavfile/support/build.sh:5911-5935
/CalendarServer/branches/new-store/support/build.sh:5594-5934
/CalendarServer/branches/users/cdaboo/cached-subscription-calendars-5692/support/build.sh:5693-5702
/CalendarServer/branches/users/cdaboo/directory-cache-on-demand-3627/support/build.sh:3628-3644
/CalendarServer/branches/users/cdaboo/more-sharing-5591/support/build.sh:5592-5601
/CalendarServer/branches/users/cdaboo/partition-4464/support/build.sh:4465-4957
/CalendarServer/branches/users/cdaboo/relative-config-paths-5070/support/build.sh:5071-5105
/CalendarServer/branches/users/cdaboo/shared-calendars-5187/support/build.sh:5188-5440
/CalendarServer/branches/users/glyph/conn-limit/support/build.sh:6574-6577
/CalendarServer/branches/users/glyph/contacts-server-merge/support/build.sh:4971-5080
/CalendarServer/branches/users/glyph/dalify/support/build.sh:6932-7023
/CalendarServer/branches/users/glyph/db-reconnect/support/build.sh:6824-6876
/CalendarServer/branches/users/glyph/dont-start-postgres/support/build.sh:6592-6614
/CalendarServer/branches/users/glyph/linux-tests/support/build.sh:6893-6900
/CalendarServer/branches/users/glyph/more-deferreds-6/support/build.sh:6322-6368
/CalendarServer/branches/users/glyph/more-deferreds-7/support/build.sh:6369-6445
/CalendarServer/branches/users/glyph/sendfdport/support/build.sh:5388-5424
/CalendarServer/branches/users/glyph/sharedpool/support/build.sh:6490-6550
/CalendarServer/branches/users/glyph/sql-store/support/build.sh:5929-6073
/CalendarServer/branches/users/glyph/use-system-twisted/support/build.sh:5084-5149
/CalendarServer/branches/users/sagen/locations-resources-2/support/build.sh:5052-5061
/CalendarServer/branches/users/sagen/locations-resources/support/build.sh:5032-5051
/CalendarServer/branches/users/sagen/purge_old_events/support/build.sh:6735-6746
/CalendarServer/branches/users/sagen/resource-delegates-4038/support/build.sh:4040-4067
/CalendarServer/branches/users/sagen/resource-delegates-4066/support/build.sh:4068-4075
/CalendarServer/branches/users/sagen/resources-2/support/build.sh:5084-5093
/CalendarServer/branches/users/wsanchez/transations/support/build.sh:5515-5593
/CalendarServer/trunk/support/build.sh:4626-7169
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110309/e71373e1/attachment.html>