win,build: add Visual Studio 2017 support #11867

joaocgreis · 2017-03-15T16:25:52Z

This uses the same method that landed in node-gyp in nodejs/node-gyp#1130, using PowerShell to compile and execute a C# script that queries the COM server installed by Visual Studio 2017. The script is almost the same as the one in node-gyp, but adapted to generate a small .bat file that sets environment variables instead of JSON output.

A backport of the Gyp patch under review in https://chromium-review.googlesource.com/c/433540 is included (cherry-picked from #11084). This is a different approach than the one used in node-gyp. There, gyp is forced to use VS2015 (generating projects that are compatible with 2017), but to do that here would require deeper changes in configure. Since we already have a few more floating patches, adding this seems cleaner and easier to maintain to me.

cc @nodejs/platform-windows @nodejs/build

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
documentation is changed or added
commit message follows commit guidelines

Affected core subsystem(s)

Windows, build.

Add support for creating VS2017 projects to gyp.

joaocgreis · 2017-03-15T16:55:57Z

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

Add support for Visual Studio 2017. A C# script, compiled and executed by PowerShell, is used to query the COM server about the location of VS installation and installed SDK version, filtering installations that miss the required components.

kunalspathak · 2017-03-15T20:27:49Z

tools/Find-VS2017.cs

+                else
+                    continue;
+
+                Console.WriteLine(String.Format("  - Found {0}", id));


onsole.WriteLine(String.Format(" - Found {0}", id)); [](start = 17, length = 53)

unreachable?

Is reached when any of the if conditions above is true

Ah, ofcourse. I misread the code.

kunalspathak · 2017-03-15T20:31:38Z

tools/Find-VS2017.cs

