[CalendarServer-changes] [1644] CalendarServer/branches/release/CalendarServer-1.0-dev

[source_changes at macosforge.org]

Revision: 1644
          http://trac.macosforge.org/projects/calendarserver/changeset/1644
Author:   wsanchez at apple.com
Date:     2007-07-04 11:48:03 -0700 (Wed, 04 Jul 2007)

Log Message:
-----------
Pull up r1638 and r1639 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.0-dev/run
    CalendarServer/branches/release/CalendarServer-1.0-dev/support/Makefile.Apple

Removed Paths:
-------------
    CalendarServer/branches/release/CalendarServer-1.0-dev/lib-patches/dateutil/

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/run
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/run	2007-07-03 21:23:07 UTC (rev 1643)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/run	2007-07-04 18:48:03 UTC (rev 1644)
@@ -568,12 +568,14 @@
 # dateutil
 #
 
-dateutil="${top}/python-dateutil-1.1";
+if ! py_have_module dateutil; then
+    dateutil="${top}/python-dateutil-1.2";
 
-www_get "dateutil" "${dateutil}" http://labix.org/download/python-dateutil/python-dateutil-1.1.tar.bz2;
-py_install "dateutil" "${dateutil}";
+    www_get "dateutil" "${dateutil}" http://labix.org/download/python-dateutil/python-dateutil-1.2.tar.bz2;
+    py_install "dateutil" "${dateutil}";
 
-export PYTHONPATH="${PYTHONPATH}:${dateutil}";
+    export PYTHONPATH="${PYTHONPATH}:${dateutil}";
+fi;
 
 #
 # vobject

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/support/Makefile.Apple
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/support/Makefile.Apple	2007-07-03 21:23:07 UTC (rev 1643)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/support/Makefile.Apple	2007-07-04 18:48:03 UTC (rev 1644)
@@ -46,17 +46,16 @@
 vobject::             $(BuildDirectory)/vobject
 Twisted::             $(BuildDirectory)/Twisted
 pydirector-1.0.0::    $(BuildDirectory)/pydirector-1.0.0
-python-dateutil-1.1:: $(BuildDirectory)/python-dateutil-1.1
 $(Project)::          $(BuildDirectory)/$(Project)
 
-build:: PyKerberos PyOpenDirectory pydirector-1.0.0 vobject python-dateutil-1.1 Twisted $(Project)
+build:: PyKerberos PyOpenDirectory pydirector-1.0.0 vobject Twisted $(Project)
 
 setup:
 	$(_v) $(Sources)/run -s
 
-prep:: setup PyKerberos.tgz PyOpenDirectory.tgz pydirector-1.0.0.tgz vobject.tgz python-dateutil-1.1.tgz Twisted.tgz
+prep:: setup PyKerberos.tgz PyOpenDirectory.tgz pydirector-1.0.0.tgz vobject.tgz Twisted.tgz
 
-PyKerberos PyOpenDirectory pydirector-1.0.0 vobject python-dateutil-1.1 $(Project)::
+PyKerberos PyOpenDirectory pydirector-1.0.0 vobject $(Project)::
 	@echo "Building $@..."
 	$(_v) cd $(BuildDirectory)/$@ && $(Environment) $(PYTHON) setup.py build
 
@@ -78,7 +77,6 @@
 	$(_v) cd $(BuildDirectory)/PyOpenDirectory     && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
 	$(_v) cd $(BuildDirectory)/pydirector-1.0.0    && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
 	$(_v) cd $(BuildDirectory)/vobject             && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
-	$(_v) cd $(BuildDirectory)/python-dateutil-1.1 && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
 	$(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/runner/topfiles/setup.py install $(PY_INSTALL_FLAGS)
 	$(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web/topfiles/setup.py  install $(PY_INSTALL_FLAGS)
 	$(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web2/topfiles/setup.py install $(PY_INSTALL_FLAGS)

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