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().
........

6 files changed, 33 insertions, 26 deletions

diff --git a/doc/SConscript b/doc/SConscript
index 6f92fbc..b0a4ba1 100644
--- a/doc/SConscript
+++ b/doc/SConscript
@@ -31,7 +31,7 @@ import string
 
 Import('env', 'whereis')
 
-env = env.Copy()
+env = env.Clone()
 
 env.TargetSignatures('content')
 
@@ -103,9 +103,9 @@ def scansgml(node, env, target):
 s = Scanner(name = 'sgml', function = scansgml, skeys = ['.sgml', '.mod'])
 
 orig_env = env
-env = orig_env.Copy(SCANNERS = [s],
-                    SCONS_PROC_PY = File('#bin/scons-proc.py').rfile(),
-                    SCONSOUTPUT_PY = File('#bin/sconsoutput.py').rfile())
+env = orig_env.Clone(SCANNERS = [s],
+                     SCONS_PROC_PY = File('#bin/scons-proc.py').rfile(),
+                     SCONSOUTPUT_PY = File('#bin/sconsoutput.py').rfile())
 
 # Fetch the list of files in the build engine that contain
 # SCons documentation XML for processing.
diff --git a/doc/man/scons.1 b/doc/man/scons.1
index a12bd68..1b30e6a 100644
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -1163,14 +1163,14 @@ would override the built-in gcc tool.
 Also note that the toolpath is
 stored in the environment for use
 by later calls to
-.BR Copy ()
+.BR Clone ()
 and
 .BR Tool ()
 methods:
 
 .ES
 base = Environment(toolpath=['custom_path'])
-derived = base.Copy(tools=['custom_tool'])
+derived = base.Clone(tools=['custom_tool'])
 derived.CustomBuilder()
 .EE
 
@@ -2274,7 +2274,7 @@ below, for a complete explanation of the arguments and behavior.
 
 '\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
