Clean-ups in preparation for release: doc and comment changes, comment out Subversio...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@623 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/doc/man/scons.1 b/doc/man/scons.1
index 6ac9ebcc25a13948f0f233c741cd58da3100a1c8..5da2c9401ae4ea4118ffae8e402888f0fa5ad3ce 100644 (file)
--- a/doc/man/scons.1
+++ b/doc/man/scons.1
@@ -1769,47 +1769,47 @@ env.SourceCode('.', env.BitKeeper('/usr/local/BKsources'))
 env.SourceCode('src', env.CVS('/usr/local/CVSROOT'))
 env.SourceCode('/', env.RCS())
 env.SourceCode(['f1.c', 'f2.c'], env.SCCS())
-env.SourceCode('.', env.Subversion('file:///usr/local/Subversion'))
 env.SourceCode('no_source.c', None)
 .EE
-
-.TP
-.RI Subversion( repository ", " module )
-A factory function that
-returns a Builder object
-to be used to fetch source files
-from the specified Subversion
-.IR repository .
-The returned Builder
-is intended to be passed to the
-.B SourceCode
-function.
-
-The optional specified
-.I module
-will be added to the beginning
-of all repository path names;
-this can be used, in essence,
-to strip initial directory names
-from the repository path names,
-so that you only have to
-replicate part of the repository
-directory hierarchy in your
-local build directory:
-
-.ES
-# Will fetch foo/bar/src.c
-# from /usr/local/Subversion/foo/bar/src.c.
-env.SourceCode('.', env.Subversion('file:///usr/local/Subversion'))
-
-# Will fetch bar/src.c
-# from /usr/local/Subversion/foo/bar/src.c.
-env.SourceCode('.', env.Subversion('file:///usr/local/Subversion', 'foo'))
-
-# Will fetch src.c
-# from /usr/local/Subversion/foo/bar/src.c.
-env.SourceCode('.', env.Subversion('file:///usr/local/Subversion', 'foo/bar'))
-.EE
+'\"env.SourceCode('.', env.Subversion('file:///usr/local/Subversion'))
+'\"
+'\".TP
+'\".RI Subversion( repository ", " module )
+'\"A factory function that
+'\"returns a Builder object
+'\"to be used to fetch source files
+'\"from the specified Subversion
+'\".IR repository .
+'\"The returned Builder
+'\"is intended to be passed to the
+'\".B SourceCode
+'\"function.
+'\"
+'\"The optional specified
+'\".I module
+'\"will be added to the beginning
+'\"of all repository path names;
+'\"this can be used, in essence,
+'\"to strip initial directory names
+'\"from the repository path names,
+'\"so that you only have to
+'\"replicate part of the repository
+'\"directory hierarchy in your
+'\"local build directory:
+'\"
+'\".ES
+'\"# Will fetch foo/bar/src.c
+'\"# from /usr/local/Subversion/foo/bar/src.c.
+'\"env.SourceCode('.', env.Subversion('file:///usr/local/Subversion'))
+'\"
+'\"# Will fetch bar/src.c
+'\"# from /usr/local/Subversion/foo/bar/src.c.
+'\"env.SourceCode('.', env.Subversion('file:///usr/local/Subversion', 'foo'))
+'\"
+'\"# Will fetch src.c
+'\"# from /usr/local/Subversion/foo/bar/src.c.
+'\"env.SourceCode('.', env.Subversion('file:///usr/local/Subversion', 'foo/bar'))
+'\".EE
 
 .SS Construction Variables
 .\" XXX From Gary Ruben, 23 April 2002:
@@ -2614,17 +2614,17 @@ is that arguments to the command.
 .I env
 is a dictionary of the environment variables
 in which the command should be executed.
