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/CC/SHCCFLAGS.py | |
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/CC/SHCCFLAGS.py')
-rw-r--r-- | test/CC/SHCCFLAGS.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/CC/SHCCFLAGS.py b/test/CC/SHCCFLAGS.py index 316da0f..fc9264f 100644 --- a/test/CC/SHCCFLAGS.py +++ b/test/CC/SHCCFLAGS.py @@ -50,11 +50,11 @@ foo.SharedLibrary(target = 'foo', source = foo_obj) bar_obj = bar.SharedObject(target = 'bar', source = 'prog.c') bar.SharedLibrary(target = 'bar', source = bar_obj) -fooMain = foo.Copy(LIBS='foo', LIBPATH='.') +fooMain = foo.Clone(LIBS='foo', LIBPATH='.') foomain_obj = fooMain.Object(target='foomain', source='main.c') fooMain.Program(target='fooprog', source=foomain_obj) -barMain = bar.Copy(LIBS='bar', LIBPATH='.') +barMain = bar.Clone(LIBS='bar', LIBPATH='.') barmain_obj = barMain.Object(target='barmain', source='main.c') barMain.Program(target='barprog', source=barmain_obj) """ % (fooflags, barflags)) @@ -116,7 +116,7 @@ bar.SharedLibrary(target = 'foo', source = foo_obj) bar_obj = bar.SharedObject(target = 'bar', source = 'prog.c') bar.SharedLibrary(target = 'bar', source = bar_obj) -barMain = bar.Copy(LIBS='bar', LIBPATH='.') +barMain = bar.Clone(LIBS='bar', LIBPATH='.') foomain_obj = barMain.Object(target='foomain', source='main.c') barmain_obj = barMain.Object(target='barmain', source='main.c') barMain.Program(target='barprog', source=foomain_obj) |