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/BuildDir | |
| 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/BuildDir')
| -rw-r--r-- | test/BuildDir/BuildDir.py | 6 | ||||
| -rw-r--r-- | test/BuildDir/CPPPATH-subdir.py | 2 | ||||
| -rw-r--r-- | test/BuildDir/nested-sconscripts.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/BuildDir/BuildDir.py b/test/BuildDir/BuildDir.py index f655bf9..f308579 100644 --- a/test/BuildDir/BuildDir.py +++ b/test/BuildDir/BuildDir.py @@ -113,7 +113,7 @@ env.Command(target='f3.h', source='f3h.in', action=buildIt) env.Command(target='f4.h', source='f4h.in', action=buildIt) env.Command(target='f4.c', source='f4.in', action=buildIt) -env2=env.Copy(CPPPATH='.') +env2=env.Clone(CPPPATH='.') env2.Program(target='foo3', source='f3.c') env2.Program(target='foo4', source='f4.c') @@ -124,8 +124,8 @@ except: if fortran and env.Detect(fortran): env.Command(target='b2.f', source='b2.in', action=buildIt) - env.Copy(LIBS = %s).Program(target='bar2', source='b2.f') - env.Copy(LIBS = %s).Program(target='bar1', source='b1.f') + env.Clone(LIBS = %s).Program(target='bar2', source='b2.f') + env.Clone(LIBS = %s).Program(target='bar1', source='b1.f') """ % (fortran_runtime, fortran_runtime)) test.write(['work1', 'src', 'f1.c'], r""" diff --git a/test/BuildDir/CPPPATH-subdir.py b/test/BuildDir/CPPPATH-subdir.py index 2ae50b5..7254279 100644 --- a/test/BuildDir/CPPPATH-subdir.py +++ b/test/BuildDir/CPPPATH-subdir.py @@ -51,7 +51,7 @@ SConscript(dirs=['glscry']) test.write(['src', 'glscry', 'SConscript'], """\ Import('*') -env = env.Copy() +env = env.Clone() env.Append(CPPPATH=['.']) env.Library('foo', 'foo.c') """) diff --git a/test/BuildDir/nested-sconscripts.py b/test/BuildDir/nested-sconscripts.py index d9e110e..f6dd13b 100644 --- a/test/BuildDir/nested-sconscripts.py +++ b/test/BuildDir/nested-sconscripts.py @@ -43,7 +43,7 @@ BUILD_DIR = '../build' base_env = Environment() for flavor in ['prod', 'debug']: - build_env = base_env.Copy() + build_env = base_env.Clone() # In real life, we would modify build_env appropriately here FLAVOR_DIR = BUILD_DIR + '/' + flavor Export('build_env') |