Browse Source

deps: update gyp to 1eae492b

v0.10.25-release
Fedor Indutny 11 years ago
committed by Timothy J Fontaine
parent
commit
346b59e4a3
  1. 1
      tools/gyp/AUTHORS
  2. 6
      tools/gyp/pylib/gyp/MSVSVersion.py
  3. 9
      tools/gyp/pylib/gyp/generator/make.py
  4. 37
      tools/gyp/pylib/gyp/generator/msvs.py
  5. 58
      tools/gyp/pylib/gyp/generator/ninja.py
  6. 21
      tools/gyp/pylib/gyp/msvs_emulation.py
  7. 2
      tools/gyp/pylib/gyp/ordered_dict.py
  8. 33
      tools/gyp/pylib/gyp/win_tool.py

1
tools/gyp/AUTHORS

@ -7,4 +7,5 @@ Yandex LLC
Steven Knight <knight@baldmt.com> Steven Knight <knight@baldmt.com>
Ryan Norton <rnorton10@gmail.com> Ryan Norton <rnorton10@gmail.com>
David J. Sankel <david@sankelsoftware.com>
Eric N. Vander Weele <ericvw@gmail.com> Eric N. Vander Weele <ericvw@gmail.com>

6
tools/gyp/pylib/gyp/MSVSVersion.py

@ -96,9 +96,11 @@ class VisualStudioVersion(object):
else: else:
assert target_arch == 'x64' assert target_arch == 'x64'
arg = 'x86_amd64' arg = 'x86_amd64'
if (os.environ.get('PROCESSOR_ARCHITECTURE') == 'AMD64' or # Use the 64-on-64 compiler if we're not using an express
# edition and we're running on a 64bit OS.
if self.short_name[-1] != 'e' and (
os.environ.get('PROCESSOR_ARCHITECTURE') == 'AMD64' or
os.environ.get('PROCESSOR_ARCHITEW6432') == 'AMD64'): os.environ.get('PROCESSOR_ARCHITEW6432') == 'AMD64'):
# Use the 64-on-64 compiler if we can.
arg = 'amd64' arg = 'amd64'
return [os.path.normpath( return [os.path.normpath(
os.path.join(self.path, 'VC/vcvarsall.bat')), arg] os.path.join(self.path, 'VC/vcvarsall.bat')), arg]

9
tools/gyp/pylib/gyp/generator/make.py

@ -1951,7 +1951,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
# We write the file in the base_path directory. # We write the file in the base_path directory.
output_file = os.path.join(options.depth, base_path, base_name) output_file = os.path.join(options.depth, base_path, base_name)
if options.generator_output: if options.generator_output:
output_file = os.path.join(options.generator_output, output_file) output_file = os.path.join(
options.depth, options.generator_output, base_path, base_name)
base_path = gyp.common.RelativePath(os.path.dirname(build_file), base_path = gyp.common.RelativePath(os.path.dirname(build_file),
options.toplevel_dir) options.toplevel_dir)
return base_path, output_file return base_path, output_file
@ -1974,7 +1975,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
makefile_path = os.path.join(options.toplevel_dir, makefile_name) makefile_path = os.path.join(options.toplevel_dir, makefile_name)
if options.generator_output: if options.generator_output:
global srcdir_prefix global srcdir_prefix
makefile_path = os.path.join(options.generator_output, makefile_path) makefile_path = os.path.join(
options.toplevel_dir, options.generator_output, makefile_name)
srcdir = gyp.common.RelativePath(srcdir, options.generator_output) srcdir = gyp.common.RelativePath(srcdir, options.generator_output)
srcdir_prefix = '$(srcdir)/' srcdir_prefix = '$(srcdir)/'
@ -2094,7 +2096,8 @@ def GenerateOutput(target_list, target_dicts, data, params):
this_make_global_settings = data[build_file].get('make_global_settings', []) this_make_global_settings = data[build_file].get('make_global_settings', [])
assert make_global_settings_array == this_make_global_settings, ( assert make_global_settings_array == this_make_global_settings, (
"make_global_settings needs to be the same for all targets.") "make_global_settings needs to be the same for all targets. %s vs. %s" %
(this_make_global_settings, make_global_settings))
build_files.add(gyp.common.RelativePath(build_file, options.toplevel_dir)) build_files.add(gyp.common.RelativePath(build_file, options.toplevel_dir))
included_files = data[build_file]['included_files'] included_files = data[build_file]['included_files']

