BUG: do not call msvs bat file in merge_default_version, only set up version.

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

diff --git a/src/engine/SCons/Tool/MSCommon/vs.py b/src/engine/SCons/Tool/MSCommon/vs.py
index 9b6eb7c5af590c81ea1deeb3512a6735be6f6684..4fda0db633f19b77b3bfc0445da83e70d3911e4c 100644 (file)
--- a/src/engine/SCons/Tool/MSCommon/vs.py
+++ b/src/engine/SCons/Tool/MSCommon/vs.py
@@ -457,10 +457,11 @@ def merge_default_version(env):
     version = get_default_version(env)
     arch = get_default_arch(env)
 
+def msvs_setup_env(env):
+    batfilename = msvs.get_batch_file()
     msvs = get_vs_by_version(version)
     if msvs is None:
         return
-    batfilename = msvs.get_batch_file()
 
     # XXX: I think this is broken. This will silently set a bogus tool instead
     # of failing, but there is no other way with the current scons tool