Merged revisions 4025-4029 via svnmerge from

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

........
  r4025 | stevenknight | 2009-02-19 22:47:45 -0800 (Thu, 19 Feb 2009) | 2 lines

  Remove the MSVCCommon directory itself.
........
  r4026 | stevenknight | 2009-02-20 06:37:55 -0800 (Fri, 20 Feb 2009) | 7 lines

  Since we're now treating Pro and Express editions as just separate
  versions, use the actual Visual Studio executable, not the .bat file,
  to decide if a version is installed.
  Add separate tests scripts for executing the Express editions.
  Add (untested) 9.0 and 9.0Exp test scripts, cut-and-paste from 8.0 and 8.0Exp.
  Ignore generated *.py[co] files in the Tool/MSCommon directory.
........
  r4027 | stevenknight | 2009-02-21 06:50:58 -0800 (Sat, 21 Feb 2009) | 3 lines

  Escape CC and LINK path names in the expected output to match path
  names that contain regular expression characters (e.g. " (x86)").
........
  r4028 | stevenknight | 2009-02-21 06:56:42 -0800 (Sat, 21 Feb 2009) | 7 lines

  Fix devenv.com paths for VS 7.0 and 7.1 (.NET and .NET 2003).
  Remove unused methods.
  Put debug() calls under control of a SCONS_MSCOMMON_DEBUG environment
  variable.
  Regularize debug messages and make it obvious who's printing what.
  Rename "install_dir" methods in sdk.py to "sdk_dir" to help.
........

1 files changed, 11 insertions, 9 deletions

diff --git a/src/engine/SCons/Tool/MSCommon/common.py b/src/engine/SCons/Tool/MSCommon/common.py
index 619b242..1e4aef8 100644
--- a/src/engine/SCons/Tool/MSCommon/common.py
+++ b/src/engine/SCons/Tool/MSCommon/common.py
@@ -34,17 +34,19 @@ import re
 
 import SCons.Util
 
-# Uncomment to enable debug logging to your choice of file
-#import logging,os
-#os.unlink('c:/tmp/debug.log')
-#logging.basicConfig(filename='c:/tmp/debug.log', level=logging.DEBUG,)
 
-try:
-    from logging import debug
-except ImportError:
-    debug = lambda x : None
+logfile = os.environ.get('SCONS_MSCOMMON_DEBUG')
+if logfile:
+    try:
+        import logging
+    except ImportError:
+        debug = lambda x: open(logfile, 'a').write(x + '\n')
+    else:
+        logging.basicConfig(filename=logfile, level=logging.DEBUG)
+        debug = logging.debug
+else:
+    debug = lambda x: None
 
-#debug = lambda x : open('con', 'w').write(x + '\n')
 
 # TODO(sgk): unused
 def is_win64():