[CalendarServer-changes] [975] CalendarServer/trunk

[source_changes at macosforge.org]

Revision: 975
          http://trac.macosforge.org/projects/calendarserver/changeset/975
Author:   dreid at apple.com
Date:     2007-01-08 14:02:30 -0800 (Mon, 08 Jan 2007)

Log Message:
-----------
Make sure stderr and stdout of caldavd are going _somewhere_ for now that place is error.log, and be sure to export PYTHONPATH before exec'ing python or it won't be able to find twisted, and make sure we install twisted.runner

Modified Paths:
--------------
    CalendarServer/trunk/bin/caldavd
    CalendarServer/trunk/conf/launchd.plist
    CalendarServer/trunk/support/Makefile.Apple
    CalendarServer/trunk/support/submit

Modified: CalendarServer/trunk/bin/caldavd
===================================================================
--- CalendarServer/trunk/bin/caldavd	2007-01-08 21:55:15 UTC (rev 974)
+++ CalendarServer/trunk/bin/caldavd	2007-01-08 22:02:30 UTC (rev 975)
@@ -111,4 +111,6 @@
 
 if [ $# != 0 ]; then usage "Unrecognized arguments:" "$@"; fi;
 
+export PYTHONPATH
+
 exec "${python}" "${twistdpath}" "${daemonize}" ${username} ${groupname} "${plugin_name}" ${configfile} ${service_type};

Modified: CalendarServer/trunk/conf/launchd.plist
===================================================================
--- CalendarServer/trunk/conf/launchd.plist	2007-01-08 21:55:15 UTC (rev 974)
+++ CalendarServer/trunk/conf/launchd.plist	2007-01-08 22:02:30 UTC (rev 975)
@@ -41,5 +41,12 @@
 
   <key>KeepAlive</key>
   <true/>
+  
+  <key>StandardOutputPath</key>
+  <string>/var/log/caldavd/error.log</string>
+
+  <key>StandardErrorPath</key>
+  <string>/var/log/caldavd/error.log</string>
+
 </dict>
 </plist>

Modified: CalendarServer/trunk/support/Makefile.Apple
===================================================================
--- CalendarServer/trunk/support/Makefile.Apple	2007-01-08 21:55:15 UTC (rev 974)
+++ CalendarServer/trunk/support/Makefile.Apple	2007-01-08 22:02:30 UTC (rev 975)
@@ -75,6 +75,7 @@
 	$(_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)/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)
 	$(_v) cd $(BuildDirectory)/Twisted && $(TwistedSubEnvironment) $(PYTHON) twisted/web2/topfiles/setup.py install $(PY_INSTALL_FLAGS)
 	$(_v) for so in $$(find "$(DSTROOT)$(SHAREDIR)/caldavd/lib" -type f -name '*.so'); do $(STRIP) -Sx "$${so}"; done

Modified: CalendarServer/trunk/support/submit
===================================================================
--- CalendarServer/trunk/support/submit	2007-01-08 21:55:15 UTC (rev 974)
+++ CalendarServer/trunk/support/submit	2007-01-08 22:02:30 UTC (rev 975)
@@ -77,7 +77,7 @@
 ##
 
 if "${build}"; then
-  project_version="${project}-${revision}";
+  project_version="${project}-$(echo ${revision} | sed -e 's/:/_/g')";
 else 
 #
 # We need a single revision number

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