diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-02-18 23:28:45 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-02-18 23:28:45 (GMT) |
| commit | 88f988450292677f7c4b0de084585f1d561d8591 (patch) | |
| tree | b17447eb00e0847de4a450af295ebd6d5c2ef81e /src | |
| parent | 9e2a7c517ef3bc6776227ced814b0635dae0f724 (diff) | |
| download | SCons-88f988450292677f7c4b0de084585f1d561d8591.zip SCons-88f988450292677f7c4b0de084585f1d561d8591.tar.gz SCons-88f988450292677f7c4b0de084585f1d561d8591.tar.bz2 | |
added SDK 7.1 and 7.0A logic. Needs to be tested on systems with 7.0A installed. Also fixed some error messages when not finding requested SDK's. Previously would throw an exception
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine/SCons/Tool/MSCommon/sdk.py | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/src/engine/SCons/Tool/MSCommon/sdk.py b/src/engine/SCons/Tool/MSCommon/sdk.py index 2bf5eef..afb37fe 100644 --- a/src/engine/SCons/Tool/MSCommon/sdk.py +++ b/src/engine/SCons/Tool/MSCommon/sdk.py @@ -19,7 +19,7 @@ # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# + __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" @@ -172,6 +172,26 @@ SDK70VCSetupScripts = { 'x86' : r'bin\vcvars32.bat', # # If you update this list, update the documentation in Tool/mssdk.xml. SupportedSDKList = [ + WindowsSDK('7.1', + sanity_check_file=r'bin\SetEnv.Cmd', + include_subdir='include', + lib_subdir={ + 'x86' : ['lib'], + 'x86_64' : [r'lib\x64'], + 'ia64' : [r'lib\ia64'], + }, + vc_setup_scripts = SDK70VCSetupScripts, + ), + WindowsSDK('7.0A', + sanity_check_file=r'bin\SetEnv.Cmd', + include_subdir='include', + lib_subdir={ + 'x86' : ['lib'], + 'x86_64' : [r'lib\x64'], + 'ia64' : [r'lib\ia64'], + }, + vc_setup_scripts = SDK70VCSetupScripts, + ), WindowsSDK('7.0', sanity_check_file=r'bin\SetEnv.Cmd', include_subdir='include', @@ -337,10 +357,13 @@ def mssdk_setup_env(env): elif 'MSSDK_VERSION' in env: sdk_version = env['MSSDK_VERSION'] if sdk_version is None: - msg = "SDK version %s is not installed" % repr(mssdk) + msg = "SDK version is specified as None" raise SCons.Errors.UserError(msg) sdk_version = env.subst(sdk_version) mssdk = get_sdk_by_version(sdk_version) + if mssdk is None: + msg = "SDK version %s is not installed" % sdk_version + raise SCons.Errors.UserError(msg) sdk_dir = mssdk.get_sdk_dir() debug('sdk.py:mssdk_setup_env: Using MSSDK_VERSION:%s'%sdk_dir) elif 'MSVS_VERSION' in env: |