Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

win,build: support Visual C++ Build Tools 2015 #5627

Merged
merged 1 commit into from
Mar 11, 2016

Conversation

joaocgreis
Copy link
Member

Pull Request check-list

  • Does make -j8 test (UNIX) or vcbuild test nosign (Windows) pass with
    this change (including linting)?
  • Is the commit message formatted according to [CONTRIBUTING.md][0]?

Affected core subsystem(s)

win, build

Description of change

To build with Microsoft Visual C++ Build Tools 2015 Technical Preview Update 2 RC, msbuild should be invoked with a parameter specifying the platform (/p:Platform=). This is necessary because vcvarsall.bat sets a default platform that is not present in the solution generated by Gyp, failing the build.

CI machines run a previous version of VCBT, with a version of vcvarsall.bat modified to be able to build node. With the updated version in Update 2, only this change is needed to build with unmodified VCBT.

This is a trivial cherry-pick for v4-staging, v0.12-staging and v0.10-staging.

cc @nodejs/platform-windows

@joaocgreis joaocgreis added windows Issues and PRs related to the Windows platform. build Issues and PRs related to build files or the CI. land-on-master labels Mar 9, 2016
@joaocgreis
Copy link
Member Author

@jasnell
Copy link
Member

jasnell commented Mar 11, 2016

LGTM

Invoke MSBuild specifying the target platform as generated by Gyp.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: nodejs#5627
@joaocgreis joaocgreis merged commit a693557 into nodejs:master Mar 11, 2016
joaocgreis added a commit that referenced this pull request Mar 11, 2016
Invoke MSBuild specifying the target platform as generated by Gyp.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: #5627
joaocgreis added a commit that referenced this pull request Mar 11, 2016
Invoke MSBuild specifying the target platform as generated by Gyp.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: #5627
joaocgreis added a commit that referenced this pull request Mar 11, 2016
Invoke MSBuild specifying the target platform as generated by Gyp.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: #5627
@joaocgreis
Copy link
Member Author

@jasnell thanks for the review.

Landed in master in a693557
Landed in v4.x-staging in a300696
Landed in v0.12-staging in ff2bed6
Landed in v0.10-staging in 905bec2

evanlucas pushed a commit that referenced this pull request Mar 14, 2016
Invoke MSBuild specifying the target platform as generated by Gyp.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: #5627
@evanlucas evanlucas mentioned this pull request Mar 14, 2016
rvagg pushed a commit that referenced this pull request Mar 16, 2016
Invoke MSBuild specifying the target platform as generated by Gyp.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: #5627
MylesBorins pushed a commit that referenced this pull request Mar 17, 2016
Invoke MSBuild specifying the target platform as generated by Gyp.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: #5627
MylesBorins pushed a commit that referenced this pull request Mar 21, 2016
Invoke MSBuild specifying the target platform as generated by Gyp.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: #5627
@MylesBorins MylesBorins mentioned this pull request Mar 21, 2016
MylesBorins pushed a commit that referenced this pull request Mar 21, 2016
This LTS release comes with 113 commits, 56 of which are doc related,
18 of which are build / tooling related, 16 of which are test related
and 7 which are benchmark related.

Notable Changes:

* build:
  - Updated Logos for the OSX + Windows installers
    - (Rod Vagg) #5401
    - (Robert Jefe Lindstaedt) #5531
  - New option to select you VS Version in the Windows installer
    - (julien.waechter) #4645
  - Support Visual C++ Build Tools 2015
    - (João Reis) #5627
* tools:
  - Gyp now works on OSX without XCode
    - (Shigeki Ohtsu) #1325
MylesBorins pushed a commit that referenced this pull request Mar 22, 2016
This LTS release comes with 113 commits, 56 of which are doc related,
18 of which are build / tooling related, 16 of which are test related
and 7 which are benchmark related.

Notable Changes:

* build:
  - Updated Logos for the OSX + Windows installers
    - (Rod Vagg) #5401
    - (Robert Jefe Lindstaedt) #5531
  - New option to select your VS Version in the Windows installer
    - (julien.waechter) #4645
  - Support Visual C++ Build Tools 2015
    - (João Reis) #5627
* tools:
  - Gyp now works on OSX without XCode
    - (Shigeki Ohtsu) #1325
MylesBorins pushed a commit that referenced this pull request Mar 22, 2016
This LTS release comes with 113 commits, 56 of which are doc related,
18 of which are build / tooling related, 16 of which are test related
and 7 which are benchmark related.

Notable Changes:

* build:
  - Updated Logos for the OSX + Windows installers
    - (Rod Vagg) #5401
    - (Robert Jefe Lindstaedt) #5531
  - New option to select your VS Version in the Windows installer
    - (julien.waechter) #4645
  - Support Visual C++ Build Tools 2015
    - (João Reis) #5627
* tools:
  - Gyp now works on OSX without XCode
    - (Shigeki Ohtsu) #1325

PR-URL: #5835
This was referenced Mar 31, 2016
jBarz pushed a commit to ibmruntimes/node that referenced this pull request Nov 4, 2016
Invoke MSBuild specifying the target platform as generated by Gyp.

Reviewed-By: James M Snell <jasnell@gmail.com>
PR-URL: nodejs/node#5627
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.

2 participants