Commit 50cadd78 authored by Tres Seaver's avatar Tres Seaver

Merge branch 'master' into 225-dont_prefix_special_rpath_vars

parents 4eb51aa8 88ad9f41
...@@ -50,14 +50,15 @@ except ImportError: ...@@ -50,14 +50,15 @@ except ImportError:
exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez) exec(urlopen('https://bootstrap.pypa.io/ez_setup.py').read(), ez)
ez['use_setuptools'](to_dir='eggs', download_delay=0) ez['use_setuptools'](to_dir='eggs', download_delay=0)
import pkg_resources import pkg_resources, setuptools
setuptools_path = os.path.dirname(os.path.dirname(setuptools.__file__))
###################################################################### ######################################################################
# Install buildout # Install buildout
if subprocess.call( if subprocess.call(
[sys.executable] + [sys.executable] +
['setup.py', '-q', 'develop', '-m', '-x', '-d', 'develop-eggs'], ['setup.py', '-q', 'develop', '-m', '-x', '-d', 'develop-eggs'],
env=dict(os.environ, PYTHONPATH=os.path.dirname(pkg_resources.__file__))): env=dict(os.environ, PYTHONPATH=setuptools_path)):
raise RuntimeError("buildout build failed.") raise RuntimeError("buildout build failed.")
pkg_resources.working_set.add_entry('src') pkg_resources.working_set.add_entry('src')
......
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