[CalendarServer-changes] [1071] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 1071
          http://trac.macosforge.org/projects/calendarserver/changeset/1071
Author:   dreid at apple.com
Date:     2007-01-19 11:38:02 -0800 (Fri, 19 Jan 2007)

Log Message:
-----------
patch pydirector to install pydir++.py and make sure it's installed by the Makefile.

Modified Paths:
--------------
    CalendarServer/trunk/support/Makefile.Apple
    CalendarServer/trunk/support/submit

Added Paths:
-----------
    CalendarServer/trunk/lib-patches/PyDirector/
    CalendarServer/trunk/lib-patches/PyDirector/setup.patch

Added: CalendarServer/trunk/lib-patches/PyDirector/setup.patch
===================================================================
--- CalendarServer/trunk/lib-patches/PyDirector/setup.patch	                        (rev 0)
+++ CalendarServer/trunk/lib-patches/PyDirector/setup.patch	2007-01-19 19:38:02 UTC (rev 1071)
@@ -0,0 +1,12 @@
+diff -u setup.py setup.new.py
+--- setup.py	2007-01-19 11:36:00.000000000 -0800
++++ setup.new.py	2007-01-19 11:34:37.000000000 -0800
+@@ -18,7 +18,7 @@
+     author_email = "anthony at interlink.com.au",
+     url = 'http://sourceforge.net/projects/pythondirector/',
+     packages = ['pydirector'],
+-    scripts = ['pydir.py'],
++    scripts = ['pydir.py', 'pydir++.py'],
+     classifiers = [
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Web Environment',

Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple	2007-01-19 17:04:44 UTC (rev 1070)
+++ CalendarServer/trunk/support/Makefile.Apple	2007-01-19 19:38:02 UTC (rev 1071)
@@ -45,16 +45,17 @@
 PyOpenDirectory:: $(BuildDirectory)/PyOpenDirectory
 vobject::         $(BuildDirectory)/vobject
 Twisted::         $(BuildDirectory)/Twisted
+pydirector-1.0.0::      $(BuildDirectory)/pydirector-1.0.0
 $(Project)::      $(BuildDirectory)/$(Project)
 
-build:: PyKerberos PyOpenDirectory vobject Twisted $(Project)
+build:: PyKerberos PyOpenDirectory pydirector-1.0.0 vobject Twisted $(Project)
 
 setup:
 	$(_v) $(Sources)/run -s
 
-prep:: setup PyKerberos.tgz PyOpenDirectory.tgz vobject.tgz Twisted.tgz
+prep:: setup PyKerberos.tgz PyOpenDirectory.tgz pydirector-1.0.0.tgz vobject.tgz Twisted.tgz
 
-PyKerberos PyOpenDirectory vobject $(Project)::
+PyKerberos PyOpenDirectory pydirector-1.0.0 vobject $(Project)::
 	@echo "Building $@..."
 	$(_v) cd $(BuildDirectory)/$@ && $(Environment) $(PYTHON) setup.py build
 
@@ -74,6 +75,7 @@
 	          --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)/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)

Modified: CalendarServer/trunk/support/submit
===================================================================
--- CalendarServer/trunk/support/submit	2007-01-19 17:04:44 UTC (rev 1070)
+++ CalendarServer/trunk/support/submit	2007-01-19 19:38:02 UTC (rev 1071)
@@ -146,7 +146,7 @@
 if "${build}"; then
     echo "";
     echo "Building ${project_version}...";
-    sudo ~rc/bin/buildit "${wc}" -arch ppc -arch i386;
+    sudo buildit "${wc}" -arch ppc -arch i386;
 else
     echo "";
     echo "Submitting sources for ${project_version}...";

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