From 09329e78332369b46a7f38f2071c871262591bc0 Mon Sep 17 00:00:00 2001 From: Igor Zinkovsky Date: Thu, 10 Nov 2011 13:04:34 -0800 Subject: [PATCH] Add node.rc with a version resource Fixes #2059 --- node.gyp | 1 + tools/{ => msvs}/msi/LICENSE.rtf | Bin tools/{ => msvs}/msi/getnodeversion.py | 0 tools/{ => msvs}/msi/nodemsi.sln | 0 tools/{ => msvs}/msi/nodemsi.wixproj | 0 tools/{ => msvs}/msi/product.wxs | 0 tools/msvs/res/node.rc | 62 +++++++++++++++++++++++++++++++++ 7 files changed, 63 insertions(+) rename tools/{ => msvs}/msi/LICENSE.rtf (100%) rename tools/{ => msvs}/msi/getnodeversion.py (100%) rename tools/{ => msvs}/msi/nodemsi.sln (100%) rename tools/{ => msvs}/msi/nodemsi.wixproj (100%) rename tools/{ => msvs}/msi/product.wxs (100%) create mode 100644 tools/msvs/res/node.rc diff --git a/node.gyp b/node.gyp index de5574b..abc83c5 100644 --- a/node.gyp +++ b/node.gyp @@ -155,6 +155,7 @@ 'src/platform_win32.cc', # headers to make for a more pleasant IDE experience 'src/platform_win32.h', + 'tools/msvs/res/node.rc', ], 'defines': [ 'FD_SETSIZE=1024', diff --git a/tools/msi/LICENSE.rtf b/tools/msvs/msi/LICENSE.rtf similarity index 100% rename from tools/msi/LICENSE.rtf rename to tools/msvs/msi/LICENSE.rtf diff --git a/tools/msi/getnodeversion.py b/tools/msvs/msi/getnodeversion.py similarity index 100% rename from tools/msi/getnodeversion.py rename to tools/msvs/msi/getnodeversion.py diff --git a/tools/msi/nodemsi.sln b/tools/msvs/msi/nodemsi.sln similarity index 100% rename from tools/msi/nodemsi.sln rename to tools/msvs/msi/nodemsi.sln diff --git a/tools/msi/nodemsi.wixproj b/tools/msvs/msi/nodemsi.wixproj similarity index 100% rename from tools/msi/nodemsi.wixproj rename to tools/msvs/msi/nodemsi.wixproj diff --git a/tools/msi/product.wxs b/tools/msvs/msi/product.wxs similarity index 100% rename from tools/msi/product.wxs rename to tools/msvs/msi/product.wxs diff --git a/tools/msvs/res/node.rc b/tools/msvs/res/node.rc new file mode 100644 index 0000000..aec868d --- /dev/null +++ b/tools/msvs/res/node.rc @@ -0,0 +1,62 @@ +// Copyright Joyent, Inc. and other Node contributors. +// +// Permission is hereby granted, free of charge, to any person obtaining a +// copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to permit +// persons to whom the Software is furnished to do so, subject to the +// following conditions: +// +// The above copyright notice and this permission notice shall be included +// in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN +// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +// USE OR OTHER DEALINGS IN THE SOFTWARE. + +#include "winresrc.h" +#include "node_version.h" + +// Version resource +VS_VERSION_INFO VERSIONINFO + FILEVERSION NODE_MAJOR_VERSION,NODE_MINOR_VERSION,NODE_PATCH_VERSION,0 + PRODUCTVERSION NODE_MAJOR_VERSION,NODE_MINOR_VERSION,NODE_PATCH_VERSION,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else +# ifdef NODE_VERSION_IS_RELEASE + FILEFLAGS 0x0L +# else + FILEFLAGS VS_FF_PRERELEASE +# endif +#endif + + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "Joyent, Inc" + VALUE "ProductName", "Node.js" + VALUE "FileDescription", "Evented I/O for V8 JavaScript" + VALUE "FileVersion", NODE_VERSION_STRING + VALUE "ProductVersion", NODE_VERSION_STRING + VALUE "OriginalFilename", "node.exe" + VALUE "InternalName", "node" + VALUE "LegalCopyright", "Copyright Joyent, Inc. and other Node contributors. MIT license." + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END -- 2.7.4