diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 03:07:46 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-12 03:07:46 +0000 |
commit | 49ee7ef2882b7bba875e6179c3ccb2596875312a (patch) | |
tree | ccf599a669e52be45521fd386bfe15f545aa2c69 /win8 | |
parent | eece11eddc1249a156226a464c734b2ba2c73f1f (diff) | |
download | chromium_src-49ee7ef2882b7bba875e6179c3ccb2596875312a.zip chromium_src-49ee7ef2882b7bba875e6179c3ccb2596875312a.tar.gz chromium_src-49ee7ef2882b7bba875e6179c3ccb2596875312a.tar.bz2 |
Remove a few dead MSVS_VERSION checks.
We only support 2013.
TBR=robertshield@chromium.org
BUG=340358
Review URL: https://codereview.chromium.org/233843003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
-rw-r--r-- | win8/delegate_execute/delegate_execute.gyp | 1 | ||||
-rw-r--r-- | win8/metro_driver/metro_driver.gyp | 1 | ||||
-rwxr-xr-x | win8/util/check_sdk_patch.py | 48 | ||||
-rw-r--r-- | win8/win8.gyp | 30 |
4 files changed, 0 insertions, 80 deletions
diff --git a/win8/delegate_execute/delegate_execute.gyp b/win8/delegate_execute/delegate_execute.gyp index be827a0..0138cb4 100644 --- a/win8/delegate_execute/delegate_execute.gyp +++ b/win8/delegate_execute/delegate_execute.gyp @@ -47,7 +47,6 @@ '../../ui/base/ui_base.gyp:ui_base', '../../ui/gfx/gfx.gyp:gfx', '../../ui/gfx/gfx.gyp:gfx_geometry', - '../../win8/win8.gyp:check_sdk_patch', 'delegate_execute_version_resources', ], 'sources': [ diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp index 34fbcdd..3cd62ef 100644 --- a/win8/metro_driver/metro_driver.gyp +++ b/win8/metro_driver/metro_driver.gyp @@ -74,7 +74,6 @@ '../../sandbox/sandbox.gyp:sandbox', '../../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', '../../url/url.gyp:url_lib', - '../win8.gyp:check_sdk_patch', 'metro_driver_version_resources', ], 'sources': [ diff --git a/win8/util/check_sdk_patch.py b/win8/util/check_sdk_patch.py deleted file mode 100755 index 0a8cb9e..0000000 --- a/win8/util/check_sdk_patch.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -"""Script to check that the Windows 8 SDK has been appropriately patched so that - it can be used with VS 2010. - - In practice, this checks for the presence of 'enum class' in asyncinfo.h. - Changing that to 'enum' is the only thing needed to build with the WinRT - headers in VS 2010. -""" - -import os -import sys - - -def main(argv): - if len(argv) < 2: - print "Usage: check_sdk_patch.py path_to_windows_8_sdk [dummy_output_file]" - return 1 - - # Look for asyncinfo.h - async_info_path = os.path.join(argv[1], 'Include/winrt/asyncinfo.h') - if not os.path.exists(async_info_path): - print ("Could not find %s in provided SDK path. Please check input." % - async_info_path) - print "CWD: %s" % os.getcwd() - return 2 - else: - if 'enum class' in open(async_info_path).read(): - print ("\nERROR: You are using an unpatched Windows 8 SDK located at %s." - "\nPlease see instructions at" - "\nhttp://www.chromium.org/developers/how-tos/" - "build-instructions-windows\nfor how to apply the patch to build " - "with VS2010.\n" % argv[1]) - return 3 - else: - if len(argv) > 2: - with open(argv[2], 'w') as dummy_file: - dummy_file.write('Windows 8 SDK has been patched!') - - # Patched Windows 8 SDK found. - return 0 - - -if '__main__' == __name__: - sys.exit(main(sys.argv)) diff --git a/win8/win8.gyp b/win8/win8.gyp index dc73584..a20509c 100644 --- a/win8/win8.gyp +++ b/win8/win8.gyp @@ -10,36 +10,6 @@ ], 'targets': [ { - 'target_name': 'check_sdk_patch', - 'type': 'none', - 'variables': { - 'check_sdk_script': 'util/check_sdk_patch.py', - 'output_path': '<(INTERMEDIATE_DIR)/check_sdk_patch', - }, - 'conditions': [ - ['MSVS_VERSION=="2010" or MSVS_VERSION=="2010e"', { - 'actions': [ - { - 'action_name': 'check_sdk_patch_action', - 'inputs': [ - '<(check_sdk_script)', - ], - 'outputs': [ - # This keeps the ninja build happy and provides a slightly - # helpful error message if the sdk is missing. - '<(output_path)' - ], - 'action': ['python', - '<(check_sdk_script)', - '<(windows_sdk_path)', - '<(output_path)', - ], - }, - ], - }], - ], - }, - { 'target_name': 'win8_util', 'type': 'static_library', 'dependencies': [ |