[CalendarServer-changes] [6066] CalendarServer/trunk/support

[source_changes at macosforge.org]

Revision: 6066
          http://trac.macosforge.org/projects/calendarserver/changeset/6066
Author:   wsanchez at apple.com
Date:     2010-08-11 16:32:02 -0700 (Wed, 11 Aug 2010)
Log Message:
-----------
Add PyGreSQL to included modules.

Modified Paths:
--------------
    CalendarServer/trunk/support/Makefile.Apple
    CalendarServer/trunk/support/build.sh

Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple	2010-08-11 23:16:57 UTC (rev 6065)
+++ CalendarServer/trunk/support/Makefile.Apple	2010-08-11 23:32:02 UTC (rev 6066)
@@ -46,16 +46,17 @@
 PyOpenDirectory::       $(BuildDirectory)/PyOpenDirectory
 PyXML-0.8.4::           $(BuildDirectory)/PyXML-0.8.4
 vobject::               $(BuildDirectory)/vobject
+PyGreSQL-4.0::          $(BuildDirectory)/PyGreSQL-4.0
 $(Project)::            $(BuildDirectory)/$(Project)
 
-build:: PyKerberos PyOpenDirectory PyXML-0.8.4 vobject $(Project)
+build:: PyKerberos PyOpenDirectory PyXML-0.8.4 vobject PyGreSQL-4.0 $(Project)
 
 setup:
 	$(_v) ./run -g
 
-prep:: setup CalDAVTester.tgz PyKerberos.tgz PyOpenDirectory.tgz PyXML-0.8.4.tgz vobject.tgz
+prep:: setup CalDAVTester.tgz PyKerberos.tgz PyOpenDirectory.tgz PyXML-0.8.4.tgz vobject.tgz PyGreSQL-4.0.tgz
 
-PyKerberos PyOpenDirectory PyXML-0.8.4 vobject $(Project)::
+PyKerberos PyOpenDirectory PyXML-0.8.4 vobject PyGreSQL-4.0 $(Project)::
 	@echo "Building $@..."
 	$(_v) cd $(BuildDirectory)/$@ && $(Environment) $(PYTHON) setup.py build
 
@@ -70,6 +71,7 @@
 	$(_v) cd $(BuildDirectory)/PyOpenDirectory  && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
 	$(_v) cd $(BuildDirectory)/PyXML-0.8.4      && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
 	$(_v) cd $(BuildDirectory)/vobject          && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
+	$(_v) cd $(BuildDirectory)/PyGreSQL-4.0     && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
 	$(_v) for so in $$(find "$(DSTROOT)$(PY_HOME)/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done 
 	$(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-apple.plist" "$(DSTROOT)$(ETCDIR)/caldavd/caldavd.plist"
 	$(_v) $(INSTALL_FILE) "$(Sources)/conf/caldavd-partitioning-primary.plist" "$(DSTROOT)$(ETCDIR)/caldavd/caldavd-partitioning-primary.plist"

Modified: CalendarServer/trunk/support/build.sh
===================================================================
--- CalendarServer/trunk/support/build.sh	2010-08-11 23:16:57 UTC (rev 6065)
+++ CalendarServer/trunk/support/build.sh	2010-08-11 23:32:02 UTC (rev 6066)
@@ -556,11 +556,20 @@
     "vObject" "vobject" "vobject" \
     "http://svn.osafoundation.org/vobject/trunk";
 
+  #
   # Tool dependencies.  The code itself doesn't depend on these, but
   # they are useful to developers.
+  #
+
   svn_get "CalDAVTester" "${top}/CalDAVTester" "${svn_uri_base}/CalDAVTester/trunk" HEAD;
+
   svn_get "Pyflakes" "${top}/Pyflakes" http://divmod.org/svn/Divmod/trunk/Pyflakes HEAD;
 
+  local pd="pydoctor-0.3";
+  py_dependency \
+    "pydoctor" "pydoctor" "${pd}" \
+    "http://launchpadlibrarian.net/42323121/${pd}.tar.gz";
+
   if "${do_setup}"; then
     cd "${caldav}";
     echo "Building our own extension modules...";
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20100811/59b44023/attachment-0001.html>