Commit e834407d authored by chrisw's avatar chrisw

d'oh - meant for branch, but I guess the temptation was there ;-)


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@102545 62d5b8a3-27da-0310-9561-8e5933582275
parent 9919c692
...@@ -26,20 +26,14 @@ tmpeggs = tempfile.mkdtemp() ...@@ -26,20 +26,14 @@ tmpeggs = tempfile.mkdtemp()
is_jython = sys.platform.startswith('java') is_jython = sys.platform.startswith('java')
to_reload = False
try: try:
import pkg_resources import pkg_resources
if not hasattr(pkg_resources, '_distribute'):
to_reload = True
raise ImportError
except ImportError: except ImportError:
ez = {} ez = {}
exec urllib2.urlopen('http://nightly.ziade.org/bootstraping.py' exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
).read() in ez ).read() in ez
ez['use_setuptools'](to_dir=tmpeggs, download_delay=0) ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
if to_reload:
reload(pkg_resources)
else:
import pkg_resources import pkg_resources
if sys.platform == 'win32': if sys.platform == 'win32':
...@@ -69,7 +63,7 @@ if is_jython: ...@@ -69,7 +63,7 @@ if is_jython:
quote(tmpeggs), 'zc.buildout' + VERSION], quote(tmpeggs), 'zc.buildout' + VERSION],
env=dict(os.environ, env=dict(os.environ,
PYTHONPATH= PYTHONPATH=
ws.find(pkg_resources.Requirement.parse('distribute')).location ws.find(pkg_resources.Requirement.parse('setuptools')).location
), ),
).wait() == 0 ).wait() == 0
...@@ -79,7 +73,7 @@ else: ...@@ -79,7 +73,7 @@ else:
'-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION, '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout' + VERSION,
dict(os.environ, dict(os.environ,
PYTHONPATH= PYTHONPATH=
ws.find(pkg_resources.Requirement.parse('distribute')).location ws.find(pkg_resources.Requirement.parse('setuptools')).location
), ),
) == 0 ) == 0
......
...@@ -30,22 +30,15 @@ for d in 'eggs', 'develop-eggs', 'bin': ...@@ -30,22 +30,15 @@ for d in 'eggs', 'develop-eggs', 'bin':
if os.path.isdir('build'): if os.path.isdir('build'):
shutil.rmtree('build') shutil.rmtree('build')
to_reload = False
try: try:
import pkg_resources import pkg_resources
if not hasattr(pkg_resources, '_distribute'):
to_reload = True
raise ImportError
except ImportError: except ImportError:
ez = {} ez = {}
exec urllib2.urlopen('http://nightly.ziade.org/bootstraping.py' exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
).read() in ez ).read() in ez
ez['use_setuptools'](to_dir=tmpeggs, download_delay=0) ez['use_setuptools'](to_dir='eggs', download_delay=0)
if to_reload:
reload(pkg_resources)
else:
import pkg_resources
import pkg_resources
subprocess.Popen( subprocess.Popen(
[sys.executable] + [sys.executable] +
......
...@@ -72,7 +72,7 @@ setup( ...@@ -72,7 +72,7 @@ setup(
packages = ['zc', 'zc.buildout'], packages = ['zc', 'zc.buildout'],
package_dir = {'': 'src'}, package_dir = {'': 'src'},
namespace_packages = ['zc'], namespace_packages = ['zc'],
install_requires = 'distribute', install_requires = 'setuptools',
include_package_data = True, include_package_data = True,
entry_points = {'console_scripts': entry_points = {'console_scripts':
['buildout = %s.buildout:main' % name]}, ['buildout = %s.buildout:main' % name]},
......
...@@ -67,7 +67,7 @@ setup( ...@@ -67,7 +67,7 @@ setup(
namespace_packages = ['zc', 'zc.recipe'], namespace_packages = ['zc', 'zc.recipe'],
install_requires = [ install_requires = [
'zc.buildout >=1.2.0', 'zc.buildout >=1.2.0',
'distribute'], 'setuptools'],
tests_require = ['zope.testing'], tests_require = ['zope.testing'],
test_suite = name+'.tests.test_suite', test_suite = name+'.tests.test_suite',
entry_points = {'zc.buildout': ['default = %s:Scripts' % name, entry_points = {'zc.buildout': ['default = %s:Scripts' % name,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment