build,win: fix node.exe resource version

When MSBuild invokes rc.exe, it passes NODE_TAG unstringified, but
passes it correctly to cl.exe. Hence, this workaround was made to
apply only to the resource file.

Fixes: https://github.com/nodejs/node/issues/2963
PR-URL: https://github.com/nodejs/node/pull/3053
Reviewed-By: Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>

diff --git a/src/node_version.h b/src/node_version.h
index 717677930993863ebcad39d4301ab3da1b370179..803314ac43bd1aa1315dda065c6396ef4c0ca173 100644 (file)
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -18,12 +18,21 @@
 # else
 #  define NODE_TAG "-pre"
 # endif
+#else
+// NODE_TAG is passed without quotes when rc.exe is run from msbuild
+# define NODE_EXE_VERSION NODE_STRINGIFY(NODE_MAJOR_VERSION) "." \
+                          NODE_STRINGIFY(NODE_MINOR_VERSION) "." \
+                          NODE_STRINGIFY(NODE_PATCH_VERSION)     \
+                          NODE_STRINGIFY(NODE_TAG)
 #endif
 
 # define NODE_VERSION_STRING  NODE_STRINGIFY(NODE_MAJOR_VERSION) "." \
                               NODE_STRINGIFY(NODE_MINOR_VERSION) "." \
                               NODE_STRINGIFY(NODE_PATCH_VERSION)     \
                               NODE_TAG
+#ifndef NODE_EXE_VERSION
+# define NODE_EXE_VERSION NODE_VERSION_STRING
+#endif
 
 #define NODE_VERSION "v" NODE_VERSION_STRING
 

diff --git a/src/res/node.rc b/src/res/node.rc
index 587843df2f74c3c8af277fdbd5d7a9600257cf2d..b2f7f3029f2a893db67709133d87afd4c5248004 100644 (file)
--- a/src/res/node.rc
+++ b/src/res/node.rc
@@ -32,8 +32,8 @@ BEGIN
             VALUE "CompanyName", "Node.js"
             VALUE "ProductName", "Node.js"
             VALUE "FileDescription", "Node.js: Server-side JavaScript"
-            VALUE "FileVersion", "NODE_VERSION_STRING"
-            VALUE "ProductVersion", "NODE_VERSION_STRING"
+            VALUE "FileVersion", NODE_EXE_VERSION
+            VALUE "ProductVersion", NODE_EXE_VERSION
             VALUE "OriginalFilename", "node.exe"
             VALUE "InternalName", "node"
             VALUE "LegalCopyright", "Copyright Node.js contributors. MIT license."