summaryrefslogtreecommitdiff
path: root/engine/SCons/Tool/MSCommon/vs.py
diff options
context:
space:
mode:
authorLuca Falavigna <dktrkranz@debian.org>2010-03-25 20:26:34 +0100
committerLuca Falavigna <dktrkranz@debian.org>2010-03-25 20:26:34 +0100
commit738c66a8458f4ddd5c11871359938bc9d89e8d7a (patch)
tree5b57e837a551c1479efec2e2bfebf154c529bf68 /engine/SCons/Tool/MSCommon/vs.py
parent8f9034d6737799e699f3d2c9c7de2c98682343bd (diff)
parent86baccee0a1dddf43f7eefe48e2d9e9037468b9c (diff)
Merge commit 'upstream/1.3.0'
Diffstat (limited to 'engine/SCons/Tool/MSCommon/vs.py')
-rw-r--r--engine/SCons/Tool/MSCommon/vs.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/SCons/Tool/MSCommon/vs.py b/engine/SCons/Tool/MSCommon/vs.py
index 204a32f..e634a18 100644
--- a/engine/SCons/Tool/MSCommon/vs.py
+++ b/engine/SCons/Tool/MSCommon/vs.py
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py 4691 2010/03/06 16:22:36 bdbaddog"
+__revision__ = "src/engine/SCons/Tool/MSCommon/vs.py 4720 2010/03/24 03:14:11 jars"
__doc__ = """Module to detect Visual Studio and/or Visual C/C++
"""
@@ -255,7 +255,7 @@ SupportedVSList = [
# The batch file we look for is in the VC directory,
# so the VCExpress.exe executable is up in ..\..\Common7\IDE.
VisualStudio('8.0Exp',
- vc_version='8.0',
+ vc_version='8.0Exp',
sdk_version='6.0A',
hkeys=[r'Microsoft\VCExpress\8.0\Setup\VS\ProductDir'],
common_tools_var='VS80COMNTOOLS',
@@ -384,12 +384,14 @@ def get_vs_by_version(msvs):
global InstalledVSMap
global SupportedVSMap
+ debug('vs.py:get_vs_by_version()')
if not SupportedVSMap.has_key(msvs):
msg = "Visual Studio version %s is not supported" % repr(msvs)
raise SCons.Errors.UserError, msg
get_installed_visual_studios()
vs = InstalledVSMap.get(msvs)
debug('InstalledVSMap:%s'%InstalledVSMap)
+ debug('vs.py:get_vs_by_version: found vs:%s'%vs)
# Some check like this would let us provide a useful error message
# if they try to set a Visual Studio version that's not installed.
# However, we also want to be able to run tests (like the unit