MSVC check for installed versions - VS2017 in particular #3264

dmoody256 · 2019-01-09T14:43:12Z

mailing list: https://pairlist4.pair.net/pipermail/scons-users/2019-January/007513.html

Things added in this PR:

[src] changes:

Update vc.py to check for cl.exe for VC 14.1 and newer, which use a new directory structure when searching for installed MSVC's.
Updated vswhere call to include finding Visual Studio build tools
Added 'arm' and 'arm64' target platforms as options to the msvc tool. Also updated vc.py to consider the platform when looking if a valid cl.exe is available when searching for installed MSVC's.
Updated function comments in vc.py and msvc.xml tool documentation.
Updated common.py to include the UWP environment variable when extracting vcvars script enivronment variables to the construction environment.
updated find_vs_dir_by_reg from vs.py to also use the VC dir as a way to find installed Visual Studios.

[test] changes:

added 4 tests to check Visual Studio 2017 project generation
updated UWP test to work with Visual Studio 2017 which uses new environment variable
updated TARGET_ARCH.py test to make sure arm and arm64 targets are working (only tested if installed)
updated TestSconsMSVS.py to include new project templates.

need to:

check cl.exe is in detected VC dir
if a TARGET_ARCH is in the env, check if the corresponding cl.exe exists
Fix MSVC_UWP_APP.py test so libfile paths work for msvc 14.1
Add support for arm targets (arm and arm64)
Add msvc tests for MSVC 14.1 and add test to check TARGET_ARCH is checking the right toolset for msvc

Broaden the search to also include Build Tools (the compiler without the whole Visual Studio works). Also in the initial search to see if a suite is valid or not, don't just look for a couple of locations within a given path, do a search. Signed-off-by: Mats Wichmann <mats@linux.com>

Polish up a few docstrings and be more descriptive about the search for cl.exe. Also add requested version qualifiers to entry in CHANGES.txt. Signed-off-by: Mats Wichmann <mats@linux.com>

Signed-off-by: Mats Wichmann <mats@linux.com>

vc.py: Some of the debug prints weren't quite right, and added a few. When vswhere is called, it can return multiple lines if there are multiple products that match, so handle that case. Preparing for ARM support, add some host/target combos to the table - currently commented out. arm/arm64 added to the canonicalize table where it won't do any harm. common.py: in case we eventually switch to more general logging, use a specific logger rather than the root logger. Signed-off-by: Mats Wichmann <mats@linux.com>

Signed-off-by: Mats Wichmann <mats@linux.com>

removed debug print

…ixed test

…find msvc fixed some other tests

src/engine/SCons/Tool/MSCommon/vc.py

fixed except check revert some obsolete changes

dmoody256 · 2019-01-09T21:21:51Z

adding arm support would be related to #3182

fixed syntax error removed debug print

coveralls · 2019-01-10T10:30:56Z

Coverage decreased (-1.9%) to 79.745% when pulling 3e68e53 on dmoody256:msvc_use_script_to_check into 08877ad on SCons:master.

coveralls · 2019-01-10T10:30:57Z

Coverage decreased (-1.9%) to 79.745% when pulling 3e68e53 on dmoody256:msvc_use_script_to_check into 08877ad on SCons:master.

coveralls · 2019-01-10T10:30:57Z

Coverage increased (+0.4%) to 80.371% when pulling 247001f on dmoody256:msvc_use_script_to_check into 0f782d0 on SCons:master.

coveralls · 2019-01-10T10:30:59Z

Coverage decreased (-1.9%) to 79.745% when pulling 3e68e53 on dmoody256:msvc_use_script_to_check into 08877ad on SCons:master.

dmoody256 · 2019-01-12T09:31:04Z

@bdbaddog could you close some of those sider issues? They are line to long issues in the VS project template tests.

fixed syntax issue

dmoody256 · 2019-01-12T09:35:42Z

should fix #3268

bdbaddog

@bdbaddog could you close some of those sider issues? They are line to long issues in the VS project template tests.

Done

src/engine/SCons/Tool/MSCommon/vc.py

…o dict

removed unused function

bdbaddog · 2019-01-14T04:13:03Z

Can you summarize at the top what you changed?

dmoody256 · 2019-01-14T04:45:30Z

Can you summarize at the top what you changed?

done and updated documentation

src/engine/SCons/Tool/MSCommon/vc.py

…set version file updated other dict references

bdbaddog · 2019-01-15T04:52:36Z

Great work!
Merging!

mwichmann and others added 10 commits November 18, 2018 14:35

Documentation cleanup for vswhere-related fix

be0effc

Polish up a few docstrings and be more descriptive about the search for cl.exe. Also add requested version qualifiers to entry in CHANGES.txt. Signed-off-by: Mats Wichmann <mats@linux.com>

Typo fix

eaa2d27

Signed-off-by: Mats Wichmann <mats@linux.com>

stray close-paren character

070d310

Signed-off-by: Mats Wichmann <mats@linux.com>

use the vcvars batch script to find installed vc's

a714a84

leave old version to check if cl exists

8324cd2

make sure not to modify environment if just checking

dd4065f

updated to use the target arch

360065d

updated to use the target arch

a17c87b

removed debug print

dmoody256 force-pushed the msvc_use_script_to_check branch from 360065d to a17c87b Compare January 9, 2019 15:27

dmoody256 added 2 commits January 9, 2019 10:07

added ability to get vc dir without env (assume host == target) and f…

39bdae1

…ixed test

reverted tests so they can use a default host == target platform for …

