From 138f1ff86671e8a746aadb7598b31f16a56461b7 Mon Sep 17 00:00:00 2001 From: cournape <cournape@fdb21ef1-2011-0410-befe-b5e4ea1792b1> Date: Thu, 19 Nov 2009 05:03:36 +0000 Subject: [PATCH] ENH: use msvc_exists for all tools in the Visual Studio toolchain. git-svn-id: http://scons.tigris.org/svn/scons/trunk@4451 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- src/engine/SCons/Tool/midl.py | 4 ++-- src/engine/SCons/Tool/mslib.py | 4 ++-- src/engine/SCons/Tool/mslink.py | 4 ++-- src/engine/SCons/Tool/msvs.py | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/engine/SCons/Tool/midl.py b/src/engine/SCons/Tool/midl.py index 0ba940e9..bf1f2ace 100644 --- a/src/engine/SCons/Tool/midl.py +++ b/src/engine/SCons/Tool/midl.py @@ -41,7 +41,7 @@ import SCons.Defaults import SCons.Scanner.IDL import SCons.Util -from MSCommon import msvs_exists +from MSCommon import msvc_exists def midl_emitter(target, source, env): """Produces a list of outputs from the MIDL compiler""" @@ -81,7 +81,7 @@ def generate(env): env['BUILDERS']['TypeLibrary'] = midl_builder def exists(env): - return msvs_exists() + return msvc_exists() # Local Variables: # tab-width:4 diff --git a/src/engine/SCons/Tool/mslib.py b/src/engine/SCons/Tool/mslib.py index 2e8425ea..8a4af57d 100644 --- a/src/engine/SCons/Tool/mslib.py +++ b/src/engine/SCons/Tool/mslib.py @@ -39,7 +39,7 @@ import SCons.Tool.msvs import SCons.Tool.msvc import SCons.Util -from MSCommon import msvs_exists, msvc_setup_env_once +from MSCommon import msvc_exists, msvc_setup_env_once def generate(env): """Add Builders and construction variables for lib to an Environment.""" @@ -55,7 +55,7 @@ def generate(env): env['LIBSUFFIX'] = '.lib' def exists(env): - return msvs_exists() + return msvc_exists() # Local Variables: # tab-width:4 diff --git a/src/engine/SCons/Tool/mslink.py b/src/engine/SCons/Tool/mslink.py index fda37bb6..5daae515 100644 --- a/src/engine/SCons/Tool/mslink.py +++ b/src/engine/SCons/Tool/mslink.py @@ -44,7 +44,7 @@ import SCons.Tool.msvc import SCons.Tool.msvs import SCons.Util -from MSCommon import msvc_setup_env_once, msvs_exists +from MSCommon import msvc_setup_env_once, msvc_exists def pdbGenerator(env, target, source, for_signature): try: @@ -257,7 +257,7 @@ def generate(env): env['LDMODULECOM'] = compositeLdmodAction def exists(env): - return msvs_exists() + return msvc_exists() # Local Variables: # tab-width:4 diff --git a/src/engine/SCons/Tool/msvs.py b/src/engine/SCons/Tool/msvs.py index b0893da4..89bd985e 100644 --- a/src/engine/SCons/Tool/msvs.py +++ b/src/engine/SCons/Tool/msvs.py @@ -49,7 +49,7 @@ import SCons.Script.SConscript import SCons.Util import SCons.Warnings -from MSCommon import msvs_exists, merge_default_version +from MSCommon import msvc_exists, msvc_setup_env_once from SCons.Defaults import processDefines ############################################################################## @@ -1408,7 +1408,7 @@ def generate(env): env['MSVSENCODING'] = 'Windows-1252' # Set-up ms tools paths for default version - merge_default_version(env) + msvc_setup_env_once(env) version_num, suite = msvs_parse_version(env['MSVS_VERSION']) if (version_num < 7.0): @@ -1425,7 +1425,7 @@ def generate(env): env['SCONS_HOME'] = os.environ.get('SCONS_HOME') def exists(env): - return msvs_exists() + return msvc_exists() # Local Variables: # tab-width:4 -- 2.26.2