diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-11-19 05:03:36 (GMT) |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-11-19 05:03:36 (GMT) |
| commit | 88dc7119c4ef49b3b2acee7f650d333a32ca4b2d (patch) | |
| tree | e88636152822f25cca82e30a8804310d168600f7 /src/engine/SCons/Tool | |
| parent | 4e972790d389101d871f584feb3ab11b9534f9c9 (diff) | |
| download | SCons-88dc7119c4ef49b3b2acee7f650d333a32ca4b2d.zip SCons-88dc7119c4ef49b3b2acee7f650d333a32ca4b2d.tar.gz SCons-88dc7119c4ef49b3b2acee7f650d333a32ca4b2d.tar.bz2 | |
ENH: use msvc_exists for all tools in the Visual Studio toolchain.
Diffstat (limited to 'src/engine/SCons/Tool')
| -rw-r--r-- | src/engine/SCons/Tool/midl.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mslib.py | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/mslink.py | 4 | ||||
| -rw-r--r-- | 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 0ba940e..bf1f2ac 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 2e8425e..8a4af57 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 fda37bb..5daae51 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 b0893da..89bd985 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 |