37
tools/gyp/pylib/gyp/generator/msvs.py

@ -209,13 +209,14 @@ def _FixPaths(paths):
def _ConvertSourcesToFilterHierarchy(sources, prefix=None, excluded=None, def _ConvertSourcesToFilterHierarchy(sources, prefix=None, excluded=None,
list_excluded=True): list_excluded=True, msvs_version=None):
"""Converts a list split source file paths into a vcproj folder hierarchy. """Converts a list split source file paths into a vcproj folder hierarchy.
Arguments: Arguments:
sources: A list of source file paths split. sources: A list of source file paths split.
prefix: A list of source file path layers meant to apply to each of sources. prefix: A list of source file path layers meant to apply to each of sources.
excluded: A set of excluded files. excluded: A set of excluded files.
msvs_version: A MSVSVersion object.
Returns: Returns:
A hierarchy of filenames and MSVSProject.Filter objects that matches the A hierarchy of filenames and MSVSProject.Filter objects that matches the
@ -230,6 +231,7 @@ def _ConvertSourcesToFilterHierarchy(sources, prefix=None, excluded=None,
if not prefix: prefix = [] if not prefix: prefix = []
result = [] result = []
excluded_result = [] excluded_result = []
folders = OrderedDict()
# Gather files into the final result, excluded, or folders. # Gather files into the final result, excluded, or folders.
for s in sources: for s in sources:
if len(s) == 1: if len(s) == 1:
@ -238,10 +240,17 @@ def _ConvertSourcesToFilterHierarchy(sources, prefix=None, excluded=None,
excluded_result.append(filename) excluded_result.append(filename)
else: else:
result.append(filename) result.append(filename)
elif msvs_version and not msvs_version.UsesVcxproj():
# For MSVS 2008 and earlier, we need to process all files before walking
# the sub folders.
if not folders.get(s[0]):
folders[s[0]] = []
folders[s[0]].append(s[1:])
else: else:
contents = _ConvertSourcesToFilterHierarchy([s[1:]], prefix + [s[0]], contents = _ConvertSourcesToFilterHierarchy([s[1:]], prefix + [s[0]],
excluded=excluded, excluded=excluded,
list_excluded=list_excluded) list_excluded=list_excluded,
msvs_version=msvs_version)
contents = MSVSProject.Filter(s[0], contents=contents) contents = MSVSProject.Filter(s[0], contents=contents)
result.append(contents) result.append(contents)
# Add a folder for excluded files. # Add a folder for excluded files.
@ -249,6 +258,17 @@ def _ConvertSourcesToFilterHierarchy(sources, prefix=None, excluded=None,
excluded_folder = MSVSProject.Filter('_excluded_files', excluded_folder = MSVSProject.Filter('_excluded_files',
contents=excluded_result) contents=excluded_result)
result.append(excluded_folder) result.append(excluded_folder)
if msvs_version and msvs_version.UsesVcxproj():
return result
# Populate all the folders.
for f in folders:
contents = _ConvertSourcesToFilterHierarchy(folders[f], prefix=prefix + [f],
excluded=excluded,
list_excluded=list_excluded)
contents = MSVSProject.Filter(f, contents=contents)
result.append(contents)
return result return result
@ -971,8 +991,9 @@ def _GenerateMSVSProject(project, options, version, generator_flags):
actions_to_add) actions_to_add)
list_excluded = generator_flags.get('msvs_list_excluded_files', True) list_excluded = generator_flags.get('msvs_list_excluded_files', True)
sources, excluded_sources, excluded_idl = ( sources, excluded_sources, excluded_idl = (
_AdjustSourcesAndConvertToFilterHierarchy( _AdjustSourcesAndConvertToFilterHierarchy(spec, options, project_dir,
spec, options, project_dir, sources, excluded_sources, list_excluded)) sources, excluded_sources,
list_excluded, version))
# Add in files. # Add in files.
missing_sources = _VerifySourcesExist(sources, project_dir) missing_sources = _VerifySourcesExist(sources, project_dir)
@ -1416,7 +1437,7 @@ def _PrepareListOfSources(spec, generator_flags, gyp_file):
def _AdjustSourcesAndConvertToFilterHierarchy( def _AdjustSourcesAndConvertToFilterHierarchy(
spec, options, gyp_dir, sources, excluded_sources, list_excluded): spec, options, gyp_dir, sources, excluded_sources, list_excluded, version):
"""Adjusts the list of sources and excluded sources. """Adjusts the list of sources and excluded sources.
Also converts the sets to lists. Also converts the sets to lists.
@ -1427,6 +1448,7 @@ def _AdjustSourcesAndConvertToFilterHierarchy(
gyp_dir: The path to the gyp file being processed. gyp_dir: The path to the gyp file being processed.
sources: A set of sources to be included for this project. sources: A set of sources to be included for this project.
excluded_sources: A set of sources to be excluded for this project. excluded_sources: A set of sources to be excluded for this project.
version: A MSVSVersion object.
Returns: Returns:
A trio of (list of sources, list of excluded sources, A trio of (list of sources, list of excluded sources,
path of excluded IDL file) path of excluded IDL file)
@ -1451,7 +1473,8 @@ def _AdjustSourcesAndConvertToFilterHierarchy(
# Convert to folders and the right slashes. # Convert to folders and the right slashes.
sources = [i.split('\\') for i in sources] sources = [i.split('\\') for i in sources]
sources = _ConvertSourcesToFilterHierarchy(sources, excluded=fully_excluded, sources = _ConvertSourcesToFilterHierarchy(sources, excluded=fully_excluded,
list_excluded=list_excluded) list_excluded=list_excluded,
msvs_version=version)
# Prune filters with a single child to flatten ugly directory structures # Prune filters with a single child to flatten ugly directory structures
# such as ../../src/modules/module1 etc. # such as ../../src/modules/module1 etc.
@ -3126,7 +3149,7 @@ def _GenerateMSBuildProject(project, options, version, generator_flags):
_AdjustSourcesAndConvertToFilterHierarchy(spec, options, _AdjustSourcesAndConvertToFilterHierarchy(spec, options,
project_dir, sources, project_dir, sources,
excluded_sources, excluded_sources,
list_excluded)) list_excluded, version))
# Don't add actions if we are using an external builder like ninja. # Don't add actions if we are using an external builder like ninja.
if not spec.get('msvs_external_builder'): if not spec.get('msvs_external_builder'):

58
tools/gyp/pylib/gyp/generator/ninja.py

@ -1037,12 +1037,13 @@ class NinjaWriter:
self.GypPathToNinja, arch) self.GypPathToNinja, arch)
ldflags = env_ldflags + ldflags ldflags = env_ldflags + ldflags
elif self.flavor == 'win': elif self.flavor == 'win':
manifest_name = self.GypPathToUniqueOutput( manifest_base_name = self.GypPathToUniqueOutput(
self.ComputeOutputFileName(spec)) self.ComputeOutputFileName(spec))
ldflags, intermediate_manifest, manifest_files = \ ldflags, intermediate_manifest, manifest_files = \
self.msvs_settings.GetLdflags(config_name, self.GypPathToNinja, self.msvs_settings.GetLdflags(config_name, self.GypPathToNinja,
self.ExpandSpecial, manifest_name, self.ExpandSpecial, manifest_base_name,
is_executable, self.toplevel_build) output, is_executable,
self.toplevel_build)
ldflags = env_ldflags + ldflags ldflags = env_ldflags + ldflags
self.WriteVariableList(ninja_file, 'manifests', manifest_files) self.WriteVariableList(ninja_file, 'manifests', manifest_files)
implicit_deps = implicit_deps.union(manifest_files) implicit_deps = implicit_deps.union(manifest_files)
@ -1095,16 +1096,27 @@ class NinjaWriter:
extra_bindings.append(('lib', extra_bindings.append(('lib',
gyp.common.EncodePOSIXShellArgument(output))) gyp.common.EncodePOSIXShellArgument(output)))
if self.flavor == 'win': if self.flavor == 'win':
extra_bindings.append(('dll', output)) extra_bindings.append(('binary', output))
if '/NOENTRY' not in ldflags: if '/NOENTRY' not in ldflags:
self.target.import_lib = output + '.lib' self.target.import_lib = output + '.lib'
extra_bindings.append(('implibflag', extra_bindings.append(('implibflag',
'/IMPLIB:%s' % self.target.import_lib)) '/IMPLIB:%s' % self.target.import_lib))
pdbname = self.msvs_settings.GetPDBName(
config_name, self.ExpandSpecial, output + '.pdb')
output = [output, self.target.import_lib] output = [output, self.target.import_lib]
if pdbname:
output.append(pdbname)
elif not self.is_mac_bundle: elif not self.is_mac_bundle:
output = [output, output + '.TOC'] output = [output, output + '.TOC']
else: else:
command = command + '_notoc' command = command + '_notoc'
elif self.flavor == 'win':
extra_bindings.append(('binary', output))
pdbname = self.msvs_settings.GetPDBName(
config_name, self.ExpandSpecial, output + '.pdb')
if pdbname:
output = [output, pdbname]
if len(solibs): if len(solibs):
extra_bindings.append(('solibs', gyp.common.EncodePOSIXShellList(solibs))) extra_bindings.append(('solibs', gyp.common.EncodePOSIXShellList(solibs)))
@ -1545,7 +1557,10 @@ def GetDefaultConcurrentLinks():
mem_limit = max(1, stat.ullTotalPhys / (4 * (2 ** 30))) # total / 4GB mem_limit = max(1, stat.ullTotalPhys / (4 * (2 ** 30))) # total / 4GB
hard_cap = max(1, int(os.getenv('GYP_LINK_CONCURRENCY_MAX', 2**32))) hard_cap = max(1, int(os.getenv('GYP_LINK_CONCURRENCY_MAX', 2**32)))
return min(mem_limit, hard_cap) # return min(mem_limit, hard_cap)
# TODO(scottmg): Temporary speculative fix for OOM on builders
# See http://crbug.com/333000.
return 2
elif sys.platform.startswith('linux'): elif sys.platform.startswith('linux'):
with open("/proc/meminfo") as meminfo: with open("/proc/meminfo") as meminfo:
memtotal_re = re.compile(r'^MemTotal:\s*(\d*)\s*kB') memtotal_re = re.compile(r'^MemTotal:\s*(\d*)\s*kB')
@ -1591,33 +1606,35 @@ def _AddWinLinkRules(master_ninja, embed_manifest):
'resname': resource_name, 'resname': resource_name,
'embed': embed_manifest } 'embed': embed_manifest }
rule_name_suffix = _GetWinLinkRuleNameSuffix(embed_manifest) rule_name_suffix = _GetWinLinkRuleNameSuffix(embed_manifest)
dlldesc = 'LINK%s(DLL) $dll' % rule_name_suffix.upper() use_separate_mspdbsrv = (
dllcmd = ('%s gyp-win-tool link-wrapper $arch ' int(os.environ.get('GYP_USE_SEPARATE_MSPDBSRV', '0')) != 0)
'$ld /nologo $implibflag /DLL /OUT:$dll ' dlldesc = 'LINK%s(DLL) $binary' % rule_name_suffix.upper()
'/PDB:$dll.pdb @$dll.rsp' % sys.executable) dllcmd = ('%s gyp-win-tool link-wrapper $arch %s '
dllcmd = FullLinkCommand(dllcmd, '$dll', 'dll') '$ld /nologo $implibflag /DLL /OUT:$binary '
'@$binary.rsp' % (sys.executable, use_separate_mspdbsrv))
dllcmd = FullLinkCommand(dllcmd, '$binary', 'dll')
master_ninja.rule('solink' + rule_name_suffix, master_ninja.rule('solink' + rule_name_suffix,
description=dlldesc, command=dllcmd, description=dlldesc, command=dllcmd,
rspfile='$dll.rsp', rspfile='$binary.rsp',
rspfile_content='$libs $in_newline $ldflags', rspfile_content='$libs $in_newline $ldflags',
restat=True, restat=True,
pool='link_pool') pool='link_pool')
master_ninja.rule('solink_module' + rule_name_suffix, master_ninja.rule('solink_module' + rule_name_suffix,
description=dlldesc, command=dllcmd, description=dlldesc, command=dllcmd,
rspfile='$dll.rsp', rspfile='$binary.rsp',
rspfile_content='$libs $in_newline $ldflags', rspfile_content='$libs $in_newline $ldflags',
restat=True, restat=True,
pool='link_pool') pool='link_pool')
# Note that ldflags goes at the end so that it has the option of # Note that ldflags goes at the end so that it has the option of
# overriding default settings earlier in the command line. # overriding default settings earlier in the command line.
exe_cmd = ('%s gyp-win-tool link-wrapper $arch ' exe_cmd = ('%s gyp-win-tool link-wrapper $arch %s '
'$ld /nologo /OUT:$out /PDB:$out.pdb @$out.rsp' % '$ld /nologo /OUT:$binary @$binary.rsp' %
sys.executable) (sys.executable, use_separate_mspdbsrv))
exe_cmd = FullLinkCommand(exe_cmd, '$out', 'exe') exe_cmd = FullLinkCommand(exe_cmd, '$binary', 'exe')
master_ninja.rule('link' + rule_name_suffix, master_ninja.rule('link' + rule_name_suffix,
description='LINK%s $out' % rule_name_suffix.upper(), description='LINK%s $binary' % rule_name_suffix.upper(),
command=exe_cmd, command=exe_cmd,
rspfile='$out.rsp', rspfile='$binary.rsp',
rspfile_content='$in_newline $libs $ldflags', rspfile_content='$in_newline $libs $ldflags',
pool='link_pool') pool='link_pool')
@ -1877,7 +1894,7 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
master_ninja.rule( master_ninja.rule(
'alink', 'alink',
description='LIB $out', description='LIB $out',
command=('%s gyp-win-tool link-wrapper $arch ' command=('%s gyp-win-tool link-wrapper $arch False '
'$ar /nologo /ignore:4221 /OUT:$out @$out.rsp' % '$ar /nologo /ignore:4221 /OUT:$out @$out.rsp' %
sys.executable), sys.executable),
rspfile='$out.rsp', rspfile='$out.rsp',
@ -2027,7 +2044,8 @@ def GenerateOutputForConfig(target_list, target_dicts, data, params,
this_make_global_settings = data[build_file].get('make_global_settings', []) this_make_global_settings = data[build_file].get('make_global_settings', [])
assert make_global_settings == this_make_global_settings, ( assert make_global_settings == this_make_global_settings, (
"make_global_settings needs to be the same for all targets.") "make_global_settings needs to be the same for all targets. %s vs. %s" %
(this_make_global_settings, make_global_settings))
spec = target_dicts[qualified_target] spec = target_dicts[qualified_target]
if flavor == 'mac': if flavor == 'mac':

21
tools/gyp/pylib/gyp/msvs_emulation.py

@ -317,15 +317,20 @@ class MsvsSettings(object):
output_file, config=config)) output_file, config=config))
return output_file return output_file
def GetPDBName(self, config, expand_special): def GetPDBName(self, config, expand_special, default):
"""Gets the explicitly overridden pdb name for a target or returns None """Gets the explicitly overridden pdb name for a target or returns
if it's not overridden.""" default if it's not overridden, or if no pdb will be generated."""
config = self._TargetConfig(config) config = self._TargetConfig(config)
output_file = self._Setting(('VCLinkerTool', 'ProgramDatabaseFile'), config) output_file = self._Setting(('VCLinkerTool', 'ProgramDatabaseFile'), config)
generate_debug_info = self._Setting(
('VCLinkerTool', 'GenerateDebugInformation'), config)
if generate_debug_info:
if output_file: if output_file:
output_file = expand_special(self.ConvertVSMacros( return expand_special(self.ConvertVSMacros(output_file, config=config))
output_file, config=config)) else:
return output_file return default
else:
return None
def GetCflags(self, config): def GetCflags(self, config):
"""Returns the flags that need to be added to .c and .cc compilations.""" """Returns the flags that need to be added to .c and .cc compilations."""
@ -454,7 +459,7 @@ class MsvsSettings(object):
return output_file return output_file
def GetLdflags(self, config, gyp_to_build_path, expand_special, def GetLdflags(self, config, gyp_to_build_path, expand_special,
manifest_base_name, is_executable, build_dir): manifest_base_name, output_name, is_executable, build_dir):
"""Returns the flags that need to be added to link commands, and the """Returns the flags that need to be added to link commands, and the
manifest files.""" manifest files."""
config = self._TargetConfig(config) config = self._TargetConfig(config)
@ -472,7 +477,7 @@ class MsvsSettings(object):
out = self.GetOutputName(config, expand_special) out = self.GetOutputName(config, expand_special)
if out: if out:
ldflags.append('/OUT:' + out) ldflags.append('/OUT:' + out)
pdb = self.GetPDBName(config, expand_special) pdb = self.GetPDBName(config, expand_special, output_name + '.pdb')
if pdb: if pdb:
ldflags.append('/PDB:' + pdb) ldflags.append('/PDB:' + pdb)
pgd = self.GetPGDName(config, expand_special) pgd = self.GetPGDName(config, expand_special)

2
tools/gyp/pylib/gyp/ordered_dict.py

@ -166,6 +166,8 @@ class OrderedDict(dict):
for k in self: for k in self:
yield (k, self[k]) yield (k, self[k])
# Suppress 'OrderedDict.update: Method has no argument':
# pylint: disable=E0211
def update(*args, **kwds): def update(*args, **kwds):
'''od.update(E, **F) -> None. Update od from dict/iterable E and F. '''od.update(E, **F) -> None. Update od from dict/iterable E and F.

33
tools/gyp/pylib/gyp/win_tool.py

@ -18,9 +18,9 @@ import sys
BASE_DIR = os.path.dirname(os.path.abspath(__file__)) BASE_DIR = os.path.dirname(os.path.abspath(__file__))
# A regex matching an argument corresponding to a PDB filename passed as an # A regex matching an argument corresponding to the output filename passed to
# argument to link.exe. # link.exe.
_LINK_EXE_PDB_ARG = re.compile('/PDB:(?P<pdb>.+\.exe\.pdb)$', re.IGNORECASE) _LINK_EXE_OUT_ARG = re.compile('/OUT:(?P<out>.+)$', re.IGNORECASE)
def main(args): def main(args):
executor = WinTool() executor = WinTool()
@ -33,25 +33,22 @@ class WinTool(object):
"""This class performs all the Windows tooling steps. The methods can either """This class performs all the Windows tooling steps. The methods can either
be executed directly, or dispatched from an argument list.""" be executed directly, or dispatched from an argument list."""
def _MaybeUseSeparateMspdbsrv(self, env, args): def _UseSeparateMspdbsrv(self, env, args):
"""Allows to use a unique instance of mspdbsrv.exe for the linkers linking """Allows to use a unique instance of mspdbsrv.exe per linker instead of a
an .exe target if GYP_USE_SEPARATE_MSPDBSRV has been set.""" shared one."""
if not os.environ.get('GYP_USE_SEPARATE_MSPDBSRV'):
return
if len(args) < 1: if len(args) < 1:
raise Exception("Not enough arguments") raise Exception("Not enough arguments")
if args[0] != 'link.exe': if args[0] != 'link.exe':
return return
# Checks if this linker produces a PDB for an .exe target. If so use the # Use the output filename passed to the linker to generate an endpoint name
# name of this PDB to generate an endpoint name for mspdbsrv.exe. # for mspdbsrv.exe.
endpoint_name = None endpoint_name = None
for arg in args: for arg in args:
m = _LINK_EXE_PDB_ARG.match(arg) m = _LINK_EXE_OUT_ARG.match(arg)
if m: if m:
endpoint_name = '%s_%d' % (m.group('pdb'), os.getpid()) endpoint_name = '%s_%d' % (m.group('out'), os.getpid())
break break
if endpoint_name is None: if endpoint_name is None:
@ -99,13 +96,14 @@ class WinTool(object):
else: else:
shutil.copy2(source, dest) shutil.copy2(source, dest)
def ExecLinkWrapper(self, arch, *args): def ExecLinkWrapper(self, arch, use_separate_mspdbsrv, *args):
"""Filter diagnostic output from link that looks like: """Filter diagnostic output from link that looks like:
' Creating library ui.dll.lib and object ui.dll.exp' ' Creating library ui.dll.lib and object ui.dll.exp'
This happens when there are exports from the dll or exe. This happens when there are exports from the dll or exe.
""" """
env = self._GetEnv(arch) env = self._GetEnv(arch)
self._MaybeUseSeparateMspdbsrv(env, args) if use_separate_mspdbsrv == 'True':
self._UseSeparateMspdbsrv(env, args)
link = subprocess.Popen(args, link = subprocess.Popen(args,
shell=True, shell=True,
env=env, env=env,
@ -280,6 +278,11 @@ class WinTool(object):
"""Runs an action command line from a response file using the environment """Runs an action command line from a response file using the environment
for |arch|. If |dir| is supplied, use that as the working directory.""" for |arch|. If |dir| is supplied, use that as the working directory."""
env = self._GetEnv(arch) env = self._GetEnv(arch)
# TODO(scottmg): This is a temporary hack to get some specific variables
# through to actions that are set after gyp-time. http://crbug.com/333738.
for k, v in os.environ.iteritems():
if k not in env:
env[k] = v
args = open(rspfile).read() args = open(rspfile).read()
dir = dir[0] if dir else None dir = dir[0] if dir else None
return subprocess.call(args, shell=True, env=env, cwd=dir) return subprocess.call(args, shell=True, env=env, cwd=dir)

Loading…
Cancel
Save