summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Campailla <alexis@janeasystems.com>2014-08-15 18:25:38 +0200
committerJoão Reis <reis@janeasystems.com>2015-09-16 05:43:10 -0400
commit8002192b4e29fbe2c48ced94caf7a6427b162884 (patch)
tree3a483b23a9dda1d854dd745d2e96349257605adf
parente669b277401097687c04147d3448aecd2730093b (diff)
downloadnode-8002192b4e29fbe2c48ced94caf7a6427b162884.tar.gz
win: manifest node.exe for Windows 8.1
This is a port of 03e93526e6b38279c04d69ddf98c493342730e85 . Original commit message: Adding a compatibility section to node.exe embedded manifest so that Node is declared explicitly compatible with Windows 8.1. Required so that os.release() can return the correct version on Windows 8.1. See http://msdn.microsoft.com/en-us/library/windows/desktop/ms724451(v=vs.85).aspx Reviewed-by: Trevor Norris <trev.norris@gmail.com> PR-URL: https://github.com/nodejs/node/pull/2838 Reviewed-By: silverwind - Roman Reiss <me@silverwind.io>
-rw-r--r--node.gyp6
-rw-r--r--src/res/node.exe.extra.manifest15
2 files changed, 21 insertions, 0 deletions
diff --git a/node.gyp b/node.gyp
index b641584c3..4243ece80 100644
--- a/node.gyp
+++ b/node.gyp
@@ -324,6 +324,12 @@
],
}],
],
+ 'msvs_settings': {
+ 'VCManifestTool': {
+ 'EmbedManifest': 'true',
+ 'AdditionalManifestFiles': 'src/res/node.exe.extra.manifest'
+ }
+ },
},
# generate ETW header and resource files
{
diff --git a/src/res/node.exe.extra.manifest b/src/res/node.exe.extra.manifest
new file mode 100644
index 000000000..c4cc80a14
--- /dev/null
+++ b/src/res/node.exe.extra.manifest
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+ <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+ <application>
+ <!-- Windows 8.1 -->
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <!-- Windows 8 -->
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <!-- Windows 7 -->
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <!-- Windows Vista -->
+ <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>
+ </application>
+ </compatibility>
+</assembly>