+                if (Win10SDKVer > 0)
+                {
+                    Console.WriteLine("  - Using this installation with Windows 10 SDK");
+                    string[] lines = { String.Format("set \"VS2017_INSTALL={0}\"", path), String.Format("set \"VS2017_SDK=10.0.{0}.0\"", Win10SDKVer) };


"set "VS2017_INSTALL={0}"" [](start = 53, length = 28)

Have a string variable for this and resuse it below as well.

kunalspathak · 2017-03-15T20:35:26Z

tools/gyp/pylib/gyp/generator/msvs.py

@@ -2662,6 +2662,15 @@ def _GetMSBuildGlobalProperties(spec, guid, gyp_file_name):
    else:
      properties[0].append(['ApplicationType', 'Windows Store'])

+  msvs_windows_sdk_version = None
+  if msvs_windows_sdk_version == None and version.ShortName() == '2017':
+    vs2017_sdk = '10.0.14393.0'


10.0.14393.0 [](start = 18, length = 12)

I didn't follow your changes in gyp, but is this always safe to consider this as default version?

It may not always be installed, but is the one selected by the installer when the "Desktop development with C++" workload is selected, so it should be the most common one. If it is not installed, compilation will fail later, but it's better than failing here unconditionally. Should this be something else?

I don't mind keeping this version. I just wanted to know where this came from.

In reply to: 106287872 [](ancestors = 106287872)

I would rather see an early fail then use an arbitrary default.
P.S. When "Windows Creators Edition" will be released the default version will be 10.0.15052.*

kunalspathak · 2017-03-15T20:41:02Z

tools/gyp/pylib/gyp/generator/msvs.py

+  if msvs_windows_sdk_version == None and version.ShortName() == '2017':
+    vs2017_sdk = '10.0.14393.0'
+    vs2017_sdk = os.environ.get('vs2017_sdk', vs2017_sdk)
+    if vs2017_sdk:


vs2017_sdk [](start = 7, length = 10)

Correct me, but this will always be true, right?

I don't know of a way to set an empty variable in cmd, but it's possible that the variable is set from another program that calls this. Something like os.environ['vs2017_sdk'] = '' in python or empty variable when using gitbash.

Yeah, AFAIK, there is not way to set empty variable in cmd. Empty variable is equivalent of not defining environment variable. Python, definitely you could do that in which case the check makes sense.

kunalspathak · 2017-03-15T20:41:38Z

tools/gyp/pylib/gyp/generator/msvs.py

+    vs2017_sdk = os.environ.get('vs2017_sdk', vs2017_sdk)
+    if vs2017_sdk:
+      msvs_windows_sdk_version = vs2017_sdk
+  if msvs_windows_sdk_version:


msvs_windows_sdk_version [](start = 5, length = 24)

and probably this as well will always be true?

Following from above, can be false.

seishun · 2017-03-15T21:33:30Z

tools/Find-VS2017.cs

+        public static void Query()
+        {
+            ISetupConfiguration query = new SetupConfiguration();
+            ISetupConfiguration2 query2 = (ISetupConfiguration2)query;


Use var to prevent redundancy?

We're trying to support Windows 7/2008R2 with the tools that it ships with by default, that means C# version 2. var was only introduced in version 3.

joaocgreis · 2017-03-16T19:23:47Z

Updated.

@kunalspathak @seishun thanks for your reviews!

kunalspathak · 2017-03-16T19:42:22Z

LGTM

refack · 2017-03-17T00:03:14Z

I think that cherry picking changes from node-gyp/gyp is gonna be a PITA.
Anyway you should at least use my new GetVS2017Configuration.cs it has quite a bit of traction, and has a few bugs solved.
I think you should run vcvarsall.bat as msbuild.exe would fail otherwise.

refack · 2017-03-17T17:24:47Z

tools/Find-VS2017.cs

+                {
+                    Console.WriteLine("  - Using this installation with Windows 8.1 SDK");
+                    string[] lines = { setPath, "set \"VS2017_SDK=8.1\"" };
+                    System.IO.File.WriteAllLines(@"Set_VS2017.bat", lines);


This smell bad...

Should this be done differently?

refack · 2017-03-17T17:29:27Z

tools/gyp/pylib/gyp/MSVSVersion.py

+                                  uses_vcxproj=True,
+                                  path=path,
+                                  sdk_based=sdk_based,
+                                  default_toolset='v141'),
      '2015': VisualStudioVersion('2015',


So this is a de-novo patch, not based on the strategy in node-gyp:configure.js .
Could be done in configure which generates node.gypi

Node-gyp is very adverse to floating patches, but that is not the case here. I'd rather have the floating patch and not hack gyp. This patch is small enough to be reviewed here, and contained in a git commit so it can be easily reverted if a different approach lands upstream.

refack · 2017-03-17T17:32:13Z

vcbuild.bat

 @rem Look for Visual Studio 2015
+:vc-set-2015
+if defined target_env if "%target_env%" NEQ "vc2015" goto msbuild-not-found


This breaks the current usage. vcbuild.bat should work with no arguments.

vcbuild.bat works with no arguments. This only takes effect if the user wants to select a specific version of VS to use.

You're right, missed the if defined target_env

joaocgreis · 2017-03-21T03:17:45Z

@refack thanks for your review!

I think that cherry picking changes from node-gyp/gyp is gonna be a PITA.

Note there are two versions of gyp in this repository, one under deps/npm/node_modules/node-gyp/gyp and another under tools/gyp. They are already different and separately maintained (the first is maintained in node-gyp).

Anyway you should at least use my new GetVS2017Configuration.cs it has quite a bit of traction, and has a few bugs solved.

I'd rather use this trimmed down version that is easier to maintain here. It should need very little changes. What bugs do you see here?

I think you should run vcvarsall.bat as msbuild.exe would fail otherwise.

What do you mean, instead of VsDevCmd.bat? I did not find any advantage of one over the other, only that vcvarsall.bat was not present in the RC version. msbuild.exe does not fail for me, does it for you? Can you paste your output (or make a gist perhaps, if it's big)?

refack · 2017-03-21T16:31:39Z

On Mon, Mar 20, 2017 at 11:18 PM, João Reis ***@***.***> wrote: @refack <https://github.com/refack> thanks for your review! 1. I think that cherry picking changes from node-gyp/gyp is gonna be a PITA. Note there are two versions of gyp in this repository, one under deps/npm/node_modules/node-gyp/gyp and another under tools/gyp. They are already different and separately maintained (the first is maintained in node-gyp).

I'm suggesting to merge them

1. Anyway you should at least use my new GetVS2017Configuration.cs it has quite a bit of traction, and has a few bugs solved. I'd rather use this trimmed down version that is easier to maintain here. It should need very little changes. What bugs do you see here?

New version has been trimmed down (based some by your feedback) https://github.com/node4good/msvs-com-helper

1. I think you should run vcvarsall.bat as msbuild.exe would fail otherwise. What do you mean, instead of VsDevCmd.bat? I did not find any advantage of one over the other, only that vcvarsall.bat was not present in the RC version. msbuild.exe does not fail for me, does it for you? Can you paste your output (or make a gist perhaps, if it's big)?

Not instead, just sooner. Now it's only run before `build` I suggest running it before `configure` and use it's ENV for downstream decisions.

…

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#11867 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAF6sz3KJ6Y4Y5xOU554OgM1W3_AO-Z2ks5rn0F8gaJpZM4MeMB8> .

joaocgreis · 2017-04-12T19:57:29Z

Not instead, just sooner. Now it's only run before build I suggest running it before configure and use it's ENV for downstream decisions.

It is run before configure. It is run in line 160, configure is in 208 and build in 220. Did I misunderstood?

refack · 2017-04-12T20:06:59Z

It is run before configure. It is run in line 160, configure is in 208 and build in 220. Did I misunderstood?

Sorry I didn't follow the code flow correctly, I thought vcvarsall.bat was called only before the msbuild call

refack · 2017-04-16T15:12:21Z

@joaocgreis now that we have VS2017 in upstream GYP I think I'm gonna remove the detection code, and delegate the responsibility to the dev (like I suggested in libuv) to run vcvarsall.bat by themselves. Sounds good?

build,tools: add support for VS2017 to gyp

d7c7538

Add support for creating VS2017 projects to gyp.

nodejs-github-bot added build Issues and PRs related to build files or the CI. doc Issues and PRs related to the documentations. meta Issues and PRs related to the general management of the project. tools Issues and PRs related to the tools directory. labels Mar 15, 2017

joaocgreis added the windows Issues and PRs related to the Windows platform. label Mar 15, 2017

seishun force-pushed the master branch from 5d9b1e8 to b5eccc4 Compare March 15, 2017 16:35

joaocgreis mentioned this pull request Mar 15, 2017

win: enable build with vs2017 #11852

Closed

3 tasks

win,build: add Visual Studio 2017 support

a1d8608

Add support for Visual Studio 2017. A C# script, compiled and executed by PowerShell, is used to query the COM server about the location of VS installation and installed SDK version, filtering installations that miss the required components.

joaocgreis force-pushed the joaocgreis-H3A-vs2017 branch from 351bfbb to a1d8608 Compare March 15, 2017 18:34

kunalspathak reviewed Mar 15, 2017

View reviewed changes

seishun reviewed Mar 15, 2017

View reviewed changes

fixup: setPath string

d085fcf

refack mentioned this pull request Mar 17, 2017

Got node to build on VS2017 indutny/gyp.js#33

Closed

refack reviewed Mar 17, 2017

View reviewed changes

refack force-pushed the master branch from 16073c0 to fbe946b Compare April 14, 2017 04:11

ghost approved these changes Apr 16, 2017

View reviewed changes

aliscco mentioned this pull request Dec 1, 2023

[Snyk] Fix for 1 vulnerabilities aliscco/alisco-node#962

Open

leonardoadame mentioned this pull request Dec 1, 2023

[Snyk] Fix for 1 vulnerabilities leonardoadame/node#377

Open

This was referenced Dec 1, 2023

[Snyk] Security upgrade eslint from 4.19.1 to 6.0.0 aliscco/alisco-node#966

Open

[Snyk] Security upgrade eslint from 4.18.2 to 6.0.0 aliscco/alisco-node#968

Open

This was referenced Dec 1, 2023

[Snyk] Security upgrade eslint from 4.19.1 to 6.0.0 leonardoadame/node#391

Open

[Snyk] Fix for 1 vulnerabilities leonardoadame/node#397

Open

This was referenced Dec 1, 2023

[Snyk] Fix for 1 vulnerabilities aliscco/alisco-node#1001

Open

[Snyk] Security upgrade eslint from 4.19.1 to 6.0.0 aliscco/alisco-node#1012

Open

adamlaska mentioned this pull request Dec 2, 2023

[Snyk] Fix for 1 vulnerabilities adamlaska/node#132

Open

aliscco mentioned this pull request Dec 2, 2023

[Snyk] Fix for 1 vulnerabilities aliscco/alisco-node#1015

Open

leonardoadame mentioned this pull request Dec 2, 2023

[Snyk] Security upgrade eslint from 5.16.0 to 6.0.0 leonardoadame/node#426

Open

leonardoadame mentioned this pull request Dec 2, 2023

[Snyk] Security upgrade eslint from 4.12.1 to 6.0.0 leonardoadame/node#445

Open

This was referenced Dec 2, 2023

[Snyk] Security upgrade eslint from 2.13.1 to 6.0.0 aliscco/alisco-node#1040

Open

[Snyk] Fix for 6 vulnerabilities aliscco/alisco-node#1050

Open

[Snyk] Fix for 1 vulnerabilities aliscco/alisco-node#1053

Open

This was referenced Dec 2, 2023

[Snyk] Fix for 1 vulnerabilities leonardoadame/node#453

Open

[Snyk] Security upgrade eslint from 5.7.0 to 6.0.0 leonardoadame/node#455

Open

This was referenced Dec 2, 2023

[Snyk] Fix for 2 vulnerabilities aliscco/alisco-node#1066

Open

[Snyk] Security upgrade eslint from 4.19.1 to 6.0.0 aliscco/alisco-node#1067

Open

This was referenced Dec 3, 2023

[Snyk] Fix for 1 vulnerabilities leonardoadame/node#477

Open

[Snyk] Fix for 1 vulnerabilities leonardoadame/node#478

Open

[Snyk] Security upgrade eslint from 4.19.1 to 6.0.0 leonardoadame/node#493

Open

aliscco mentioned this pull request Dec 3, 2023

[Snyk] Fix for 7 vulnerabilities aliscco/alisco-node#1097

Open

leonardoadame mentioned this pull request Dec 3, 2023

[Snyk] Security upgrade eslint from 4.18.2 to 6.0.0 leonardoadame/node#505

Open

aliscco mentioned this pull request Dec 3, 2023

[Snyk] Security upgrade eslint from 5.16.0 to 6.0.0 aliscco/alisco-node#1124

Open

leonardoadame mentioned this pull request Dec 5, 2023

[Snyk] Fix for 1 vulnerabilities leonardoadame/node#543

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

win,build: add Visual Studio 2017 support #11867

win,build: add Visual Studio 2017 support #11867

joaocgreis commented Mar 15, 2017

joaocgreis commented Mar 15, 2017 •

edited

Loading

kunalspathak Mar 15, 2017

joaocgreis Mar 15, 2017

kunalspathak Mar 16, 2017

kunalspathak Mar 15, 2017

kunalspathak Mar 15, 2017

joaocgreis Mar 15, 2017

kunalspathak Mar 16, 2017

refack Mar 16, 2017

kunalspathak Mar 15, 2017

joaocgreis Mar 15, 2017

kunalspathak Mar 16, 2017

kunalspathak Mar 15, 2017

joaocgreis Mar 15, 2017

seishun Mar 15, 2017

joaocgreis Mar 16, 2017

joaocgreis commented Mar 16, 2017

kunalspathak commented Mar 16, 2017

refack commented Mar 17, 2017

refack Mar 17, 2017

joaocgreis Mar 21, 2017

refack Mar 17, 2017

joaocgreis Mar 21, 2017

refack Mar 17, 2017

joaocgreis Mar 21, 2017

refack Mar 21, 2017

joaocgreis commented Mar 21, 2017

refack commented Mar 21, 2017 via email

joaocgreis commented Apr 12, 2017

refack commented Apr 12, 2017

refack commented Apr 16, 2017

win,build: add Visual Studio 2017 support #11867

win,build: add Visual Studio 2017 support #11867

Conversation

joaocgreis commented Mar 15, 2017

Checklist

Affected core subsystem(s)

joaocgreis commented Mar 15, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joaocgreis commented Mar 16, 2017

kunalspathak commented Mar 16, 2017

refack commented Mar 17, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

joaocgreis commented Mar 21, 2017

refack commented Mar 21, 2017 via email

joaocgreis commented Apr 12, 2017

refack commented Apr 12, 2017

refack commented Apr 16, 2017

joaocgreis commented Mar 15, 2017 •

edited

Loading