Make a Clean() environment method. Add global functions for AlwaysBuild(), Command(), Depends(), Ignore(), Install(), InstallAs(), Precious(), SideEffect() and SourceCode().

10 files changed, 21 insertions, 12 deletions

diff --git a/test/AlwaysBuild.py b/test/AlwaysBuild.py
index 832120a..2c50841 100644
--- a/test/AlwaysBuild.py
+++ b/test/AlwaysBuild.py
@@ -41,7 +41,7 @@ def bfunc(target, source, env):
 B = Builder(action=bfunc)
 env = Environment(BUILDERS = { 'B' : B }, SUBDIR='sub')
 env.B('f1.out', source='f1.in')
-env.AlwaysBuild('f1.out')
+AlwaysBuild('f1.out')
 
 env.B(r'%s', source='f3.in')
 env.AlwaysBuild(r'%s')
diff --git a/test/Command.py b/test/Command.py
index 18029ee..ff81f66 100644
--- a/test/Command.py
+++ b/test/Command.py
@@ -71,7 +71,7 @@ env.Command(target = 'f2.out', source = 'f2.in',
 env.Command(target = 'f3.out', source = 'f3.in',
             action = [ [ r'%s', 'build.py', 'temp3', '$SOURCES' ],
                        [ r'%s', 'build.py', '$TARGET', 'temp3'] ])
-env.Command(target = 'f4.out', source = 'sub', action = sub)
+Command(target = 'f4.out', source = 'sub', action = sub)
 """ % (python, python, python, python))
 
 test.write('f1.in', "f1.in\n")
diff --git a/test/Depends.py b/test/Depends.py
index d65f2b6..4dfc55a 100644
--- a/test/Depends.py
+++ b/test/Depends.py
@@ -59,7 +59,7 @@ SConscript('subdir/SConscript', "env")
 
 test.write(['subdir', 'SConscript'], """
 Import("env")
-env.Depends(target = 'f4.out', dependency = 'bar.dep')
+Depends(target = 'f4.out', dependency = 'bar.dep')
 env.Bar(target = 'f4.out', source = 'f4.in')
 """)
 
diff --git a/test/Ignore.py b/test/Ignore.py
index 6809434..5e9650e 100644
--- a/test/Ignore.py
+++ b/test/Ignore.py
@@ -48,7 +48,7 @@ Foo = Builder(action = r"%s build.py $TARGET $SOURCES")
 Bar = Builder(action = r"%s build.py $TARGET $SOURCES")
 env = Environment(BUILDERS = { 'Foo' : Foo, 'Bar' : Bar }, SUBDIR='subdir')
 env.Foo(target = 'f1.out', source = ['f1a.in', 'f1b.in'])
-env.Ignore(target = 'f1.out', dependency = 'f1b.in')
+Ignore(target = 'f1.out', dependency = 'f1b.in')
 SConscript('subdir/SConscript', "env")
 env.Foo(target = 'subdir/f3.out', source = ['subdir/f3a.in', 'subdir/f3b.in'])
 env.Ignore(target = r'%s', dependency = r'%s')
diff --git a/test/Install.py b/test/Install.py
index 7637662..fb510f4 100644
--- a/test/Install.py
+++ b/test/Install.py
@@ -63,7 +63,7 @@ env3 = env1.Copy(INSTALL = my_install)
 t = env1.Cat(target='f1.out', source='f1.in')
 env1.Install(dir='export', source=t)
 t = env1.Cat(target='f2.out', source='f2.in')
-env1.Install(dir='export', source=t)
+Install(dir='export', source=t)
 
 t = env3.Cat(target='f3.out', source='f3.in')
 env3.Install(dir='export', source=t)
diff --git a/test/InstallAs.py b/test/InstallAs.py
index 643ac85..c4e88f6 100644
--- a/test/InstallAs.py
+++ b/test/InstallAs.py
@@ -44,7 +44,7 @@ install_file3_out = test.workpath('install', 'file3.out')
 #
 test.write('SConstruct', r"""
 env = Environment(INSTALLDIR=r'%s', SUBDIR='subdir')
-env.InstallAs(r'%s', 'file1.in')
+InstallAs(r'%s', 'file1.in')
 env.InstallAs([r'%s', r'%s'], ['file2.in', r'%s'])
 """ % (install,
        install_file1_out,
diff --git a/test/Precious.py b/test/Precious.py
index 6aee9b0..940fab7 100644
--- a/test/Precious.py
+++ b/test/Precious.py
@@ -56,7 +56,7 @@ Import("env")
 env.B(target = 'f5.out', source = 'f5.in')
 f6 = env.B(target = 'f6.out', source = 'f6.in')
 env.B(target = 'f7.out', source = 'f7.in')
-env.Precious(['f5.out', f6])
+Precious(['f5.out', f6])
 """)
 
 test.write('f1.in', "f1.in\n")
