Merged revisions 1884-1905 via svnmerge from0.97

http://scons.tigris.org/svn/scons/branches/core

........
  r1891 | stevenknight | 2007-04-24 08:57:03 -0500 (Tue, 24 Apr 2007) | 1 line

  0.96.D632 - Fix 0.96.96 reference count regression during parallel builds.
........
  r1892 | stevenknight | 2007-04-24 12:51:05 -0500 (Tue, 24 Apr 2007) | 1 line

  0.96.D633 - Fix documented default value(s) of $MSVS_USE_MFC_DIRS.
........
  r1893 | stevenknight | 2007-04-24 16:12:14 -0500 (Tue, 24 Apr 2007) | 1 line

  0.96.D634 - Make the DirEntryScanner tolerant of non-Dir nodes.
........
  r1898 | stevenknight | 2007-05-09 15:07:15 -0500 (Wed, 09 May 2007) | 1 line

  0.96.D635 - Portability fixes in test scripts.
........
  r1899 | stevenknight | 2007-05-12 08:19:13 -0500 (Sat, 12 May 2007) | 1 line

  0.96.D636 - Update documentation with rudimentary Tool module descriptions.
........
  r1901 | stevenknight | 2007-05-17 14:32:14 -0500 (Thu, 17 May 2007) | 1 line

  0.97.D001 - Initialize 0.97 for release.
........

1 files changed, 58 insertions, 23 deletions

diff --git a/src/engine/SCons/Tool/msvs.xml b/src/engine/SCons/Tool/msvs.xml
index 07fda0c..2bf02f8 100644
--- a/src/engine/SCons/Tool/msvs.xml
+++ b/src/engine/SCons/Tool/msvs.xml
@@ -6,8 +6,22 @@ See its __doc__ string for a discussion of the format.
 -->
 <tool name="msvs">
 <summary>
-XXX
+Sets construction variables for Microsoft Visual Studio.
 </summary>
+<sets>
+MSVSPROJECTCOM
+MSVSSOLUTIONCOM
+MSVSSCONSCRIPT
+MSVSSCONS
+MSVSSCONSFLAGS
+MSVSSCONSCOM
+MSVSBUILDCOM
+MSVSREBUILDCOM
+MSVSCLEANCOM
+MSVSENCODING
+</sets>
+<uses>
+</uses>
 </tool>
 
 <builder name ="MSVSProject">
@@ -373,9 +387,15 @@ There is no default value.
 Tells the MS Visual Studio tool(s) to use
 the MFC directories in its default paths
 for compiling and linking.
-Under MSVS version 6,
+The &cv-MSVS_USE_MFC_DIRS; variable has no effect if the
+<envar>INCLUDE</envar>
+or
+<envar>LIB</envar>
+environment variables are set explictly.
+
+Under Visual Studio version 6,
 setting
-<envar>MSVS_USE_MFC_DIRS</envar>
+&cv-MSVS_USE_MFC_DIRS;
 to a non-zero value
 adds the
 <filename>ATL\include</filename>
@@ -386,42 +406,57 @@ the default
 <envar>INCLUDE</envar>
 external environment variable,
 and adds the
-<envar>MFC\lib</envar>
+<filename>MFC\lib</filename>
 directory to
 the default
 <envar>LIB</envar>
 external environment variable.
-Under MSVS version 7,
+
+Under Visual Studio version 7,
 setting
-<envar>MSVS_USE_MFC_DIRS</envar>
+&cv-MSVS_USE_MFC_DIRS;
 to a non-zero value
 adds the
-<envar>atlmfc\include</envar>
+<filename>atlmfc\include</filename>
 directory to the default
 <envar>INCLUDE</envar>
 external environment variable,
 and adds the
-<envar>atlmfc\lib</envar>
+<filename>atlmfc\lib</filename>
 directory to the default
 <envar>LIB</envar>
 external environment variable.
-The current default value is
-<literal>1</literal>,
-which means these directories
-are added to the paths by default.
-This default value is likely to change
-in a future release,
-so users who want the ATL and MFC
-values included in their paths
-are encouraged to enable the
-<envar>MSVS_USE_MFC_DIRS</envar>
-value explicitly
-to avoid future incompatibility.
-This variable has no effect if the
+
+Under Visual Studio version 8,
+setting
+&cv-MSVS_USE_MFC_DIRS;
+to a non-zero value will,
+by default,
+add the
+<filename>atlmfc\include</filename>
+directory to the default
 <envar>INCLUDE</envar>
-or
+external environment variable,
+and the
+<filename>atlmfc\lib</filename>
+directory to the default
 <envar>LIB</envar>
-environment variables are set explictly.
+external environment variable.
+If, however, the
+<envar>['MSVS']['PLATFORMSDKDIR']</envar>
+variable is set,
+then the
+<filename>mfc</filename>
+and the
+<filename>atl</filename>
+subdirectories of the
+<envar>PLATFORMSDKDIR</envar>
+are added to the default value of the
+<envar>INCLUDE</envar>
+external environment variable,
+and the default value of the
+<envar>LIB</envar>
+external environment variable is left untouched.
 </summary>
 </cvar>