diff options
| author | Steven Knight <knight@baldmt.com> | 2003-09-05 19:26:05 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-09-05 19:26:05 (GMT) |
| commit | bf221d4e593f803116af76ec3bc16514b666c9f1 (patch) | |
| tree | d80f1ab39365370ce1f50dba335af34f8cad83e2 /src/engine/SCons/Builder.py | |
| parent | f1d7f1dc87300ea5c905c648c39aeee031100c8c (diff) | |
| download | SCons-bf221d4e593f803116af76ec3bc16514b666c9f1.zip SCons-bf221d4e593f803116af76ec3bc16514b666c9f1.tar.gz SCons-bf221d4e593f803116af76ec3bc16514b666c9f1.tar.bz2 | |
Support construction variable expansion anywhere in a file or path name.
Diffstat (limited to 'src/engine/SCons/Builder.py')
| -rw-r--r-- | src/engine/SCons/Builder.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index af03e82..fe017ae 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -49,7 +49,6 @@ import UserDict import SCons.Action from SCons.Errors import InternalError, UserError import SCons.Executor -import SCons.Node import SCons.Node.FS import SCons.Util import SCons.Warnings @@ -329,7 +328,7 @@ class BuilderBase: src_suf = self.get_src_suffix(env) source = adjustixes(source, None, src_suf) - slist = SCons.Node.arg2nodes(source, self.source_factory) + slist = env.arg2nodes(source, self.source_factory) pre = self.get_prefix(env, slist) suf = self.get_suffix(env, slist) @@ -342,7 +341,7 @@ class BuilderBase: tlist = [ t_from_s(pre, suf, self.splitext) ] else: target = adjustixes(target, pre, suf) - tlist = SCons.Node.arg2nodes(target, self.target_factory) + tlist = env.arg2nodes(target, self.target_factory) if self.emitter: # The emitter is going to do str(node), but because we're @@ -369,8 +368,8 @@ class BuilderBase: # Have to call arg2nodes yet again, since it is legal for # emitters to spit out strings as well as Node instances. - slist = SCons.Node.arg2nodes(source, self.source_factory) - tlist = SCons.Node.arg2nodes(target, self.target_factory) + slist = env.arg2nodes(source, self.source_factory) + tlist = env.arg2nodes(target, self.target_factory) return tlist, slist @@ -503,7 +502,7 @@ class MultiStepBuilder(BuilderBase): source = target target = None - slist = SCons.Node.arg2nodes(source, self.source_factory) + slist = env.arg2nodes(source, self.source_factory) final_sources = [] try: |