[Checkins] SVN: zope2docs/trunk/ Update docs to fixed versions and include 2.14 for real
Hanno Schlichting
hannosch at hannosch.eu
Sat Oct 9 11:22:42 EDT 2010
Log message for revision 117408:
Update docs to fixed versions and include 2.14 for real
Changed:
U zope2docs/trunk/bootstrap.py
U zope2docs/trunk/buildout.cfg
U zope2docs/trunk/conf.py
U zope2docs/trunk/releases/index.rst
-=-
Modified: zope2docs/trunk/bootstrap.py
===================================================================
--- zope2docs/trunk/bootstrap.py 2010-10-09 15:13:45 UTC (rev 117407)
+++ zope2docs/trunk/bootstrap.py 2010-10-09 15:22:42 UTC (rev 117408)
@@ -17,24 +17,68 @@
The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file.
-$Id: bootstrap.py 90478 2008-08-27 22:44:46Z georgyberdyshev $
+$Id$
"""
import os, shutil, sys, tempfile, urllib2
+from optparse import OptionParser
tmpeggs = tempfile.mkdtemp()
is_jython = sys.platform.startswith('java')
+# parsing arguments
+parser = OptionParser(
+ 'This is a custom version of the zc.buildout %prog script. It is '
+ 'intended to meet a temporary need if you encounter problems with '
+ 'the zc.buildout 1.5 release.')
+parser.add_option("-v", "--version", dest="version", default='1.4.4',
+ help='Use a specific zc.buildout version. *This '
+ 'bootstrap script defaults to '
+ '1.4.4, unlike usual buildpout bootstrap scripts.*')
+parser.add_option("-d", "--distribute",
+ action="store_true", dest="distribute", default=False,
+ help="Use Disribute rather than Setuptools.")
+
+parser.add_option("-c", None, action="store", dest="config_file",
+ help=("Specify the path to the buildout configuration "
+ "file to be used."))
+
+options, args = parser.parse_args()
+
+# if -c was provided, we push it back into args for buildout' main function
+if options.config_file is not None:
+ args += ['-c', options.config_file]
+
+if options.version is not None:
+ VERSION = '==%s' % options.version
+else:
+ VERSION = ''
+
+USE_DISTRIBUTE = options.distribute
+args = args + ['bootstrap']
+
+to_reload = False
try:
import pkg_resources
+ if not hasattr(pkg_resources, '_distribute'):
+ to_reload = True
+ raise ImportError
except ImportError:
ez = {}
- exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+ if USE_DISTRIBUTE:
+ exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
).read() in ez
- ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+ ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
+ else:
+ exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+ ).read() in ez
+ ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
- import pkg_resources
+ if to_reload:
+ reload(pkg_resources)
+ else:
+ import pkg_resources
if sys.platform == 'win32':
def quote(c):
@@ -46,32 +90,38 @@
def quote (c):
return c
-cmd = 'from setuptools.command.easy_install import main; main()'
ws = pkg_resources.working_set
+if USE_DISTRIBUTE:
+ requirement = 'distribute'
+else:
+ requirement = 'setuptools'
+
+env = dict(os.environ,
+ PYTHONPATH=
+ ws.find(pkg_resources.Requirement.parse(requirement)).location
+ )
+
+cmd = [quote(sys.executable),
+ '-c',
+ quote('from setuptools.command.easy_install import main; main()'),
+ '-mqNxd',
+ quote(tmpeggs)]
+
+if 'bootstrap-testing-find-links' in os.environ:
+ cmd.extend(['-f', os.environ['bootstrap-testing-find-links']])
+
+cmd.append('zc.buildout' + VERSION)
+
if is_jython:
import subprocess
-
- assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd',
- quote(tmpeggs), 'zc.buildout'],
- env=dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse('setuptools')).location
- ),
- ).wait() == 0
+ exitcode = subprocess.Popen(cmd, env=env).wait()
+else: # Windows prefers this, apparently; otherwise we would prefer subprocess
+ exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env]))
+assert exitcode == 0
-else:
- assert os.spawnle(
- os.P_WAIT, sys.executable, quote (sys.executable),
- '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
- dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse('setuptools')).location
- ),
- ) == 0
-
ws.add_entry(tmpeggs)
-ws.require('zc.buildout')
+ws.require('zc.buildout' + VERSION)
import zc.buildout.buildout
-zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
+zc.buildout.buildout.main(args)
shutil.rmtree(tmpeggs)
Modified: zope2docs/trunk/buildout.cfg
===================================================================
--- zope2docs/trunk/buildout.cfg 2010-10-09 15:13:45 UTC (rev 117407)
+++ zope2docs/trunk/buildout.cfg 2010-10-09 15:22:42 UTC (rev 117408)
@@ -9,14 +9,16 @@
eggs =
[versions]
-zc.buildout =
-zc.recipe.egg =
+docutils = 0.7
+zc.buildout = 1.4.4
+zc.recipe.egg = 1.2.2
+Sphinx = 1.0.4
[stxpy]
recipe = zc.recipe.egg
eggs =
- Sphinx==0.6.3
- docutils==0.5
+ Sphinx
+ docutils
interpreter = stxpy
scripts =
sphinx-build
Modified: zope2docs/trunk/conf.py
===================================================================
--- zope2docs/trunk/conf.py 2010-10-09 15:13:45 UTC (rev 117407)
+++ zope2docs/trunk/conf.py 2010-10-09 15:22:42 UTC (rev 117408)
@@ -42,7 +42,7 @@
# General information about the project.
project = u'Zope 2'
-copyright = u'2009, Zope Developers Community'
+copyright = u'2009-2010, Zope Developers Community'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
Modified: zope2docs/trunk/releases/index.rst
===================================================================
--- zope2docs/trunk/releases/index.rst 2010-10-09 15:13:45 UTC (rev 117407)
+++ zope2docs/trunk/releases/index.rst 2010-10-09 15:22:42 UTC (rev 117408)
@@ -1,6 +1,15 @@
Zope Release Information
========================
+Zope 2.14 Releases
+------------------
+
+.. toctree::
+ :maxdepth: 2
+
+ 2.14/index
+
+
Zope 2.13 Releases
------------------
More information about the checkins
mailing list