diff options
| author | scottmg@chromium.org <scottmg@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2013-12-12 21:54:27 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2013-12-12 21:54:27 +0000 |
| commit | 67e1e1f46d9b534543c4da6c27988aca0ef5c475 (patch) | |
| tree | be46d603fe2f968d20781bf374c336f6d0747e0d | |
| parent | 78d5366f3040ddfd2fcdcde6e2e4dde87c102850 (diff) | |
| download | gyp-67e1e1f46d9b534543c4da6c27988aca0ef5c475.tar.gz | |
win ninja: default to embedding manifest to match msvs
And add a test for this specific variation.
R=thakis@chromium.org
BUG=chromium:326030
Review URL: https://codereview.chromium.org/103963007
git-svn-id: http://gyp.googlecode.com/svn/trunk@1814 78cadc50-ecff-11dd-a971-7dbc132099af
| -rw-r--r-- | pylib/gyp/msvs_emulation.py | 3 | ||||
| -rw-r--r-- | test/win/gyptest-link-generate-manifest.py | 4 | ||||
| -rw-r--r-- | test/win/linker-flags/generate-manifest.gyp | 10 |
3 files changed, 16 insertions, 1 deletions
diff --git a/pylib/gyp/msvs_emulation.py b/pylib/gyp/msvs_emulation.py index a9f65a12..92ea86b7 100644 --- a/pylib/gyp/msvs_emulation.py +++ b/pylib/gyp/msvs_emulation.py @@ -645,7 +645,8 @@ class MsvsSettings(object): def IsEmbedManifest(self, config): """Returns whether manifest should be linked into binary.""" config = self._TargetConfig(config) - embed = self._Setting(('VCManifestTool', 'EmbedManifest'), config) + embed = self._Setting(('VCManifestTool', 'EmbedManifest'), config, + default='true') return embed == 'true' def IsLinkIncremental(self, config): diff --git a/test/win/gyptest-link-generate-manifest.py b/test/win/gyptest-link-generate-manifest.py index 3210b64b..77c9228e 100644 --- a/test/win/gyptest-link-generate-manifest.py +++ b/test/win/gyptest-link-generate-manifest.py @@ -120,4 +120,8 @@ if sys.platform == 'win32': generate_manifest=False, embedded_manifest=False, extra_manifest=True) + test_manifest('test_generate_manifest_default_embed_default.exe', + generate_manifest=True, + embedded_manifest=True, + extra_manifest=False) test.pass_test() diff --git a/test/win/linker-flags/generate-manifest.gyp b/test/win/linker-flags/generate-manifest.gyp index 41f888fa..34a68d1a 100644 --- a/test/win/linker-flags/generate-manifest.gyp +++ b/test/win/linker-flags/generate-manifest.gyp @@ -152,5 +152,15 @@ }, }, }, + { + 'target_name': 'test_generate_manifest_default_embed_default', + 'type': 'executable', + 'sources': ['hello.cc'], + 'msvs_settings': { + 'VCLinkerTool': { + 'EnableUAC': 'true', + }, + }, + }, ] } |