[Zope-Checkins] SVN: zdaemon/trunk/ preparing for 2.0.3 release
Log message for revision 99132: preparing for 2.0.3 release Changed: U zdaemon/trunk/CHANGES.txt U zdaemon/trunk/setup.py U zdaemon/trunk/src/zdaemon/zdctl.py -=- Modified: zdaemon/trunk/CHANGES.txt === --- zdaemon/trunk/CHANGES.txt 2009-04-11 16:11:02 UTC (rev 99131) +++ zdaemon/trunk/CHANGES.txt 2009-04-11 17:45:50 UTC (rev 99132) @@ -1,7 +1,7 @@ zdaemon Changelog * -zdaemon 2.0.3 (unreleased) +zdaemon 2.0.3 (2009/04/11) == - Added support to bootstrap on Jython. @@ -16,6 +16,9 @@ This lets you run the tests on Python 2.4 and 2.5 simultaneously without spurious errors. +- make -h work again for both runner and control scripts. + Help is now taken from the __doc__ of the options class users by + the zdaemon script being run. zdaemon 2.0.2 (2008/04/05) == Modified: zdaemon/trunk/setup.py === --- zdaemon/trunk/setup.py 2009-04-11 16:11:02 UTC (rev 99131) +++ zdaemon/trunk/setup.py 2009-04-11 17:45:50 UTC (rev 99132) @@ -37,7 +37,7 @@ name = zdaemon setup( name=name, -version=2.0.3dev, +version=2.0.3, url=http://www.python.org/pypi/zdaemon;, license=ZPL 2.1, description= Modified: zdaemon/trunk/src/zdaemon/zdctl.py === --- zdaemon/trunk/src/zdaemon/zdctl.py 2009-04-11 16:11:02 UTC (rev 99131) +++ zdaemon/trunk/src/zdaemon/zdctl.py 2009-04-11 17:45:50 UTC (rev 99132) @@ -16,7 +16,7 @@ Usage: python zdctl.py [-C URL] [-S schema.xml] [-h] [-p PROGRAM] [zdrun-options] [action [arguments]] - + Options: -C/--configure URL -- configuration file or URL -S/--schema XML Schema -- XML schema for configuration file ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: zdaemon/tags/2.0.3/ tagging 2.0.3
Log message for revision 99133: tagging 2.0.3 Changed: A zdaemon/tags/2.0.3/ -=- ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
[Zope-Checkins] SVN: Zope/trunk/src/Zope2/Startup/zope add python option to zope.conf schema allowing for a python binary to be specified, allowed a Zope instance to run from any buildout with the a
Log message for revision 99134: add python option to zope.conf schema allowing for a python binary to be specified, allowed a Zope instance to run from any buildout with the appropriate eggs. Changed: U Zope/trunk/src/Zope2/Startup/zopectl.py U Zope/trunk/src/Zope2/Startup/zopeschema.xml -=- Modified: Zope/trunk/src/Zope2/Startup/zopectl.py === --- Zope/trunk/src/Zope2/Startup/zopectl.py 2009-04-11 17:48:10 UTC (rev 99133) +++ Zope/trunk/src/Zope2/Startup/zopectl.py 2009-04-11 17:52:25 UTC (rev 99134) @@ -129,7 +129,7 @@ self.sockname = config.runner.socket_name else: self.sockname = os.path.join(self.clienthome, zopectlsock) -self.python = sys.executable +self.python = config.python or sys.executable self.zdrun = os.path.join(os.path.dirname(zdaemon.__file__), zdrun.py) if WIN: Modified: Zope/trunk/src/Zope2/Startup/zopeschema.xml === --- Zope/trunk/src/Zope2/Startup/zopeschema.xml 2009-04-11 17:48:10 UTC (rev 99133) +++ Zope/trunk/src/Zope2/Startup/zopeschema.xml 2009-04-11 17:52:25 UTC (rev 99134) @@ -945,4 +945,14 @@ /description /multisection +key name=python datatype=existing-path + required=no + description +Path to the Python interpreter for use by zdaemon. +Defaults to sys.executable. +Needed for buildout-based instances to supply a python +that has all the correct eggs on the path. + /description +/key + /schema ___ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins
