From: g0dil <g0dil@270642c3-0616-0410-b53a-bc976706d245>
Date: Fri, 21 Aug 2009 08:50:16 +0000 (+0000)
Subject: Fix SCons 1.2.0 build failure
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=164fe477094d42463722584e527a02379ab5d985;p=senf.git

Fix SCons 1.2.0 build failure

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1315 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/site_scons/site_tools/Boost.py b/site_scons/site_tools/Boost.py
index 4e07ac3..7c0255b 100644
--- a/site_scons/site_tools/Boost.py
+++ b/site_scons/site_tools/Boost.py
@@ -89,11 +89,10 @@ def BoostUnitTest(env, target=None, source=None,  **kw):
                       **kw)
 
     stamp = env.Command(stampnode, bin,
-                        [ '$SOURCE $BOOSTTESTARGS',
-                          'touch $TARGET' ],
+                        [ '$SOURCE $BOOSTTESTARGS', SCons.Script.Touch('$TARGET')],
                         **kw)
 
-    alias = env.Command(env.File(target), stamp, [])
+    alias = env.Command(env.File(target), stamp, [ env.NopAction() ] )
 
     compileTests = [ src for src in source 
                      if src.suffix in SCons.Tool.cplusplus.CXXSuffixes \
@@ -109,6 +108,11 @@ def BoostUnitTest(env, target=None, source=None,  **kw):
 def FindAllBoostUnitTests(env, target, source):
     return _ALL_TESTS
 
+def NopAction(env, target, source):
+    def nop(target, source, env) : return None
+    def nopstr(target, source, env) : return ''
+    return env.Action(nop, nopstr)
+
 def generate(env):
     env.SetDefault(
         BOOST_VARIANT     = '',
@@ -131,6 +135,7 @@ def generate(env):
         source_scanner = SCons.Scanner.C.CScanner(),
         single_source=1
         )
+    env['BUILDERS']['NopAction'] = NopAction
 
 def exists(env):
     return True