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.

Sign up for GitHub

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

Detection for VS 2022 toolchain #778

Merged
merged 2 commits into from
May 15, 2024
Merged

Detection for VS 2022 toolchain #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f994ec
Detection for VS 2022 toolchain
MarkZ3 Jun 19, 2021
215fed2
Choose latest of commit date and author date for the end of copyright
jonahgraham May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion releng/scripts/check_features.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,10 @@ git ls-files -- \*/feature.xml | while read feature_xml; do
feature_start_year=$(git log --reverse --format='%ad' --date="format:%Y" -- $feature_xml $plugin_dir | head -1)
;;
esac
feature_end_year=$(git log --format='%ad' --date="format:%Y" -- $feature_xml $plugin_dir | head -1)
# Choose latest of commit date and author date for the end of copyright
feature_end_year_author=$(git log --format='%ad' --date="format:%Y" -- $feature_xml $plugin_dir | head -1)
feature_end_year_commit=$(git log --format='%cd' --date="format:%Y" -- $feature_xml $plugin_dir | head -1)
feature_end_year=$((echo $feature_end_year_author ; echo $feature_end_year_commit) | sort -n | tail -1)
feature_name=$(grep featureName= $feature_dir/feature.properties | sed '-es,featureName=,,')
if [ "$feature_start_year" = "$feature_end_year" ]; then
feature_years="${feature_start_year}"
Expand Down
2 changes: 1 addition & 1 deletion windows/org.eclipse.cdt.msw.build/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 2 additions & 1 deletion ...org.eclipse.cdt.msw.build/src/org/eclipse/cdt/internal/msw/build/IVSVersionConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,4 +16,5 @@
interface IVSVersionConstants {
VSVersionNumber VS2017_BASE_VER = new VSVersionNumber(15);
VSVersionNumber VS2019_BASE_VER = new VSVersionNumber(16);
VSVersionNumber VS2022_BASE_VER = new VSVersionNumber(17);
}
11 changes: 6 additions & 5 deletions ....eclipse.cdt.msw.build/src/org/eclipse/cdt/internal/msw/build/VSInstallationRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@ private static void detectVSInstallations() {
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) {
Expand Down
Loading