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/CXX | |
| 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/CXX')
| -rw-r--r-- | test/CXX/CXXFILESUFFIX.py | 2 | ||||
| -rw-r--r-- | test/CXX/SHCXXFLAGS.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/CXX/CXXFILESUFFIX.py b/test/CXX/CXXFILESUFFIX.py index 62e8cc1..b156f74 100644 --- a/test/CXX/CXXFILESUFFIX.py +++ b/test/CXX/CXXFILESUFFIX.py @@ -48,7 +48,7 @@ sys.exit(0) test.write('SConstruct', """ env = Environment(LEX = r'%(_python_)s mylex.py', tools = ['lex']) env.CXXFile(target = 'foo', source = 'foo.ll') -env.Copy(CXXFILESUFFIX = '.xyz').CXXFile(target = 'bar', source = 'bar.ll') +env.Clone(CXXFILESUFFIX = '.xyz').CXXFile(target = 'bar', source = 'bar.ll') """ % locals()) input = r""" diff --git a/test/CXX/SHCXXFLAGS.py b/test/CXX/SHCXXFLAGS.py index 049835c..bfe1a79 100644 --- a/test/CXX/SHCXXFLAGS.py +++ b/test/CXX/SHCXXFLAGS.py @@ -50,11 +50,11 @@ bar.SharedObject(target = 'bar%s', source = 'prog.cpp') foo.SharedLibrary(target = 'foo', source = 'foo%s') bar.SharedLibrary(target = 'bar', source = 'bar%s') -fooMain = foo.Copy(LIBS='foo', LIBPATH='.') +fooMain = foo.Clone(LIBS='foo', LIBPATH='.') foo_obj = fooMain.Object(target='foomain', source='main.c') fooMain.Program(target='fooprog', source=foo_obj) -barMain = bar.Copy(LIBS='bar', LIBPATH='.') +barMain = bar.Clone(LIBS='bar', LIBPATH='.') bar_obj = barMain.Object(target='barmain', source='main.c') barMain.Program(target='barprog', source=bar_obj) """ % (fooflags, barflags, _obj, _obj, _obj, _obj)) @@ -114,7 +114,7 @@ bar.SharedObject(target = 'bar%s', source = 'prog.cpp') bar.SharedLibrary(target = 'foo', source = 'foo%s') bar.SharedLibrary(target = 'bar', source = 'bar%s') -barMain = bar.Copy(LIBS='bar', LIBPATH='.') +barMain = bar.Clone(LIBS='bar', LIBPATH='.') foo_obj = barMain.Object(target='foomain', source='main.c') bar_obj = barMain.Object(target='barmain', source='main.c') barMain.Program(target='barprog', source=foo_obj) |