| 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 { | 5 { | 
| 6  'targets': [ | 6  'targets': [ | 
| 7     { | 7     { | 
| 8       'target_name': 'test_manifest_exe', | 8       'target_name': 'test_generate_manifest_true', | 
| 9       'type': 'executable', | 9       'type': 'executable', | 
| 10       'sources': ['hello.cc'], | 10       'sources': ['hello.cc'], | 
| 11       'msvs_settings': { | 11       'msvs_settings': { | 
|  | 12         'VCLinkerTool': { | 
|  | 13           'EnableUAC': 'true', | 
|  | 14           'GenerateManifest': 'true', | 
|  | 15         }, | 
| 12         'VCManifestTool': { | 16         'VCManifestTool': { | 
| 13           'EmbedManifest': 'false', | 17           'EmbedManifest': 'false', | 
| 14         } | 18         }, | 
| 15       }, | 19       }, | 
| 16     }, | 20     }, | 
| 17     { | 21     { | 
| 18       'target_name': 'test_manifest_dll', | 22       'target_name': 'test_generate_manifest_false', | 
| 19       'type': 'shared_library', | 23       'type': 'executable', | 
| 20       'sources': ['hello.cc'], | 24       'sources': ['hello.cc'], | 
| 21       'msvs_settings': { | 25       'msvs_settings': { | 
|  | 26         'VCLinkerTool': { | 
|  | 27           'EnableUAC': 'true', | 
|  | 28           'GenerateManifest': 'false', | 
|  | 29         }, | 
| 22         'VCManifestTool': { | 30         'VCManifestTool': { | 
| 23           'EmbedManifest': 'false', | 31           'EmbedManifest': 'false', | 
| 24         } | 32         }, | 
| 25       }, | 33       }, | 
| 26     }, | 34     }, | 
| 27     { | 35     { | 
| 28       'target_name': 'test_manifest_extra1', | 36       'target_name': 'test_generate_manifest_default', | 
| 29       'type': 'executable', | 37       'type': 'executable', | 
| 30       'sources': ['hello.cc'], | 38       'sources': ['hello.cc'], | 
| 31       'msvs_settings': { | 39       'msvs_settings': { | 
|  | 40         'VCLinkerTool': { | 
|  | 41           'EnableUAC': 'true', | 
|  | 42         }, | 
| 32         'VCManifestTool': { | 43         'VCManifestTool': { | 
| 33           'EmbedManifest': 'false', | 44           'EmbedManifest': 'false', | 
| 34           'AdditionalManifestFiles': 'extra.manifest', | 45         }, | 
| 35         } |  | 
| 36       }, | 46       }, | 
| 37     }, | 47     }, | 
| 38     { | 48     { | 
| 39       'target_name': 'test_manifest_extra2', | 49       'target_name': 'test_generate_manifest_true_as_embedded', | 
| 40       'type': 'executable', | 50       'type': 'executable', | 
| 41       'sources': ['hello.cc'], | 51       'sources': ['hello.cc'], | 
| 42       'msvs_settings': { | 52       'msvs_settings': { | 
|  | 53         'VCLinkerTool': { | 
|  | 54           'EnableUAC': 'true', | 
|  | 55           'GenerateManifest': 'true', | 
|  | 56         }, | 
|  | 57         'VCManifestTool': { | 
|  | 58           'EmbedManifest': 'true', | 
|  | 59         }, | 
|  | 60       }, | 
|  | 61     }, | 
|  | 62     { | 
|  | 63       'target_name': 'test_generate_manifest_false_as_embedded', | 
|  | 64       'type': 'executable', | 
|  | 65       'sources': ['hello.cc'], | 
|  | 66       'msvs_settings': { | 
|  | 67         'VCLinkerTool': { | 
|  | 68           'EnableUAC': 'true', | 
|  | 69           'GenerateManifest': 'false', | 
|  | 70         }, | 
|  | 71         'VCManifestTool': { | 
|  | 72           'EmbedManifest': 'true', | 
|  | 73         }, | 
|  | 74       }, | 
|  | 75     }, | 
|  | 76     { | 
|  | 77       'target_name': 'test_generate_manifest_default_as_embedded', | 
|  | 78       'type': 'executable', | 
|  | 79       'sources': ['hello.cc'], | 
|  | 80       'msvs_settings': { | 
|  | 81         'VCLinkerTool': { | 
|  | 82           'EnableUAC': 'true', | 
|  | 83         }, | 
|  | 84         'VCManifestTool': { | 
|  | 85           'EmbedManifest': 'true', | 
|  | 86         }, | 
|  | 87       }, | 
|  | 88     }, | 
|  | 89     { | 
|  | 90       'target_name': 'test_generate_manifest_true_with_extra_manifest', | 
|  | 91       'type': 'executable', | 
|  | 92       'sources': ['hello.cc'], | 
|  | 93       'msvs_settings': { | 
|  | 94         'VCLinkerTool': { | 
|  | 95           'EnableUAC': 'true', | 
|  | 96           'GenerateManifest': 'true', | 
|  | 97         }, | 
| 43         'VCManifestTool': { | 98         'VCManifestTool': { | 
| 44           'EmbedManifest': 'false', | 99           'EmbedManifest': 'false', | 
| 45           'AdditionalManifestFiles': 'extra.manifest;extra2.manifest', | 100           'AdditionalManifestFiles': 'extra.manifest;extra2.manifest', | 
| 46         } | 101         }, | 
| 47       }, | 102       }, | 
| 48     }, | 103     }, | 
| 49     { | 104     { | 
| 50       'target_name': 'test_manifest_extra_list', | 105       'target_name': 'test_generate_manifest_false_with_extra_manifest', | 
| 51       'type': 'executable', | 106       'type': 'executable', | 
| 52       'sources': ['hello.cc'], | 107       'sources': ['hello.cc'], | 
| 53       'msvs_settings': { | 108       'msvs_settings': { | 
|  | 109         'VCLinkerTool': { | 
|  | 110           'EnableUAC': 'true', | 
|  | 111           'GenerateManifest': 'false', | 
|  | 112         }, | 
|  | 113         'VCManifestTool': { | 
|  | 114           'EmbedManifest': 'false', | 
|  | 115           'AdditionalManifestFiles': 'extra.manifest;extra2.manifest', | 
|  | 116         }, | 
|  | 117       }, | 
|  | 118     }, | 
|  | 119     { | 
|  | 120       'target_name': 'test_generate_manifest_true_with_extra_manifest_list', | 
|  | 121       'type': 'executable', | 
|  | 122       'sources': ['hello.cc'], | 
|  | 123       'msvs_settings': { | 
|  | 124         'VCLinkerTool': { | 
|  | 125           'EnableUAC': 'true', | 
|  | 126           'GenerateManifest': 'true', | 
|  | 127         }, | 
| 54         'VCManifestTool': { | 128         'VCManifestTool': { | 
| 55           'EmbedManifest': 'false', | 129           'EmbedManifest': 'false', | 
| 56           'AdditionalManifestFiles': [ | 130           'AdditionalManifestFiles': [ | 
| 57             'extra.manifest', | 131             'extra.manifest', | 
| 58             'extra2.manifest' | 132             'extra2.manifest', | 
| 59           ], | 133           ], | 
| 60         } | 134         }, | 
|  | 135       }, | 
|  | 136     }, | 
|  | 137     { | 
|  | 138       'target_name': 'test_generate_manifest_false_with_extra_manifest_list', | 
|  | 139       'type': 'executable', | 
|  | 140       'sources': ['hello.cc'], | 
|  | 141       'msvs_settings': { | 
|  | 142         'VCLinkerTool': { | 
|  | 143           'EnableUAC': 'true', | 
|  | 144           'GenerateManifest': 'false', | 
|  | 145         }, | 
|  | 146         'VCManifestTool': { | 
|  | 147           'EmbedManifest': 'false', | 
|  | 148           'AdditionalManifestFiles': [ | 
|  | 149             'extra.manifest', | 
|  | 150             'extra2.manifest', | 
|  | 151           ], | 
|  | 152         }, | 
| 61       }, | 153       }, | 
| 62     }, | 154     }, | 
| 63   ] | 155   ] | 
| 64 } | 156 } | 
| OLD | NEW | 
|---|