common.py (scons-4.2.0) | : | common.py (SCons-4.3.0) | ||
---|---|---|---|---|
skipping to change at line 232 | skipping to change at line 232 | |||
# end up running a dozen or more scripts, changes not only with | # end up running a dozen or more scripts, changes not only with | |||
# each release but with what is installed at the time. We think | # each release but with what is installed at the time. We think | |||
# in modern installations most are set along the way and don't | # in modern installations most are set along the way and don't | |||
# need to be picked from the env, but include these for safety's sake. | # need to be picked from the env, but include these for safety's sake. | |||
# Any VSCMD variables definitely are picked from the env and | # Any VSCMD variables definitely are picked from the env and | |||
# control execution in interesting ways. | # control execution in interesting ways. | |||
# Note these really should be unified - either controlled by vs.py, | # Note these really should be unified - either controlled by vs.py, | |||
# or synced with the the common_tools_var # settings in vs.py. | # or synced with the the common_tools_var # settings in vs.py. | |||
vs_vc_vars = [ | vs_vc_vars = [ | |||
'COMSPEC', # path to "shell" | 'COMSPEC', # path to "shell" | |||
'VS160COMNTOOLS', # path to common tools for given version | 'VS170COMNTOOLS', # path to common tools for given version | |||
'VS160COMNTOOLS', | ||||
'VS150COMNTOOLS', | 'VS150COMNTOOLS', | |||
'VS140COMNTOOLS', | 'VS140COMNTOOLS', | |||
'VS120COMNTOOLS', | 'VS120COMNTOOLS', | |||
'VS110COMNTOOLS', | 'VS110COMNTOOLS', | |||
'VS100COMNTOOLS', | 'VS100COMNTOOLS', | |||
'VS90COMNTOOLS', | 'VS90COMNTOOLS', | |||
'VS80COMNTOOLS', | 'VS80COMNTOOLS', | |||
'VS71COMNTOOLS', | 'VS71COMNTOOLS', | |||
'VS70COMNTOOLS', | 'VS70COMNTOOLS', | |||
'VS60COMNTOOLS', | 'VS60COMNTOOLS', | |||
skipping to change at line 338 | skipping to change at line 339 | |||
dkeep[key].append(str(path)) | dkeep[key].append(str(path)) | |||
for line in output.splitlines(): | for line in output.splitlines(): | |||
for k, value in rdk.items(): | for k, value in rdk.items(): | |||
match = value.match(line) | match = value.match(line) | |||
if match: | if match: | |||
add_env(match, k) | add_env(match, k) | |||
return dkeep | return dkeep | |||
def get_pch_node(env, target, source): | ||||
""" | ||||
Get the actual PCH file node | ||||
""" | ||||
pch_subst = env.get('PCH', False) and env.subst('$PCH',target=target, source | ||||
=source, conv=lambda x:x) | ||||
if not pch_subst: | ||||
return "" | ||||
if SCons.Util.is_String(pch_subst): | ||||
pch_subst = target[0].dir.File(pch_subst) | ||||
return pch_subst | ||||
# Local Variables: | # Local Variables: | |||
# tab-width:4 | # tab-width:4 | |||
# indent-tabs-mode:nil | # indent-tabs-mode:nil | |||
# End: | # End: | |||
# vim: set expandtab tabstop=4 shiftwidth=4: | # vim: set expandtab tabstop=4 shiftwidth=4: | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 17 lines changed or added |