diff --git a/test/SideEffect.py b/test/SideEffect.py
index 61b0d58..33a553a 100644
--- a/test/SideEffect.py
+++ b/test/SideEffect.py
@@ -45,7 +45,7 @@ env = Environment(BUILDERS={'Build':Build}, SUBDIR='subdir')
 env.Build('foo.out', 'foo.in')
 env.Build('bar.out', 'bar.in')
 env.Build('blat.out', 'blat.in')
-env.SideEffect('log.txt', ['foo.out', 'bar.out', 'blat.out'])
+SideEffect('log.txt', ['foo.out', 'bar.out', 'blat.out'])
 env.Build('log.out', 'log.txt')
 env.Build('subdir/baz.out', 'baz.in')
 env.SideEffect(r'%s', ['blat.out', r'%s'])
diff --git a/test/SourceCode.py b/test/SourceCode.py
index cd8baf4..de2653f 100644
--- a/test/SourceCode.py
+++ b/test/SourceCode.py
@@ -35,7 +35,7 @@ import TestSCons
 
 test = TestSCons.TestSCons()
 
-test.subdir('sub')
+test.subdir('sub', 'sub2')
 
 test.write('SConstruct', """\
 import os.path
@@ -62,11 +62,15 @@ env.Cat('ccc.out', 'sub/ccc.in')
 env.Cat('all', ['aaa.out', 'bbb.out', 'ccc.out'])
 env.SourceCode('$SUBDIR', Builder(action=sc_cat, env=env))
 SConscript('sub/SConscript', "env")
+
+SourceCode('sub2', Builder(action=sc_cat, env=env))
+env.Cat('ddd.out', 'sub2/ddd.in')
 """)
 
 test.write(['sub', 'sc-aaa.in'], "sub/sc-aaa.in\n")
 test.write(['sub', 'sc-bbb.in'], "sub/sc-bbb.in\n")
 test.write(['sub', 'sc-ccc.in'], "sub/sc-ccc.in\n")
+test.write(['sub2', 'sc-ddd.in'], "sub2/sc-ddd.in\n")
 
 test.write(['sub', 'sc-SConscript'], "'sub/sc-SConscript'\n")
 
@@ -82,14 +86,19 @@ cat("bbb.out", "%s")
 sc_cat("%s", [])
 cat("ccc.out", "%s")
 cat("all", ["aaa.out", "bbb.out", "ccc.out"])
+sc_cat("%s", [])
+cat("ddd.out", "%s")
 """ % (os.path.join('sub', 'aaa.in'),
        os.path.join('sub', 'aaa.in'),
        os.path.join('sub', 'bbb.in'),
        os.path.join('sub', 'bbb.in'),
        os.path.join('sub', 'ccc.in'),
-       os.path.join('sub', 'ccc.in'))))
+       os.path.join('sub', 'ccc.in'),
+       os.path.join('sub2', 'ddd.in'),
+       os.path.join('sub2', 'ddd.in'))))
 
 test.fail_test(test.read(['sub', 'SConscript']) != "'sub/sc-SConscript'\n")
 test.fail_test(test.read('all') != "sub/sc-aaa.in\nsub/sc-bbb.in\nsub/sc-ccc.in\n")
+test.fail_test(test.read('ddd.out') != "sub2/sc-ddd.in\n")
 
 test.pass_test()
diff --git a/test/option-c.py b/test/option-c.py
index c149c2a..1596d9f 100644
--- a/test/option-c.py
+++ b/test/option-c.py
@@ -164,14 +164,14 @@ test.write('aux1.x', "aux1.x\n")
 test.write('aux2.x', "aux2.x\n")
 test.write('SConstruct', """
 B = Builder(action = r'%s build.py $TARGETS $SOURCES')
-env = Environment(BUILDERS = { 'B' : B })
+env = Environment(BUILDERS = { 'B' : B }, FOO = 'foo2')
 env.B(target = 'foo1.out', source = 'foo1.in')
 env.B(target = 'foo2.out', source = 'foo2.xxx')
 env.B(target = 'foo2.xxx', source = 'foo2.in')
 env.B(target = 'foo3.out', source = 'foo3.in')
 SConscript('subd/SConscript')
 Clean('foo2.xxx', ['aux1.x'])
-Clean('foo2.xxx', ['aux2.x'])
+env.Clean('${FOO}.xxx', ['aux2.x'])
 Clean('.', ['subd'])
 """ % python)