OLD | NEW |
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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
79 'msvs_large_pdb', | 79 'msvs_large_pdb', |
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 ] | 90 ] |
90 | 91 |
91 | 92 |
92 # List of precompiled header related keys. | 93 # List of precompiled header related keys. |
93 precomp_keys = [ | 94 precomp_keys = [ |
94 'msvs_precompiled_header', | 95 'msvs_precompiled_header', |
95 'msvs_precompiled_source', | 96 'msvs_precompiled_source', |
96 ] | 97 ] |
97 | 98 |
98 | 99 |
(...skipping 2528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2627 ] | 2628 ] |
2628 ] | 2629 ] |
2629 | 2630 |
2630 if os.environ.get('PROCESSOR_ARCHITECTURE') == 'AMD64' or \ | 2631 if os.environ.get('PROCESSOR_ARCHITECTURE') == 'AMD64' or \ |
2631 os.environ.get('PROCESSOR_ARCHITEW6432') == 'AMD64': | 2632 os.environ.get('PROCESSOR_ARCHITEW6432') == 'AMD64': |
2632 properties[0].append(['PreferredToolArchitecture', 'x64']) | 2633 properties[0].append(['PreferredToolArchitecture', 'x64']) |
2633 | 2634 |
2634 if spec.get('msvs_enable_winrt'): | 2635 if spec.get('msvs_enable_winrt'): |
2635 properties[0].append(['DefaultLanguage', 'en-US']) | 2636 properties[0].append(['DefaultLanguage', 'en-US']) |
2636 properties[0].append(['AppContainerApplication', 'true']) | 2637 properties[0].append(['AppContainerApplication', 'true']) |
2637 properties[0].append(['ApplicationTypeRevision', '8.1']) | 2638 if spec.get('msvs_application_type_revision'): |
| 2639 app_type_revision = spec.get('msvs_application_type_revision') |
| 2640 properties[0].append(['ApplicationTypeRevision', app_type_revision]) |
| 2641 else: |
| 2642 properties[0].append(['ApplicationTypeRevision', '8.1']) |
2638 | 2643 |
2639 if spec.get('msvs_enable_winphone'): | 2644 if spec.get('msvs_enable_winphone'): |
2640 properties[0].append(['ApplicationType', 'Windows Phone']) | 2645 properties[0].append(['ApplicationType', 'Windows Phone']) |
2641 else: | 2646 else: |
2642 properties[0].append(['ApplicationType', 'Windows Store']) | 2647 properties[0].append(['ApplicationType', 'Windows Store']) |
2643 | 2648 |
2644 return properties | 2649 return properties |
2645 | 2650 |
2646 def _GetMSBuildConfigurationDetails(spec, build_file): | 2651 def _GetMSBuildConfigurationDetails(spec, build_file): |
2647 properties = {} | 2652 properties = {} |
(...skipping 775 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3423 action_spec.extend( | 3428 action_spec.extend( |
3424 # TODO(jeanluc) 'Document' for all or just if as_sources? | 3429 # TODO(jeanluc) 'Document' for all or just if as_sources? |
3425 [['FileType', 'Document'], | 3430 [['FileType', 'Document'], |
3426 ['Command', command], | 3431 ['Command', command], |
3427 ['Message', description], | 3432 ['Message', description], |
3428 ['Outputs', outputs] | 3433 ['Outputs', outputs] |
3429 ]) | 3434 ]) |
3430 if additional_inputs: | 3435 if additional_inputs: |
3431 action_spec.append(['AdditionalInputs', additional_inputs]) | 3436 action_spec.append(['AdditionalInputs', additional_inputs]) |
3432 actions_spec.append(action_spec) | 3437 actions_spec.append(action_spec) |
OLD | NEW |