f8de931

…find msvc fixed some other tests

dmoody256 force-pushed the msvc_use_script_to_check branch 2 times, most recently from 386a31b to bdad26b Compare January 9, 2019 17:13

bdbaddog reviewed Jan 9, 2019

View reviewed changes

src/engine/SCons/Tool/MSCommon/vc.py Outdated Show resolved Hide resolved

removed unused varied, added named expections, whitespace and comments

d325e5f

fixed except check revert some obsolete changes

dmoody256 force-pushed the msvc_use_script_to_check branch from bdad26b to d325e5f Compare January 9, 2019 17:21

dmoody256 mentioned this pull request Jan 9, 2019

MSVC tool supports choosing specific msvc version down to minor version #3265

Closed

dmoody256 mentioned this pull request Jan 9, 2019

For Issue#3222: improve ms build finding #3230

Merged

3 tasks

dmoody256 added 4 commits January 10, 2019 00:13

merge mats vc tool updates

d3cc1e0

merged from remote

13c07e0

added support for checking for arm target support, and UWP apps for 2017

a362956

added name for cl.exe and have older versions walk for cl.exe

3e68e53

fixed syntax error removed debug print

dmoody256 force-pushed the msvc_use_script_to_check branch from 593d2a4 to 3e68e53 Compare January 10, 2019 09:16

dmoody256 added 2 commits January 12, 2019 03:21

added test for vs 14.1 and checking arm targets

dbb5bb7

updated CHANGES.txt

f8b7857

dmoody256 changed the title ~~[WIP] fix MSVC check for installed versions~~ fix MSVC check for installed versions Jan 12, 2019

removed unused imports and other sider changes

580b28e

fixed syntax issue

dmoody256 force-pushed the msvc_use_script_to_check branch from 643696f to 580b28e Compare January 12, 2019 09:33

bdbaddog mentioned this pull request Jan 12, 2019

Fix #3268: cl.exe not found for VC2017 Community #3269

Closed

bdbaddog reviewed Jan 12, 2019

View reviewed changes

src/engine/SCons/Tool/MSCommon/vc.py Outdated Show resolved Hide resolved

dmoody256 added 4 commits January 12, 2019 15:03

updated msvs to handle newer versions, and moved host/target combos t…

2fe4f5b

…o dict

update comment

b1141a3

fix changes.txt and added some comments

5fd70fd

merge master

265a1e4

dmoody256 force-pushed the msvc_use_script_to_check branch from 2399fb8 to 5612efe Compare January 14, 2019 03:50

dmoody256 added 2 commits January 13, 2019 22:00

accidently moved a change in CHANGES.txt, moving it back

03a1cb0

removed unused function

merged master

ac42db6

dmoody256 force-pushed the msvc_use_script_to_check branch from 5612efe to ac42db6 Compare January 14, 2019 04:01

updated documentation

1479595

bdbaddog reviewed Jan 14, 2019

View reviewed changes

src/engine/SCons/Tool/MSCommon/vc.py Outdated Show resolved Hide resolved

bdbaddog reviewed Jan 14, 2019

View reviewed changes

src/engine/SCons/Tool/MSCommon/vc.py Outdated Show resolved Hide resolved

updated platform dict names and used context manager for opening tool…

247001f

…set version file updated other dict references

dmoody256 force-pushed the msvc_use_script_to_check branch from f47c258 to 247001f Compare January 14, 2019 17:54

bdbaddog merged commit f3739c4 into SCons:master Jan 15, 2019

bdbaddog changed the title ~~fix MSVC check for installed versions~~ MSVC check for installed versions - VS2017 in particular Jan 15, 2019

This was referenced Jan 15, 2019

VC2017(ver 14.1) not found due to "no cl.exe found" #3268

Closed

Support Visual Studio 2017 Build Tools #3222

Closed

add ARM support for recent Windows Visual Studio and Build Tools #3182

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MSVC check for installed versions - VS2017 in particular #3264

MSVC check for installed versions - VS2017 in particular #3264

dmoody256 commented Jan 9, 2019 •

edited

Loading

dmoody256 commented Jan 9, 2019 •

edited

Loading

coveralls commented Jan 10, 2019

coveralls commented Jan 10, 2019

coveralls commented Jan 10, 2019 •

edited

Loading

coveralls commented Jan 10, 2019

dmoody256 commented Jan 12, 2019

dmoody256 commented Jan 12, 2019

bdbaddog left a comment

bdbaddog commented Jan 14, 2019

dmoody256 commented Jan 14, 2019

bdbaddog commented Jan 15, 2019

MSVC check for installed versions - VS2017 in particular #3264

MSVC check for installed versions - VS2017 in particular #3264

Conversation

dmoody256 commented Jan 9, 2019 • edited Loading

dmoody256 commented Jan 9, 2019 • edited Loading

coveralls commented Jan 10, 2019

coveralls commented Jan 10, 2019

coveralls commented Jan 10, 2019 • edited Loading

coveralls commented Jan 10, 2019

dmoody256 commented Jan 12, 2019

dmoody256 commented Jan 12, 2019

bdbaddog left a comment

Choose a reason for hiding this comment

bdbaddog commented Jan 14, 2019

dmoody256 commented Jan 14, 2019

bdbaddog commented Jan 15, 2019

dmoody256 commented Jan 9, 2019 •

edited

Loading

dmoody256 commented Jan 9, 2019 •

edited

Loading

coveralls commented Jan 10, 2019 •

edited

Loading