diff options
| -rw-r--r-- | src/engine/SCons/Builder.py | 15 | ||||
| -rw-r--r-- | test/multiline.py | 41 |
2 files changed, 56 insertions, 0 deletions
diff --git a/src/engine/SCons/Builder.py b/src/engine/SCons/Builder.py index 2852b3a..d354c57 100644 --- a/src/engine/SCons/Builder.py +++ b/src/engine/SCons/Builder.py @@ -66,10 +66,16 @@ execute_actions = 1; def Action(act): """A factory for action objects.""" + if type(act) == types.StringType: + l = string.split(act, "\n") + if len(l) > 1: + act = l if type(act) == types.FunctionType: return FunctionAction(act) elif type(act) == types.StringType: return CommandAction(act) + elif type(act) == types.ListType: + return ListAction(act) else: return None @@ -119,3 +125,12 @@ class FunctionAction(ActionBase): # XXX: WHAT SHOULD WE PRINT HERE? if execute_actions: self.function(kw) + +class ListAction(ActionBase): + """Class for lists of other actions.""" + def __init__(self, list): + self.list = map(lambda x: Action(x), list) + + def execute(self, **kw): + for l in self.list: + apply(l.execute, (), kw) diff --git a/test/multiline.py b/test/multiline.py new file mode 100644 index 0000000..5c51fac --- /dev/null +++ b/test/multiline.py @@ -0,0 +1,41 @@ +#!/usr/bin/env python + +__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" + +import os.path +import TestSCons + +test = TestSCons.TestSCons() + +test.write('build.py', r""" +import sys +contents = open(sys.argv[2], 'r').read() +file = open(sys.argv[1], 'w') +file.write(contents) +file.close() +""") + +test.write('SConstruct', """ +B1 = Builder(name = 'B1', action = ["python build.py .temp %(source)s", + "python build.py %(target)s .temp"]) +B2 = Builder(name = 'B2', action = "python build.py .temp %(source)s\\npython build.py %(target)s .temp") +env = Environment(BUILDERS = [B1, B2]) +env.B1(target = 'foo1.out', source = 'foo1.in') +env.B2(target = 'foo2.out', source = 'foo2.in') +env.B1(target = 'foo3.out', source = 'foo3.in') +""") + +test.write('foo1.in', "foo1.in\n") + +test.write('foo2.in', "foo2.in\n") + +test.write('foo3.in', "foo3.in\n") + +test.run(arguments = 'foo1.out foo2.out foo3.out') + +test.fail_test(test.read(test.workpath('foo1.out')) != "foo1.in\n") +test.fail_test(test.read(test.workpath('foo2.out')) != "foo2.in\n") +test.fail_test(test.read(test.workpath('foo3.out')) != "foo3.in\n") + +test.pass_test() + |