Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1979)

Side by Side Diff: pylib/gyp/generator/msvs.py

Issue 1267703004: Added msvs_target_platform_version and msvs_target_platform_minversion for winrt compilation (Closed) Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: Updated with more code review feedback on formatting Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | test/win/gyptest-link-enable-winrt-target-platform-version.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 Google Inc. All rights reserved. 1 # Copyright (c) 2012 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import copy 5 import copy
6 import ntpath 6 import ntpath
7 import os 7 import os
8 import posixpath 8 import posixpath
9 import re 9 import re
10 import subprocess 10 import subprocess
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 'msvs_shard', 80 'msvs_shard',
81 'msvs_external_builder', 81 'msvs_external_builder',
82 'msvs_external_builder_out_dir', 82 'msvs_external_builder_out_dir',
83 'msvs_external_builder_build_cmd', 83 'msvs_external_builder_build_cmd',
84 'msvs_external_builder_clean_cmd', 84 'msvs_external_builder_clean_cmd',
85 'msvs_external_builder_clcompile_cmd', 85 'msvs_external_builder_clcompile_cmd',
86 'msvs_enable_winrt', 86 'msvs_enable_winrt',
87 'msvs_requires_importlibrary', 87 'msvs_requires_importlibrary',
88 'msvs_enable_winphone', 88 'msvs_enable_winphone',
89 'msvs_application_type_revision', 89 'msvs_application_type_revision',
90 'msvs_target_platform_version',
91 'msvs_target_platform_minversion',
90 ] 92 ]
91 93
92 94
93 # List of precompiled header related keys. 95 # List of precompiled header related keys.
94 precomp_keys = [ 96 precomp_keys = [
95 'msvs_precompiled_header', 97 'msvs_precompiled_header',
96 'msvs_precompiled_source', 98 'msvs_precompiled_source',
97 ] 99 ]
98 100
99 101
(...skipping 2537 matching lines...) Expand 10 before | Expand all | Expand 10 after
2637 2639
2638 if spec.get('msvs_enable_winrt'): 2640 if spec.get('msvs_enable_winrt'):
2639 properties[0].append(['DefaultLanguage', 'en-US']) 2641 properties[0].append(['DefaultLanguage', 'en-US'])
2640 properties[0].append(['AppContainerApplication', 'true']) 2642 properties[0].append(['AppContainerApplication', 'true'])
2641 if spec.get('msvs_application_type_revision'): 2643 if spec.get('msvs_application_type_revision'):
2642 app_type_revision = spec.get('msvs_application_type_revision') 2644 app_type_revision = spec.get('msvs_application_type_revision')
2643 properties[0].append(['ApplicationTypeRevision', app_type_revision]) 2645 properties[0].append(['ApplicationTypeRevision', app_type_revision])
2644 else: 2646 else:
2645 properties[0].append(['ApplicationTypeRevision', '8.1']) 2647 properties[0].append(['ApplicationTypeRevision', '8.1'])
2646 2648
2649 if spec.get('msvs_target_platform_version'):
2650 target_platform_version = spec.get('msvs_target_platform_version')
2651 properties[0].append(['WindowsTargetPlatformVersion',
2652 target_platform_version])
2653 if spec.get('msvs_target_platform_minversion'):
2654 target_platform_minversion = spec.get('msvs_target_platform_minversion')
2655 properties[0].append(['WindowsTargetPlatformMinVersion',
2656 target_platform_minversion])
2657 else:
2658 properties[0].append(['WindowsTargetPlatformMinVersion',
2659 target_platform_version])
2647 if spec.get('msvs_enable_winphone'): 2660 if spec.get('msvs_enable_winphone'):
2648 properties[0].append(['ApplicationType', 'Windows Phone']) 2661 properties[0].append(['ApplicationType', 'Windows Phone'])
2649 else: 2662 else:
2650 properties[0].append(['ApplicationType', 'Windows Store']) 2663 properties[0].append(['ApplicationType', 'Windows Store'])
2651 2664
2652 return properties 2665 return properties
2653 2666
2654 def _GetMSBuildConfigurationDetails(spec, build_file): 2667 def _GetMSBuildConfigurationDetails(spec, build_file):
2655 properties = {} 2668 properties = {}
2656 for name, settings in spec['configurations'].iteritems(): 2669 for name, settings in spec['configurations'].iteritems():
(...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after
3431 action_spec.extend( 3444 action_spec.extend(
3432 # TODO(jeanluc) 'Document' for all or just if as_sources? 3445 # TODO(jeanluc) 'Document' for all or just if as_sources?
3433 [['FileType', 'Document'], 3446 [['FileType', 'Document'],
3434 ['Command', command], 3447 ['Command', command],
3435 ['Message', description], 3448 ['Message', description],
3436 ['Outputs', outputs] 3449 ['Outputs', outputs]
3437 ]) 3450 ])
3438 if additional_inputs: 3451 if additional_inputs:
3439 action_spec.append(['AdditionalInputs', additional_inputs]) 3452 action_spec.append(['AdditionalInputs', additional_inputs])
3440 actions_spec.append(action_spec) 3453 actions_spec.append(action_spec)
OLDNEW
« no previous file with comments | « no previous file | test/win/gyptest-link-enable-winrt-target-platform-version.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698