Merge commit 'upstream/1.2.0.d20100117'

1 files changed, 30 insertions, 6 deletions

diff --git a/RELEASE.txt b/RELEASE.txt
index 604b5d8..dfd563b 100644
--- a/RELEASE.txt
+++ b/RELEASE.txt
@@ -1,5 +1,5 @@
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 The SCons Foundation
-# src/RELEASE.txt 4577 2009/12/27 19:43:56 scons
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 The SCons Foundation
+# src/RELEASE.txt 4629 2010/01/17 22:23:21 scons
 
 
                  SCons - a software construction tool
@@ -20,7 +20,7 @@ more effectively, please sign up for the scons-users mailing list at:
 
 
 
-RELEASE 1.2.0.d20091224 - Thu, 24 Dec 2009 17:20:55 -0800
+RELEASE 1.2.0.d20100117 - Sun, 17 Jan 2010 14:26:59 -0800
 
   Please consult the CHANGES.txt file for a list of specific changes
   since last release.
@@ -57,15 +57,36 @@ RELEASE 1.2.0.d20091224 - Thu, 24 Dec 2009 17:20:55 -0800
         fatal errors when anyone tries to use them.
 
   Please note the following important changes since release 1.2.0:
-    --  Visual Studio/Visual C++ support has been change significantly
+
+    --  Support for Latex glosseries and acronyms has been added
+
+    --  MICROSOFT VISUAL STUDIO VERSION/ARCH DETECTION HAS CHANGED
+
+        The way SCons detects Visual Studio on Windows has changed in
+        1.3.  By default, it should now use the latest installed
+        Visual Studio version on your machine, and compile for 32 or
+        64 bits according to whether your OS is 32 or 64 bits (32/64
+        bit python makes no difference).
+
+	Two new variables control Visual Studio: MSVC_VERSION and
+	TARGET_ARCH.  These variables ONLY take effect when passed to
+	the Environment() constructor; setting them later has no
+	effect.  To use a non-default Visual Studio version, set
+	MSVC_VERSION to e.g. "8.0" or "7.1".  Setting it to "xxx" (or
+	any nonexistent value) will make it print out the valid
+	versions on your system.  To use a non-default architecture,
+	set TARGET_ARCH to "x86" or "x86_64" (various synonyms are
+	accepted).
+
+	Note that if you use MSVS_VERSION to build Visual Studio
+	projects from your SConstructs, MSVS_VERSION must be set to
+	the same version as MSVC_VERSION.
 
         Support for HOST_OS,HOST_ARCH,TARGET_OS, TARGET_ARCH has been
         added to allow specifying different target arch than the host 
         system. This is only supported for Visual Studio/Visual C++
         at this time.
 
-    --  Support for Latex glosseries and acronyms has been added
-
     --  VISUAL C/C++ PRECOMPILED HEADERS WILL BE REBUILT
 
         Precompiled header files built with Visual C/C++ will be
@@ -88,6 +109,9 @@ RELEASE 1.2.0.d20091224 - Thu, 24 Dec 2009 17:20:55 -0800
         these tools have been redefined to remove unnecessary nested $(
         and $) character strings.
 
+    --  MSVS_USE_MFC_DIRS and MSVS_IGNORE_IDE_PATHS are obsoleted and
+        have no effect.
+
   Please note the following important changes since release 1.1.0:
 
     --  THE $CHANGED_SOURCES, $CHANGED_TARGETS, $UNCHANGED_SOURCES