Log message for revision 106531: Updated bootstrap to latest version Changed: U Zope/trunk/bootstrap.py
-=- Modified: Zope/trunk/bootstrap.py =================================================================== --- Zope/trunk/bootstrap.py 2009-12-15 14:43:43 UTC (rev 106530) +++ Zope/trunk/bootstrap.py 2009-12-15 14:44:22 UTC (rev 106531) @@ -17,24 +17,63 @@ The script accepts buildout command-line options, so you can use the -c option to specify an alternate configuration file. -$Id: bootstrap.py 102545 2009-08-06 14:49:47Z chrisw $ +$Id$ """ import os, shutil, sys, tempfile, urllib2 +from optparse import OptionParser tmpeggs = tempfile.mkdtemp() is_jython = sys.platform.startswith('java') +# parsing arguments +parser = OptionParser() +parser.add_option("-v", "--version", dest="version", + help="use a specific zc.buildout version") +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): @@ -49,12 +88,10 @@ cmd = 'from setuptools.command.easy_install import main; main()' ws = pkg_resources.working_set -if len(sys.argv) > 2 and sys.argv[1] == '--version': - VERSION = '==%s' % sys.argv[2] - args = sys.argv[3:] + ['bootstrap'] +if USE_DISTRIBUTE: + requirement = 'distribute' else: - VERSION = '' - args = sys.argv[1:] + ['bootstrap'] + requirement = 'setuptools' if is_jython: import subprocess @@ -63,7 +100,7 @@ quote(tmpeggs), 'zc.buildout' + VERSION], env=dict(os.environ, PYTHONPATH= - ws.find(pkg_resources.Requirement.parse('setuptools')).location + ws.find(pkg_resources.Requirement.parse(requirement)).location ), ).wait() == 0 @@ -73,7 +110,7 @@ '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION, dict(os.environ, PYTHONPATH= - ws.find(pkg_resources.Requirement.parse('setuptools')).location + ws.find(pkg_resources.Requirement.parse(requirement)).location ), ) == 0 _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins