diff options
author | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 19:38:20 +0000 |
---|---|---|
committer | erikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-07 19:38:20 +0000 |
commit | a990cadcd72c85cdb4988fc0d4438c45feae7fa8 (patch) | |
tree | ef016cd48e52e16fce90348333a67504144a84d5 /chrome/tools | |
parent | 9079783b942daa474fe3d1b8ca1ef3919081716b (diff) | |
download | chromium_src-a990cadcd72c85cdb4988fc0d4438c45feae7fa8.zip chromium_src-a990cadcd72c85cdb4988fc0d4438c45feae7fa8.tar.gz chromium_src-a990cadcd72c85cdb4988fc0d4438c45feae7fa8.tar.bz2 |
Revert 155444 - Integrate the Windows 8 code into the Chromium tree (take 2).
14>delegate_execute.cc(113):error C2039: 'kWaitForHandle' : is not a member of 'switches'
14>delegate_execute.cc(113):error C2065: 'kWaitForHandle' : undeclared identifier
http://build.chromium.org/p/chromium/builders/Win%20Builder%20%28dbg%29/builds/38971/steps/compile/logs/stdio#error1
This time, also: fix invalid path in metro_driver.gyp. Also, set executable bit on check_sdk_patch.py and post_build.bat.
This reverts "Revert 155429 - Integrate the Windows 8 code into the Chromium tree."
Original CL: https://chromiumcodereview.appspot.com/10875008
BUG=127799
TEST=A Chromium build can run as the immersive browser on Windows 8.
TBR=ben
Review URL: https://chromiumcodereview.appspot.com/10912152
TBR=robertshield@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10918127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@155452 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rwxr-xr-x | chrome/tools/build/win/check_sdk_patch.py | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/chrome/tools/build/win/check_sdk_patch.py b/chrome/tools/build/win/check_sdk_patch.py deleted file mode 100755 index 9164525..0000000 --- a/chrome/tools/build/win/check_sdk_patch.py +++ /dev/null @@ -1,43 +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" - 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. Please see " - "instructions at\nhttp://www.chromium.org/developers/how-tos/" - "build-instructions-windows\nfor how to apply the patch to build " - "with VS2010.\n") - return 3 - else: - # Patched Windows 8 SDK found. - return 0 - - -if '__main__' == __name__: - sys.exit(main(sys.argv)) |