-
-.IP SVN
-The Subversion executable (usually named
-.BR svn ).
-
-.IP SVNCOM
-The command line used to
-fetch source files from a Subversion repository.
-
-.IP SVNFLAGS
-General options that are passed to Subversion.
+'\"
+'\".IP SVN
+'\"The Subversion executable (usually named
+'\".BR svn ).
+'\"
+'\".IP SVNCOM
+'\"The command line used to
+'\"fetch source files from a Subversion repository.
+'\"
+'\".IP SVNFLAGS
+'\"General options that are passed to Subversion.
 
 .IP TAR
 The tar archiver.
@@ -3986,7 +3986,7 @@ into the expanded string:
 def foo(target, source, env):
     return "bar"
 
-# Will expand to $BAR to "bar baz"
+# Will expand $BAR to "bar baz"
 env=Environment(FOO=foo, BAR="$FOO baz")
 .EE
 

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 017c872f6c8bd3da4098881a19d8eb1bf05ea96d..ddfe712649c36242552ab94663af1e2c2fda741e 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -35,8 +35,8 @@ RELEASE 0.12 - XXX
 
   - Add an Environment.SourceCode() method to support fetching files
     from source code systems.  Add factory methods that create Builders
-    to support BitKeeper, CVS, RCS, SCCS and Subversion.  Add support
-    for fetching files from RCS or SCCS transparently (like GNU Make).
+    to support BitKeeper, CVS, RCS, and SCCS.  Add support for fetching
+    files from RCS or SCCS transparently (like GNU Make).
 
   - Make the internal to_String() function more efficient.
 
@@ -83,6 +83,9 @@ RELEASE 0.12 - XXX
   - Fix an exception thrown when the -U option was used with no
     Default() target specified.
 
+  - Fix -u so that it builds things in corresponding build directories
+    when used in a source directory.
+
   From Lachlan O'Dea:
 
   - Add SharedObject() support to the masm tool.

diff --git a/src/engine/SCons/Defaults.py b/src/engine/SCons/Defaults.py
index 07a388eb5766efac985a5195d360f5acd5dcea70..6fa053d2a49a5387c62e653e63f6c0d27a94d958 100644 (file)
--- a/src/engine/SCons/Defaults.py
+++ b/src/engine/SCons/Defaults.py
@@ -201,7 +201,7 @@ def copyFunc(dest, source, env):
 
 def _concat(prefix, list, suffix, env, f=lambda x: x):
     """Creates a new list from 'list' by first interpolating each
-    element in the list using 'locals' and 'globals' and then calling f
+    element in the list using the 'env' dictionary and then calling f
     on the list, and finally concatenating 'prefix' and 'suffix' onto
     each element of the list. A trailing space on 'prefix' or leading
     space on 'suffix' will cause them to be put into seperate list

diff --git a/src/engine/SCons/Tool/__init__.py b/src/engine/SCons/Tool/__init__.py
index a5db5bf84edd26cbe72679bc8f0a3aeae70aa45d..5eed7f1e7b6310019aa2e9406417867eb0c0a88d 100644 (file)
--- a/src/engine/SCons/Tool/__init__.py
+++ b/src/engine/SCons/Tool/__init__.py
@@ -204,7 +204,8 @@ def tool_list(platform, env):
                                 'dvipdf', 'dvips',
                                 'latex', 'lex',
                                 'pdflatex', 'pdftex', 'Perforce',
-                                'RCS', 'SCCS', 'Subversion',
+                                'RCS', 'SCCS',
+                                # 'Subversion',
                                 'tar', 'tex', 'yacc', 'zip'],
                                env)
 

diff --git a/test/Subversion.py b/test/Subversion.py
index 6dc7d533541a6c0d41c1d4fb16a42d598249c2db..54e9942ee4fb01759578d8f735ea56461deccca1 100644 (file)
--- a/test/Subversion.py
+++ b/test/Subversion.py
@@ -42,6 +42,9 @@ if not svn:
     print "Could not find Subversion, skipping test(s)."
     test.pass_test(1)
 
+print "Short-circuiting this test until we support Subversion"
+test.pass_test()
+
 test.subdir('Subversion', 'import', ['import', 'sub'], 'work1', 'work2')
 
 # Set up the Subversion repository.