diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 02:10:53 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-12 02:10:53 +0000 |
| commit | e53a18b0b5e8bef623f551c2040fdc93d2b89bfc (patch) | |
| tree | 05c18b60b0abd6a1d4e5c51df7bdc120189b7655 | |
| parent | 78a6b64783ce470c14c578b036552a0ddcdcfc97 (diff) | |
| download | chromium_src-e53a18b0b5e8bef623f551c2040fdc93d2b89bfc.zip chromium_src-e53a18b0b5e8bef623f551c2040fdc93d2b89bfc.tar.gz chromium_src-e53a18b0b5e8bef623f551c2040fdc93d2b89bfc.tar.bz2 | |
When the Win8 script for checking the SDK has been patched succeeds, write out a beacon file to avoid rerunning the script on subsequent builds.
Also, slightly improve the SDK patch error message.
BUG=127799
TEST=NONE
Review URL: https://chromiumcodereview.appspot.com/10928127
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156210 0039d316-1c4b-4281-b951-d872f2087c98
| -rwxr-xr-x | chrome/tools/build/win/check_sdk_patch.py | 13 | ||||
| -rw-r--r-- | win8/win8.gyp | 9 |
2 files changed, 16 insertions, 6 deletions
diff --git a/chrome/tools/build/win/check_sdk_patch.py b/chrome/tools/build/win/check_sdk_patch.py index 9164525..0a8cb9e 100755 --- a/chrome/tools/build/win/check_sdk_patch.py +++ b/chrome/tools/build/win/check_sdk_patch.py @@ -17,7 +17,7 @@ import sys def main(argv): if len(argv) < 2: - print "Usage: check_sdk_patch.py path_to_windows_8_sdk" + print "Usage: check_sdk_patch.py path_to_windows_8_sdk [dummy_output_file]" return 1 # Look for asyncinfo.h @@ -29,12 +29,17 @@ def main(argv): 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/" + 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") + "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 diff --git a/win8/win8.gyp b/win8/win8.gyp index e4c9b89..2d359e0 100644 --- a/win8/win8.gyp +++ b/win8/win8.gyp @@ -14,6 +14,7 @@ 'type': 'none', 'variables': { 'check_sdk_script': '<(DEPTH)/chrome/tools/build/win/check_sdk_patch.py', + 'output_path': '<(INTERMEDIATE_DIR)/check_sdk_patch', }, 'actions': [ { @@ -25,9 +26,13 @@ 'outputs': [ # This keeps the ninja build happy and provides a slightly helpful # error messge if the sdk is missing. - 'check_sdk_patch', + '<(output_path)' ], - 'action': ['python', '<(check_sdk_script)', '<(windows_sdk_path)'], + 'action': ['python', + '<(check_sdk_script)', + '<(windows_sdk_path)', + '<(output_path)', + ], }, ], }, |