Commit d6ac547
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: #2963
PR-URL: #3053
Reviewed-By: Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>1 parent f92aee7 commit d6ac547
2 files changed
Lines changed: 11 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -18,12 +18,21 @@ | |||
| 18 | 18 | # else | |
| 19 | 19 | # define NODE_TAG "-pre" | |
| 20 | 20 | # endif | |
| 21 | + #else | ||
| 22 | + // NODE_TAG is passed without quotes when rc.exe is run from msbuild | ||
| 23 | + # define NODE_EXE_VERSION NODE_STRINGIFY(NODE_MAJOR_VERSION) "." \ | ||
| 24 | + NODE_STRINGIFY(NODE_MINOR_VERSION) "." \ | ||
| 25 | + NODE_STRINGIFY(NODE_PATCH_VERSION) \ | ||
| 26 | + NODE_STRINGIFY(NODE_TAG) | ||
| 21 | 27 | #endif | |
| 22 | 28 | ||
| 23 | 29 | # define NODE_VERSION_STRING NODE_STRINGIFY(NODE_MAJOR_VERSION) "." \ | |
| 24 | 30 | NODE_STRINGIFY(NODE_MINOR_VERSION) "." \ | |
| 25 | 31 | NODE_STRINGIFY(NODE_PATCH_VERSION) \ | |
| 26 | 32 | NODE_TAG | |
| 33 | + #ifndef NODE_EXE_VERSION | ||
| 34 | + # define NODE_EXE_VERSION NODE_VERSION_STRING | ||
| 35 | + #endif | ||
| 27 | 36 | ||
| 28 | 37 | #define NODE_VERSION "v" NODE_VERSION_STRING | |
| 29 | 38 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -32,8 +32,8 @@ BEGIN | |||
| 32 | 32 | VALUE "CompanyName", "Node.js" | |
| 33 | 33 | VALUE "ProductName", "Node.js" | |
| 34 | 34 | VALUE "FileDescription", "Node.js: Server-side JavaScript" | |
| 35 | - VALUE "FileVersion", "NODE_VERSION_STRING" | ||
| 36 | - VALUE "ProductVersion", "NODE_VERSION_STRING" | ||
| 35 | + VALUE "FileVersion", NODE_EXE_VERSION | ||
| 36 | + VALUE "ProductVersion", NODE_EXE_VERSION | ||
| 37 | 37 | VALUE "OriginalFilename", "node.exe" | |
| 38 | 38 | VALUE "InternalName", "node" | |
| 39 | 39 | VALUE "LegalCopyright", "Copyright Node.js contributors. MIT license." | |
0 commit comments