FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

build,win: fix node.exe resource version by joaocgreis · Pull Request #3053 · nodejs/node · GitHub

/ node Public

build,win: fix node.exe resource version - #3053

Merged
joaocgreis merged 1 commit into
nodejs:masterfrom
JaneaSystems:joaocgreis-F9N-rc-fix-2
Oct 1, 2015
Merged

build,win: fix node.exe resource version#3053
joaocgreis merged 1 commit into
nodejs:masterfrom
JaneaSystems:joaocgreis-F9N-rc-fix-2

Conversation

Copy link
Copy Markdown
Member

As was described in #2963 , the resource file was not being compiled correctly and the version information in the details of node.exe was wrong.

Simply removing the quotes from node.rc solves this for releases and -pre builds, but does not work for nightlies and rcs, that require rc.exe to receive the NODE_TAG as a preprocessor definition.

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.

cc @nodejs/platform-windows

joaocgreis added windows Issues and PRs related to the Windows platform. build Issues and PRs related to build files or the CI. labels Sep 24, 2015

Copy link
Copy Markdown
Member Author

CI: https://ci.nodejs.org/job/node-test-pull-request/373/

Also tested locally with both VS2013 and VS2015.

Copy link
Copy Markdown
Contributor

LGTM

1 similar comment

Copy link
Copy Markdown
Member

LGTM

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: nodejs#2963
PR-URL: nodejs#3053
Reviewed-By: Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
joaocgreis force-pushed the joaocgreis-F9N-rc-fix-2 branch from 9d5ceec to a6aab43 Compare October 1, 2015 10:59
joaocgreis merged commit a6aab43 into nodejs:master Oct 1, 2015
joaocgreis added a commit that referenced this pull request Oct 2, 2015
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>
rvagg mentioned this pull request Oct 3, 2015
joaocgreis added a commit that referenced this pull request Nov 24, 2015
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>
joaocgreis added a commit that referenced this pull request Dec 3, 2015
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>
rvagg pushed a commit to rvagg/io.js that referenced this pull request Dec 3, 2015
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: nodejs#2963
PR-URL: nodejs#3053
Reviewed-By: Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
joaocgreis added a commit that referenced this pull request Dec 3, 2015
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>
rvagg mentioned this pull request Dec 3, 2015
gibfahn pushed a commit to ibmruntimes/node that referenced this pull request Apr 1, 2016
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: nodejs/node#2963
PR-URL: nodejs/node#3053
Reviewed-By: Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
jBarz pushed a commit to ibmruntimes/node that referenced this pull request Nov 4, 2016
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: nodejs/node#2963
PR-URL: nodejs/node#3053
Reviewed-By: Alexis Campailla <orangemocha@nodejs.org>
Reviewed-By: Johan Bergström <bugs@bergstroem.nu>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build Issues and PRs related to build files or the CI. windows Issues and PRs related to the Windows platform.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants


Back | FazBrowse Home | New Git URL