[Checkins] SVN: z3c.recipe.i18n/trunk/b - added test cfg files for some supported platforms
Yvo Schubbe
y.2010 at wcm-solutions.de
Mon Oct 4 05:36:44 EDT 2010
Log message for revision 117212:
- added test cfg files for some supported platforms
- updated bootstrap.py
Changed:
U z3c.recipe.i18n/trunk/bootstrap.py
A z3c.recipe.i18n/trunk/buildout-zope212.cfg
A z3c.recipe.i18n/trunk/buildout-ztk10.cfg
-=-
Modified: z3c.recipe.i18n/trunk/bootstrap.py
===================================================================
--- z3c.recipe.i18n/trunk/bootstrap.py 2010-10-04 08:57:24 UTC (rev 117211)
+++ z3c.recipe.i18n/trunk/bootstrap.py 2010-10-04 09:36:43 UTC (rev 117212)
@@ -1,6 +1,6 @@
##############################################################################
#
-# Copyright (c) 2008 Zope Foundation and Contributors.
+# Copyright (c) 2006 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
@@ -17,40 +17,111 @@
The script accepts buildout command-line options, so you can
use the -c option to specify an alternate configuration file.
-$Id:$
+$Id: bootstrap.py 115394 2010-08-03 00:03:02Z gary $
"""
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
-cmd = 'from setuptools.command.easy_install import main; main()'
if sys.platform == 'win32':
- cmd = '"%s"' % cmd # work around spawn lamosity on windows
+ def quote(c):
+ if ' ' in c:
+ return '"%s"' % c # work around spawn lamosity on windows
+ else:
+ return c
+else:
+ def quote (c):
+ return c
-ws = pkg_resources.working_set
-assert os.spawnle(
- os.P_WAIT, sys.executable, sys.executable,
- '-c', cmd, '-mqNxd', tmpeggs, 'zc.buildout',
- dict(os.environ,
- PYTHONPATH=
- ws.find(pkg_resources.Requirement.parse('setuptools')).location
- ),
- ) == 0
+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
+ 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
+
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)
-
Added: z3c.recipe.i18n/trunk/buildout-zope212.cfg
===================================================================
--- z3c.recipe.i18n/trunk/buildout-zope212.cfg (rev 0)
+++ z3c.recipe.i18n/trunk/buildout-zope212.cfg 2010-10-04 09:36:43 UTC (rev 117212)
@@ -0,0 +1,16 @@
+[buildout]
+extends =
+ http://download.zope.org/Zope2/index/2.12.12/versions.cfg
+allow-picked-versions = false
+versions = versions
+parts = test
+develop = .
+
+[versions]
+lovely.recipe = 1.0.0
+# XXX: zc.buildout 1.4.4 picks wrong z3c.recipe.i18n version
+zc.buildout = 1.5.1
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = z3c.recipe.i18n [test]
Property changes on: z3c.recipe.i18n/trunk/buildout-zope212.cfg
___________________________________________________________________
Added: svn:eol-style
+ native
Added: z3c.recipe.i18n/trunk/buildout-ztk10.cfg
===================================================================
--- z3c.recipe.i18n/trunk/buildout-ztk10.cfg (rev 0)
+++ z3c.recipe.i18n/trunk/buildout-ztk10.cfg 2010-10-04 09:36:43 UTC (rev 117212)
@@ -0,0 +1,17 @@
+[buildout]
+extends =
+ http://download.zope.org/zopetoolkit/index/1.0c3/ztk-versions.cfg
+ http://download.zope.org/zopetoolkit/index/1.0c3/zopeapp-versions.cfg
+allow-picked-versions = false
+versions = versions
+parts = test
+develop = .
+
+[versions]
+lovely.recipe = 1.0.0
+# XXX: zc.buildout 1.4.4 picks wrong z3c.recipe.i18n version
+zc.buildout = 1.5.1
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = z3c.recipe.i18n [test]
Property changes on: z3c.recipe.i18n/trunk/buildout-ztk10.cfg
___________________________________________________________________
Added: svn:eol-style
+ native
More information about the checkins
mailing list