FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 18:07:12 +01:00
Code Issues Projects Releases Wiki Activity

Issue 1083

Browse Source
This commit is contained in:
Thomas Nagy 2011-12-17 23:07:25 +01:00
parent 46cd0b377c
commit 9c49c5ab00
2 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -8,6 +8,7 @@ NEW IN WAF 1.6.10
* Process larger java projects #1074 * Process larger java projects #1074
* Remove the ':' from the drives when dealing with foreign files and folders on Win32 * Remove the ':' from the drives when dealing with foreign files and folders on Win32
* Let the 'subst' feature process a chmod attribute * Let the 'subst' feature process a chmod attribute
* Added a hook for distutils variable query #1083
NEW IN WAF 1.6.9 NEW IN WAF 1.6.9
---------------- ----------------

38
waflib/Tools/python.py
View File

@ -53,6 +53,8 @@ py_compile.compile(sys.argv[1], sys.argv[2], sys.argv[3])
Piece of Python code used in :py:func:`waflib.Tools.python.install_pyfile` for installing python files Piece of Python code used in :py:func:`waflib.Tools.python.install_pyfile` for installing python files
""" """
DISTUTILS_IMP = ['from distutils.sysconfig import get_config_var, get_python_lib']
@extension('.py') @extension('.py')
def process_py(self, node): def process_py(self, node):
""" """
@ -167,9 +169,9 @@ def init_pyembed(self):
self.uselib.append('PYEMBED') self.uselib.append('PYEMBED')
@conf @conf
def get_python_variables(conf, variables, imports=['import sys']): def get_python_variables(self, variables, imports=None):
""" """
Execute a python interpreter to dump configuration variables Spawn a new python process to dump configuration variables
:param variables: variables to print :param variables: variables to print
:type variables: list of string :type variables: list of string
@ -178,7 +180,13 @@ def get_python_variables(conf, variables, imports=['import sys']):
:return: the variable values :return: the variable values
:rtype: list of string :rtype: list of string
""" """
program = list(imports) if not imports:
try:
imports = self.python_imports
except AttributeError:
imports = DISTUTILS_IMP
program = list(imports) # copy
program.append('') program.append('')
for v in variables: for v in variables:
program.append("print(repr(%s))" % v) program.append("print(repr(%s))" % v)
@ -189,9 +197,9 @@ def get_python_variables(conf, variables, imports=['import sys']):
pass pass
try: try:
out = conf.cmd_and_log(conf.env.PYTHON + ['-c', '\n'.join(program)], env=os_env) out = self.cmd_and_log(self.env.PYTHON + ['-c', '\n'.join(program)], env=os_env)
except Errors.WafError: except Errors.WafError:
conf.fatal('The distutils module is unusable: install "python-devel"?') self.fatal('The distutils module is unusable: install "python-devel"?')
return_values = [] return_values = []
for s in out.split('\n'): for s in out.split('\n'):
s = s.strip() s = s.strip()
@ -231,8 +239,7 @@ def check_python_headers(conf):
v = 'prefix SO LDFLAGS LIBDIR LIBPL INCLUDEPY Py_ENABLE_SHARED MACOSX_DEPLOYMENT_TARGET LDSHARED CFLAGS'.split() v = 'prefix SO LDFLAGS LIBDIR LIBPL INCLUDEPY Py_ENABLE_SHARED MACOSX_DEPLOYMENT_TARGET LDSHARED CFLAGS'.split()
try: try:
lst = conf.get_python_variables(["get_config_var('%s') or ''" % x for x in v], lst = conf.get_python_variables(["get_config_var('%s') or ''" % x for x in v])
['from distutils.sysconfig import get_config_var'])
except RuntimeError: except RuntimeError:
conf.fatal("Python development headers not found (-v for details).") conf.fatal("Python development headers not found (-v for details).")
@ -386,17 +393,12 @@ def check_python_version(conf, minver=None):
pydir = conf.environ['PYTHONDIR'] pydir = conf.environ['PYTHONDIR']
else: else:
if Utils.is_win32: if Utils.is_win32:
(python_LIBDEST, pydir) = \ (python_LIBDEST, pydir) = conf.get_python_variables(
conf.get_python_variables( ["get_config_var('LIBDEST') or ''",
["get_config_var('LIBDEST') or ''", "get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']])
"get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']],
['from distutils.sysconfig import get_config_var, get_python_lib'])
else: else:
python_LIBDEST = None python_LIBDEST = None
(pydir,) = \ (pydir,) = conf.get_python_variables( ["get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']])
conf.get_python_variables(
["get_python_lib(standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']],
['from distutils.sysconfig import get_python_lib'])
if python_LIBDEST is None: if python_LIBDEST is None:
if conf.env['LIBDIR']: if conf.env['LIBDIR']:
python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver) python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver)
@ -407,9 +409,7 @@ def check_python_version(conf, minver=None):
if 'PYTHONARCHDIR' in conf.environ: if 'PYTHONARCHDIR' in conf.environ:
pyarchdir = conf.environ['PYTHONARCHDIR'] pyarchdir = conf.environ['PYTHONARCHDIR']
else: else:
(pyarchdir, ) = conf.get_python_variables( (pyarchdir, ) = conf.get_python_variables( ["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']])
["get_python_lib(plat_specific=1, standard_lib=0, prefix=%r) or ''" % conf.env['PREFIX']],
['from distutils.sysconfig import get_python_lib'])
if not pyarchdir: if not pyarchdir:
pyarchdir = pydir pyarchdir = pydir