diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-06-29 11:51:02 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-06-30 13:38:26 +0200 |
| commit | 99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a (patch) | |
| tree | ab6c63a8e697f90c691153da0f5d54336a04ee94 /tools/gyp/pylib/gyp/generator/msvs.py | |
| parent | 05a73c0f259fd903622445b07bf9ce3f0d7a73a3 (diff) | |
| download | android-node-v8-99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a.tar.gz android-node-v8-99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a.tar.bz2 android-node-v8-99cbbc0a13fdd554bfc74e29de66fbefc00cfd2a.zip | |
tools: update gyp to 25ed9ac
Includes improved support for VS 2015[0] and makes it possible to build
with ninja again[1].
[0] https://codereview.chromium.org/1112753003
[1] https://codereview.chromium.org/1209553002
Fixes: https://github.com/nodejs/io.js/pull/2065
PR-URL: https://github.com/nodejs/io.js/pull/2074
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Diffstat (limited to 'tools/gyp/pylib/gyp/generator/msvs.py')
| -rw-r--r-- | tools/gyp/pylib/gyp/generator/msvs.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tools/gyp/pylib/gyp/generator/msvs.py b/tools/gyp/pylib/gyp/generator/msvs.py index edf2ae419e..1338790ef6 100644 --- a/tools/gyp/pylib/gyp/generator/msvs.py +++ b/tools/gyp/pylib/gyp/generator/msvs.py @@ -86,6 +86,7 @@ generator_additional_non_configuration_keys = [ 'msvs_enable_winrt', 'msvs_requires_importlibrary', 'msvs_enable_winphone', + 'msvs_application_type_revision', ] @@ -2344,6 +2345,9 @@ def _GenerateMSBuildRuleTargetsFile(targets_path, msbuild_rules): rule_name, {'Condition': "'@(%s)' != '' and '%%(%s.ExcludedFromBuild)' != " "'true'" % (rule_name, rule_name), + 'EchoOff': 'true', + 'StandardOutputImportance': 'High', + 'StandardErrorImportance': 'High', 'CommandLineTemplate': '%%(%s.CommandLineTemplate)' % rule_name, 'AdditionalOptions': '%%(%s.AdditionalOptions)' % rule_name, 'Inputs': rule_inputs @@ -2634,7 +2638,11 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name): if spec.get('msvs_enable_winrt'): properties[0].append(['DefaultLanguage', 'en-US']) properties[0].append(['AppContainerApplication', 'true']) - properties[0].append(['ApplicationTypeRevision', '8.1']) + if spec.get('msvs_application_type_revision'): + app_type_revision = spec.get('msvs_application_type_revision') + properties[0].append(['ApplicationTypeRevision', app_type_revision]) + else: + properties[0].append(['ApplicationTypeRevision', '8.1']) if spec.get('msvs_enable_winphone'): properties[0].append(['ApplicationType', 'Windows Phone']) |