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/Scanner | |
| 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/Scanner')
| -rw-r--r-- | test/Scanner/Scanner.py | 2 | ||||
| -rw-r--r-- | test/Scanner/generated.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/Scanner/Scanner.py b/test/Scanner/Scanner.py index 09c5680..16f3d19 100644 --- a/test/Scanner/Scanner.py +++ b/test/Scanner/Scanner.py @@ -97,7 +97,7 @@ env.Command('foo', 'foo.k', r'%(_python_)s build.py $SOURCES $TARGET') ########################################################## # Test resetting the environment scanners (and specifying as a list). -env2 = env.Copy() +env2 = env.Clone() env2.Append(SCANNERS = [k2scan]) env2.Command('junk', 'junk.k2', r'%(_python_)s build.py $SOURCES $TARGET') diff --git a/test/Scanner/generated.py b/test/Scanner/generated.py index 36f35f6..a88303f 100644 --- a/test/Scanner/generated.py +++ b/test/Scanner/generated.py @@ -184,12 +184,12 @@ test.write(['src', 'SConscript'], """\ import Mylib Import("env") -#env = env.Copy() # Yes, clobber intentionally +#env = env.Clone() # Yes, clobber intentionally #Make environment changes, such as: Mylib.AddCFlags(env, "-g -D_TEST") #Mylib.Subdirs(env, "lib_a lib_b lib_mergej prog_x") Mylib.Subdirs(env, "lib_geng") -env = env.Copy() # Yes, clobber intentionally +env = env.Clone() # Yes, clobber intentionally # --- End SConscript boilerplate --- """) @@ -201,11 +201,11 @@ import sys import Mylib Import("env") -#env = env.Copy() # Yes, clobber intentionally +#env = env.Clone() # Yes, clobber intentionally #Make environment changes, such as: Mylib.AddCFlags(env, "-g -D_TEST") #Mylib.Subdirs(env, "foo_dir") -env = env.Copy() # Yes, clobber intentionally +env = env.Clone() # Yes, clobber intentionally # --- End SConscript boilerplate --- Mylib.AddCFlags(env, "-DGOOFY_DEMO") @@ -215,7 +215,7 @@ Mylib.AddIncludeDirs(env, ".") # On Windows, it's import to use the original test environment # when we invoke SCons recursively. import os -recurse_env = env.Copy() +recurse_env = env.Clone() recurse_env["ENV"] = os.environ # Icky code to set up process environment for "make" |