-.RI env.Copy([ key = val ", ...])"
+.RI env.Clone([ key = val ", ...])"
 Return a separate copy of a construction environment.
 If there are any keyword arguments specified,
 they are added to the returned copy,
@@ -2282,8 +2282,8 @@ overwriting any existing values
 for the keywords.
 
 .ES
-env2 = env.Copy()
-env3 = env.Copy(CCFLAGS = '-g')
+env2 = env.Clone()
+env3 = env.Clone(CCFLAGS = '-g')
 .EE
 .IP
 Additionally, a list of tools and a toolpath may be specified, as in
@@ -2291,11 +2291,18 @@ the Environment constructor:
 
 .ES
 def MyTool(env): env['FOO'] = 'bar'
-env4 = env.Copy(tools = ['msvc', MyTool])
+env4 = env.Clone(tools = ['msvc', MyTool])
 .EE
 
 '\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 .TP
+.RI env.Copy([ key = val ", ...])"
+A synonym for
+env.Clone().
+(This will probably be officially deprecated some day.)
+
+'\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+.TP
 .RI env.CVS( repository ", " module )
 A factory function that
 returns a Builder object
@@ -4400,11 +4407,11 @@ env = Environment(CC="cc")
 .EE
 
 or when copying a construction environment using the 
-.B Copy 
+.B Clone 
 method:
 
 .ES
-env2 = env.Copy(CC="cl.exe")
+env2 = env.Clone(CC="cl.exe")
 .EE
 
 .SS Configure Contexts
diff --git a/doc/user/environments.in b/doc/user/environments.in
index 9b5c348..ae453a0 100644
--- a/doc/user/environments.in
+++ b/doc/user/environments.in
@@ -620,7 +620,7 @@ environment undisturbed.
    to share the same values for one or more variables.
    Rather than always having to repeat all of the common
    variables when you create each construction environment,
-   you can use the &Copy; method
+   you can use the &Clone; method
    to create a copy of a construction environment.
 
    </para>
@@ -628,7 +628,7 @@ environment undisturbed.
    <para>
 
    Like the &Environment; call that creates a construction environment,
-   the &Copy; method takes &consvar; assignments,
+   the &Clone; method takes &consvar; assignments,
    which will override the values in the copied construction environment.
    For example, suppose we want to use &gcc;
    to create three versions of a program,
@@ -644,8 +644,8 @@ environment undisturbed.
    <scons_example name="ex5">
      <file name="SConstruct" printme="1">
       env = Environment(CC = 'gcc')
-      opt = env.Copy(CCFLAGS = '-O2')
-      dbg = env.Copy(CCFLAGS = '-g')
+      opt = env.Clone(CCFLAGS = '-O2')
+      dbg = env.Clone(CCFLAGS = '-g')
 
       env.Program('foo', 'foo.c')
 
diff --git a/doc/user/environments.sgml b/doc/user/environments.sgml
index 14be5af..90f6e3f 100644
--- a/doc/user/environments.sgml
+++ b/doc/user/environments.sgml
@@ -610,7 +610,7 @@ environment undisturbed.
    to share the same values for one or more variables.
    Rather than always having to repeat all of the common
    variables when you create each construction environment,
-   you can use the &Copy; method
+   you can use the &Clone; method
    to create a copy of a construction environment.
 
    </para>
@@ -618,7 +618,7 @@ environment undisturbed.
    <para>
 
    Like the &Environment; call that creates a construction environment,
-   the &Copy; method takes &consvar; assignments,
+   the &Clone; method takes &consvar; assignments,
    which will override the values in the copied construction environment.
    For example, suppose we want to use &gcc;
    to create three versions of a program,
@@ -633,8 +633,8 @@ environment undisturbed.
 
    <programlisting>
       env = Environment(CC = 'gcc')
-      opt = env.Copy(CCFLAGS = '-O2')
-      dbg = env.Copy(CCFLAGS = '-g')
+      opt = env.Clone(CCFLAGS = '-O2')
+      dbg = env.Clone(CCFLAGS = '-g')
 
       env.Program('foo', 'foo.c')
 
diff --git a/doc/user/hierarchy.in b/doc/user/hierarchy.in
index 355aca3..2ec3fd3 100644
--- a/doc/user/hierarchy.in
+++ b/doc/user/hierarchy.in
@@ -638,7 +638,7 @@ make no difference to the build.
 
       <sconstruct>
         Import('env', 'debug')
-        env = env.Copy(DEBUG = debug)
+        env = env.Clone(DEBUG = debug)
         env.Program('prog', ['prog.c'])
       </sconstruct>
 
@@ -652,7 +652,7 @@ make no difference to the build.
 
       <sconstruct>
         Import('env debug')
-        env = env.Copy(DEBUG = debug)
+        env = env.Clone(DEBUG = debug)
         env.Program('prog', ['prog.c'])
       </sconstruct>
 
@@ -667,7 +667,7 @@ make no difference to the build.
 
       <sconstruct>
         Import('*')
-        env = env.Copy(DEBUG = debug)
+        env = env.Clone(DEBUG = debug)
         env.Program('prog', ['prog.c'])
       </sconstruct>
 
diff --git a/doc/user/hierarchy.sgml b/doc/user/hierarchy.sgml
index 8281175..047545d 100644
--- a/doc/user/hierarchy.sgml
+++ b/doc/user/hierarchy.sgml
@@ -602,7 +602,7 @@ make no difference to the build.
 
       <programlisting>
         Import('env', 'debug')
-        env = env.Copy(DEBUG = debug)
+        env = env.Clone(DEBUG = debug)
         env.Program('prog', ['prog.c'])
       </programlisting>
 
@@ -616,7 +616,7 @@ make no difference to the build.
 
       <programlisting>
         Import('env debug')
-        env = env.Copy(DEBUG = debug)
+        env = env.Clone(DEBUG = debug)
         env.Program('prog', ['prog.c'])
       </programlisting>
 
@@ -631,7 +631,7 @@ make no difference to the build.
 
       <programlisting>
         Import('*')
-        env = env.Copy(DEBUG = debug)
+        env = env.Clone(DEBUG = debug)
         env.Program('prog', ['prog.c'])
       </programlisting>