Add ability to use "$SOURCE" when specifying a target to a builder; fixes #2219.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@3524 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 2e3388931896d7a576ed65fd8c0932c9e6ed7d51..ca1fa5a89c81fedcdb2af85630e5f740155c52ad 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -116,6 +116,8 @@ RELEASE 1.X - XXX
     - Add a delete_existing keyword argument to the AppendENVPath()
       and PrependENVPath() Environment methods.
 
+    - Add ability to use "$SOURCE" when specifying a target to a builder
+
   From Damyan Pepper:
 
     - Add a test case to verify that SConsignFile() files can be

diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py
index 977bdeaf03cfdabcbe50e8063ee306f8cae52991..05a3ed1c2f99ccb60d051c4851870ec926ab7e22 100644 (file)
--- a/src/engine/SCons/Builder.py
+++ b/src/engine/SCons/Builder.py
@@ -505,7 +505,7 @@ class BuilderBase:
                 tlist = [ t_from_s(pre, suf, splitext) ]
         else:
             target = self._adjustixes(target, pre, suf, self.ensure_suffix)
-            tlist = env.arg2nodes(target, target_factory)
+            tlist = env.arg2nodes(target, target_factory, target=target, source=source)
 
         if self.emitter:
             # The emitter is going to do str(node), but because we're

diff --git a/src/engine/SCons/Subst.py b/src/engine/SCons/Subst.py
index 8646f626ca0d903295570ccd2d0c5c0ff44e9e38..752bbff05b918ab32dc311cb569df500c7b8cf35 100644 (file)
--- a/src/engine/SCons/Subst.py
+++ b/src/engine/SCons/Subst.py
@@ -270,7 +270,13 @@ def subst_dict(target, source):
     dict = {}
 
     if target:
-        tnl = NLWrapper(target, lambda x: x.get_subst_proxy())
+        def get_tgt_subst_proxy(thing):
+            try:
+                subst_proxy = thing.get_subst_proxy()
+            except AttributeError:
+                subst_proxy = thing # probably a string, just return it
+            return subst_proxy
+        tnl = NLWrapper(target, get_tgt_subst_proxy)
         dict['TARGETS'] = Targets_or_Sources(tnl)
         dict['TARGET'] = Target_or_Source(tnl)
     else:
@@ -285,7 +291,10 @@ def subst_dict(target, source):
                 pass
             else:
                 node = rfile()
-            return node.get_subst_proxy()
+            try:
+                return node.get_subst_proxy()
+            except AttributeError:
+                return node     # probably a String, just return it
         snl = NLWrapper(source, get_src_subst_proxy)
         dict['SOURCES'] = Targets_or_Sources(snl)
         dict['SOURCE'] = Target_or_Source(snl)

diff --git a/test/Builder/TargetSubst.py b/test/Builder/TargetSubst.py
new file mode 100644 (file)
index 0000000..396d371
--- /dev/null
+++ b/test/Builder/TargetSubst.py
@@ -0,0 +1,46 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify that the ensure_suffix argument to causes us to add the suffix
+configured for the Builder even if it looks like the target already has
+a different suffix.
+"""
+
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """\
+env = Environment()
+builder = Builder(action=Copy('$TARGET', '$SOURCE'))
+tgt = builder(env, target="${SOURCE}.out", source="infile")
+""")
+
+test.write('infile', "infile\n")
+test.run(arguments = '.')
+test.must_match('infile.out', "infile\n")
+test.pass_test()