mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-03-28 14:56:28 +01:00
Code Issues Wiki Activity

Detection for VS 2022 toolchain

Browse source 
This adds basic support for VS 2022 by detecting the toolchain.
I.e. include paths, lib paths, and PATH env var are properly detected.

The detection works the same as 2017 and 2019 since vswhere.exe works
the same and the folder layout hasn't changed.

Revived from https://git.eclipse.org/r/c/cdt/org.eclipse.cdt/+/182202
This commit is contained in:
Marc-Andre Laperle 2021-06-19 00:09:16 -04:00 • committed by Jonah Graham
parent 271041be36
commit b91400112d
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
View file

@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.cdt.msw.build;singleton:=true
Bundle-Version: 2.0.200.qualifier
Bundle-Version: 2.0.300.qualifier
Bundle-Activator: org.eclipse.cdt.msw.build.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,

3
windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/internal/msw/build/IVSVersionConstants.java
View file

@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2020 Marc-Andre Laperle.
* Copyright (c) 2020, 2021 Marc-Andre Laperle.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@ -16,4 +16,5 @@ package org.eclipse.cdt.internal.msw.build;
interface IVSVersionConstants {
VSVersionNumber VS2017_BASE_VER = new VSVersionNumber(15);
VSVersionNumber VS2019_BASE_VER = new VSVersionNumber(16);
VSVersionNumber VS2022_BASE_VER = new VSVersionNumber(17);
}

11
windows/org.eclipse.cdt.msw.build/src/org/eclipse/cdt/internal/msw/build/VSInstallationRegistry.java
View file

@ -35,11 +35,12 @@ public class VSInstallationRegistry {
fVsInstallations = new TreeMap<>();
// We are opting-in which versions to detect instead of trying to detect even unknown ones in order
// to allow proper testing for a new version before exposing it to users.
Arrays.asList(IVSVersionConstants.VS2017_BASE_VER, IVSVersionConstants.VS2019_BASE_VER).forEach(version -> {
VSInstallation insllation = detectVSInstallation(version);
if (insllation != null)
fVsInstallations.put(version, insllation);
});
Arrays.asList(IVSVersionConstants.VS2017_BASE_VER, IVSVersionConstants.VS2019_BASE_VER,
IVSVersionConstants.VS2022_BASE_VER).forEach(version -> {
VSInstallation insllation = detectVSInstallation(version);
if (insllation != null)
fVsInstallations.put(version, insllation);
});
}
private static VSInstallation detectVSInstallation(VSVersionNumber baseVersion) {