| OLD | NEW |
|---|
| 1 # Copyright (c) 2013 Google Inc. All rights reserved. | 1 # Copyright (c) 2013 Google Inc. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """Handle version information related to Visual Stuio.""" | 5 """Handle version information related to Visual Stuio.""" |
| 6 | 6 |
| 7 import errno | 7 import errno |
| 8 import os | 8 import os |
| 9 import re | 9 import re |
| 10 import subprocess | 10 import subprocess |
| (...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 override_path = os.environ.get('GYP_MSVS_OVERRIDE_PATH') | 394 override_path = os.environ.get('GYP_MSVS_OVERRIDE_PATH') |
| 395 if override_path: | 395 if override_path: |
| 396 msvs_version = os.environ.get('GYP_MSVS_VERSION') | 396 msvs_version = os.environ.get('GYP_MSVS_VERSION') |
| 397 if not msvs_version: | 397 if not msvs_version: |
| 398 raise ValueError('GYP_MSVS_OVERRIDE_PATH requires GYP_MSVS_VERSION to be ' | 398 raise ValueError('GYP_MSVS_OVERRIDE_PATH requires GYP_MSVS_VERSION to be ' |
| 399 'set to a particular version (e.g. 2010e).') | 399 'set to a particular version (e.g. 2010e).') |
| 400 return _CreateVersion(msvs_version, override_path, sdk_based=True) | 400 return _CreateVersion(msvs_version, override_path, sdk_based=True) |
| 401 version = str(version) | 401 version = str(version) |
| 402 versions = _DetectVisualStudioVersions(version_map[version], 'e' in version) | 402 versions = _DetectVisualStudioVersions(version_map[version], 'e' in version) |
| 403 if not versions: | 403 if not versions: |
| 404 raise ValueError('Could not locate Visual Studio installation.') | 404 if version == 'auto': |
| 405 # Default to 2005 if we couldn't find anything |
| 406 return _CreateVersion('2005', None) |
| 407 else: |
| 408 return _CreateVersion(version, None) |
| 405 return versions[0] | 409 return versions[0] |
| OLD | NEW |
|---|
Chromium Code Reviews
