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/QT | |
| 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/QT')
| -rw-r--r-- | test/QT/copied-env.py | 2 | ||||
| -rw-r--r-- | test/QT/empty-env.py | 10 | ||||
| -rw-r--r-- | test/QT/reentrant.py | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/test/QT/copied-env.py b/test/QT/copied-env.py index 312df44..dc96317 100644 --- a/test/QT/copied-env.py +++ b/test/QT/copied-env.py @@ -42,7 +42,7 @@ test.write('SConscript', """\ Import("env") env.Append(CPPDEFINES = ['FOOBAZ']) -copy = env.Copy() +copy = env.Clone() copy.Append(CPPDEFINES = ['MYLIB_IMPL']) copy.SharedLibrary( diff --git a/test/QT/empty-env.py b/test/QT/empty-env.py index de8daa1..5bf173a 100644 --- a/test/QT/empty-env.py +++ b/test/QT/empty-env.py @@ -36,11 +36,11 @@ test.Qt_dummy_installation('qt') test.write('SConstruct', """\ orig = Environment() -env = orig.Copy(QTDIR = r'%s', - QT_LIB = r'%s', - QT_MOC = r'%s', - QT_UIC = r'%s', - tools=['qt']) +env = orig.Clone(QTDIR = r'%s', + QT_LIB = r'%s', + QT_MOC = r'%s', + QT_UIC = r'%s', + tools=['qt']) env.Program('main', 'main.cpp', CPPDEFINES=['FOO'], LIBS=[]) """ % (test.QT, test.QT_LIB, test.QT_MOC, test.QT_UIC)) diff --git a/test/QT/reentrant.py b/test/QT/reentrant.py index ef0b292..336aa13 100644 --- a/test/QT/reentrant.py +++ b/test/QT/reentrant.py @@ -50,7 +50,7 @@ test.Qt_create_SConstruct('SConstruct') test.write('SConscript', """\ Import("env") -env = env.Copy(tools=['qt']) +env = env.Clone(tools=['qt']) env.Program('main', 'main.cpp', CPPDEFINES=['FOO'], LIBS=[]) """) |