build: Add option to select environment for msbuild (vc2015 or vc2013)#4645
build: Add option to select environment for msbuild (vc2015 or vc2013)#4645greenjava wants to merge 2 commits intonodejs:masterfrom
Conversation
|
@greenjava thanks for contributing! When the option is passed, I think it should not look for any other version. Something like: diff --git a/vcbuild.bat b/vcbuild.bat
index 924e3a3..1468ba5 100644
--- a/vcbuild.bat
+++ b/vcbuild.bat
@@ -112,10 +112,8 @@ call :getnodeversion || exit /b 1
@rem Set environment for msbuild
-if "%target_env%"=="vc2015" goto vc-set-2015
-if "%target_env%"=="vc2013" goto vc-set-2013
-
:vc-set-2015
+if defined target_env if "%target_env%" NEQ "vc2015" goto vc-set-2013
@rem Look for Visual Studio 2015
echo Looking for Visual Studio 2015
if not defined VS140COMNTOOLS goto vc-set-2013
@@ -139,6 +137,7 @@ set PLATFORM_TOOLSET=v140
goto msbuild-found
:vc-set-2013
+if defined target_env if "%target_env%" NEQ "vc2013" goto msbuild-not-found
@rem Look for Visual Studio 2013
echo Looking for Visual Studio 2013
if not defined VS120COMNTOOLS goto msbuild-not-foundCan you update if you agree? |
|
Thanks for your comment, i'll fix that (it's a smarter solution) |
|
LGTM, I'll land after the regulatory 48 hours pass. The commit message has to be adjusted to obey the line sizes, when I land I'll change it to something like: Let me know or update if you disagree. Thanks! |
|
That sounds good :) |
This changes vcbuild.bat to accept a new parameter (vc2015 or vc2013) to select the version of Visual Studio to use. PR-URL: nodejs#4645 Reviewed-By: João Reis <reis@janeasystems.com>
|
CI: https://ci.nodejs.org/job/node-test-pull-request/1233/ (failures unrelated - ref: #4679) Landed in 8182ec0 . Thanks! |
|
Nice work @greenjava. It looks like this is your first commit to core, if that's right then welcome on board! It's great to have contributors to the Windows-specific parts of the repo because our collaborator base is bit heavily skewed towards POSIX environments. I hope you stick around and find other places to contribute. |
This changes vcbuild.bat to accept a new parameter (vc2015 or vc2013) to select the version of Visual Studio to use. PR-URL: #4645 Reviewed-By: João Reis <reis@janeasystems.com>
|
@nodejs/build is this something we want to see in LTS? |
|
hmmm.. not sure. @nodejs/lts @nodejs/build |
|
This could help somebody out there, but I doubt it. I see this more like a new feature and I wouldn't pick it, but it's fine either way. |
|
+1 for LTS from me, it might be a new feature but not in the semver-minor way since it's build-focused |
This changes vcbuild.bat to accept a new parameter (vc2015 or vc2013) to select the version of Visual Studio to use. PR-URL: #4645 Reviewed-By: João Reis <reis@janeasystems.com>
This changes vcbuild.bat to accept a new parameter (vc2015 or vc2013) to select the version of Visual Studio to use. PR-URL: #4645 Reviewed-By: João Reis <reis@janeasystems.com>
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
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
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 changes vcbuild.bat to accept a new parameter (vc2015 or vc2013) to select the version of Visual Studio to use. PR-URL: nodejs#4645 Reviewed-By: João Reis <reis@janeasystems.com>
Add option in vcbuild.bat script to select Visual Studio environment to build Node on Windows.