diff options
| author | Steven Knight <knight@baldmt.com> | 2006-11-04 05:31:24 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2006-11-04 05:31:24 (GMT) |
| commit | c36a10f28f1c38541757cbbe96d67cd87a2096e7 (patch) | |
| tree | 6631963b4e4521d9a9a643edc1269409083e4651 /test/AS | |
| parent | 6fcc7d78858a5ca068e3deea183d35295b7dd88e (diff) | |
| download | SCons-c36a10f28f1c38541757cbbe96d67cd87a2096e7.zip SCons-c36a10f28f1c38541757cbbe96d67cd87a2096e7.tar.gz SCons-c36a10f28f1c38541757cbbe96d67cd87a2096e7.tar.bz2 | |
Merged revisions 1667-1674 via svnmerge from
http://scons.tigris.org/svn/scons/branches/core
........
r1672 | stevenknight | 2006-11-03 23:11:52 -0600 (Fri, 03 Nov 2006) | 1 line
0.96.D480 - Don't use UNIX logic to detect an executable qmtest.py on Windows.
........
r1673 | stevenknight | 2006-11-03 23:18:59 -0600 (Fri, 03 Nov 2006) | 1 line
0.96.D481 - Remove the print statement from the previous checkin.
........
r1674 | stevenknight | 2006-11-03 23:25:43 -0600 (Fri, 03 Nov 2006) | 1 line
0.96.D482 - Create a env.Clone() method and encourage its use in favor of env.Copy().
........
Diffstat (limited to 'test/AS')
| -rw-r--r-- | test/AS/AS.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/AS/AS.py b/test/AS/AS.py index 2c9e624..8bfa740 100644 --- a/test/AS/AS.py +++ b/test/AS/AS.py @@ -182,8 +182,8 @@ os.system(cmd) test.write('SConstruct', """\ aaa = Environment() -bbb = aaa.Copy(AS = r'%(_python_)s wrapper.py ' + WhereIs('as')) -ccc = aaa.Copy(CPPPATH=['.']) +bbb = aaa.Clone(AS = r'%(_python_)s wrapper.py ' + WhereIs('as')) +ccc = aaa.Clone(CPPPATH=['.']) aaa.Program(target = 'aaa', source = ['aaa.s', 'aaa_main.c']) bbb.Program(target = 'bbb', source = ['bbb.s', 'bbb_main.c']) ccc.Program(target = 'ccc', source = ['ccc.S', 'ccc_main.c']) @@ -317,7 +317,7 @@ import os ccc = Environment(tools = ['msvc', 'mslink', 'masm'], ASFLAGS = '/nologo /coff') ccc['ENV']['PATH'] = ccc['ENV']['PATH'] + os.pathsep + os.environ['PATH'] -ddd = ccc.Copy(AS = r'%(_python_)s wrapper.py ' + ccc['AS']) +ddd = ccc.Clone(AS = r'%(_python_)s wrapper.py ' + ccc['AS']) ccc.Program(target = 'ccc', source = ['ccc.asm', 'ccc_main.c']) ddd.Program(target = 'ddd', source = ['ddd.asm', 'ddd_main.c']) """ % locals()) @@ -407,7 +407,7 @@ os.system(string.join(sys.argv[1:], " ")) test.write('SConstruct', """ eee = Environment(tools = ['gcc', 'gnulink', 'nasm'], ASFLAGS = '-f %(nasm_format)s') -fff = eee.Copy(AS = r'%(_python_)s wrapper.py ' + WhereIs('nasm')) +fff = eee.Clone(AS = r'%(_python_)s wrapper.py ' + WhereIs('nasm')) eee.Program(target = 'eee', source = ['eee.asm', 'eee_main.c']) fff.Program(target = 'fff', source = ['fff.asm', 'fff_main.c']) """ % locals()) |