Deleted: CalendarServer/trunk/lib-patches/dateutil/setup.patch (1538 => 1539)
--- CalendarServer/trunk/lib-patches/dateutil/setup.patch 2007-05-17 21:34:15 UTC (rev 1538)
+++ CalendarServer/trunk/lib-patches/dateutil/setup.patch 2007-05-18 00:01:46 UTC (rev 1539)
@@ -1,27 +0,0 @@
---- setup.py.orig 2006-02-02 16:09:41.000000000 -0800
-+++ setup.py 2006-02-02 16:23:30.000000000 -0800
-@@ -3,12 +3,13 @@
- from distutils.core import setup
- import glob
- import os
-+import sys
-+
-+datadir = get_python_lib(1)[len(sys.prefix)+1:]
-
- if os.path.isfile("MANIFEST"):
- os.unlink("MANIFEST")
-
--PYTHONLIB = get_python_lib(1)
--
- setup(name="python-dateutil",
- version = "1.0",
- description = "Extensions to the standard python 2.3+ datetime module",
-@@ -22,6 +23,6 @@
- datetime module, available in Python 2.3+.
- """,
- packages = ["dateutil", "dateutil.zoneinfo"],
-- data_files = [(PYTHONLIB+"/dateutil/zoneinfo",
-- glob.glob("dateutil/zoneinfo/zoneinfo*.tar.*"))],
-+ data_files = [(os.path.join(datadir, "dateutil", "zoneinfo"),
-+ glob.glob(os.path.join("dateutil", "zoneinfo", "zoneinfo*.tar.*")))],
- )
Modified: CalendarServer/trunk/run (1538 => 1539)
--- CalendarServer/trunk/run 2007-05-17 21:34:15 UTC (rev 1538)
+++ CalendarServer/trunk/run 2007-05-18 00:01:46 UTC (rev 1539)
@@ -568,14 +568,12 @@
# dateutil
#
-if ! py_have_module dateutil; then
- dateutil="${top}/python-dateutil-1.1";
+dateutil="${top}/python-dateutil-1.1";
- 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.1.tar.bz2;
+py_install "dateutil" "${dateutil}";
- export PYTHONPATH="${PYTHONPATH}:${dateutil}";
-fi;
+export PYTHONPATH="${PYTHONPATH}:${dateutil}";
#
# vobject
Modified: CalendarServer/trunk/support/Makefile.Apple (1538 => 1539)
--- CalendarServer/trunk/support/Makefile.Apple 2007-05-17 21:34:15 UTC (rev 1538)
+++ CalendarServer/trunk/support/Makefile.Apple 2007-05-18 00:01:46 UTC (rev 1539)
@@ -41,21 +41,22 @@
.phony: $(Project) vobject Twisted setup prep
-PyKerberos:: $(BuildDirectory)/PyKerberos
-PyOpenDirectory:: $(BuildDirectory)/PyOpenDirectory
-vobject:: $(BuildDirectory)/vobject
-Twisted:: $(BuildDirectory)/Twisted
-pydirector-1.0.0:: $(BuildDirectory)/pydirector-1.0.0
-$(Project):: $(BuildDirectory)/$(Project)
+PyKerberos:: $(BuildDirectory)/PyKerberos
+PyOpenDirectory:: $(BuildDirectory)/PyOpenDirectory
+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 Twisted $(Project)
+build:: PyKerberos PyOpenDirectory pydirector-1.0.0 vobject python-dateutil-1.1 Twisted $(Project)
setup:
$(_v) $(Sources)/run -s
-prep:: setup PyKerberos.tgz PyOpenDirectory.tgz pydirector-1.0.0.tgz vobject.tgz Twisted.tgz
+prep:: setup PyKerberos.tgz PyOpenDirectory.tgz pydirector-1.0.0.tgz vobject.tgz python-dateutil-1.1.tgz Twisted.tgz
-PyKerberos PyOpenDirectory pydirector-1.0.0 vobject $(Project)::
+PyKerberos PyOpenDirectory pydirector-1.0.0 vobject python-dateutil-1.1 $(Project)::
@echo "Building $@..."
$(_v) cd $(BuildDirectory)/$@ && $(Environment) $(PYTHON) setup.py build
@@ -73,10 +74,11 @@
$(PY_INSTALL_FLAGS) \
--install-scripts="$(USRSBINDIR)" \
--install-data="$(ETCDIR)"
- $(_v) cd $(BuildDirectory)/PyKerberos && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
- $(_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)/PyKerberos && $(Environment) $(PYTHON) setup.py install $(PY_INSTALL_FLAGS)
+ $(_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)