From 39df3d2e659be9d482dc6239b14ace14f2e823a5 Mon Sep 17 00:00:00 2001 From: 15knots <11367029+15knots@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:01:03 +0100 Subject: [PATCH] restore compatibility with eclipse 2023-12 fix #198 --- .../META-INF/MANIFEST.MF | 3 +- de.marw.cmake4eclipse.mbs.ui/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 11 +-- de.marw.cmake4eclipse.mbs/pom.xml | 2 +- .../mbs/internal/BuildscriptGenerator.java | 8 +- releng/cmake4eclipse.launch | 84 +++++++------------ releng/targetplatform/targetplatform.target | 8 +- 7 files changed, 48 insertions(+), 70 deletions(-) diff --git a/de.marw.cmake4eclipse.mbs.ui/META-INF/MANIFEST.MF b/de.marw.cmake4eclipse.mbs.ui/META-INF/MANIFEST.MF index af6970ac..915a7a21 100644 --- a/de.marw.cmake4eclipse.mbs.ui/META-INF/MANIFEST.MF +++ b/de.marw.cmake4eclipse.mbs.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-SymbolicName: de.marw.cmake4eclipse.mbs.ui;singleton:=true -Bundle-Version: 2.2.0.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Vendor: Martin Weber Bundle-Localization: plugin Automatic-Module-Name: de.marw.cmake4eclipse.mbs.ui @@ -33,6 +33,7 @@ Import-Package: com.google.gson;version="2.8.7", org.eclipse.swt.graphics, org.eclipse.swt.layout, org.eclipse.swt.widgets, + org.eclipse.tools.templates.core, org.eclipse.ui, org.eclipse.ui.actions, org.eclipse.ui.dialogs, diff --git a/de.marw.cmake4eclipse.mbs.ui/pom.xml b/de.marw.cmake4eclipse.mbs.ui/pom.xml index c0cdbe2f..833e1d95 100644 --- a/de.marw.cmake4eclipse.mbs.ui/pom.xml +++ b/de.marw.cmake4eclipse.mbs.ui/pom.xml @@ -12,6 +12,6 @@ de.marw.cmake4eclipse.mbs.ui - 2.2.0-SNAPSHOT + 3.0.0-SNAPSHOT eclipse-plugin diff --git a/de.marw.cmake4eclipse.mbs/META-INF/MANIFEST.MF b/de.marw.cmake4eclipse.mbs/META-INF/MANIFEST.MF index a2f26759..a3acb408 100644 --- a/de.marw.cmake4eclipse.mbs/META-INF/MANIFEST.MF +++ b/de.marw.cmake4eclipse.mbs/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %bundleName Bundle-Description: CDT CMake build integration Bundle-Copyright: 2013 Martin Weber Bundle-SymbolicName: de.marw.cmake4eclipse.mbs;singleton:=true -Bundle-Version: 2.0.4.qualifier +Bundle-Version: 3.0.0.qualifier Bundle-Vendor: Martin Weber Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-17 @@ -17,7 +17,7 @@ Import-Package: com.google.gson;version="2.8.7", org.eclipse.core.runtime.jobs, org.eclipse.core.runtime.preferences;version="3.4.0", org.eclipse.e4.core.contexts;version="1.7.0", - org.eclipse.jetty.util;version="[10.0.12,12.0.0)", + org.eclipse.jetty.util;version="[12.0.0,13.0.0)", org.osgi.framework, org.osgi.service.prefs;version="1.1.1" Bundle-Activator: de.marw.cmake4eclipse.mbs.internal.Activator @@ -29,8 +29,9 @@ Export-Package: de.marw.cmake4eclipse.mbs.cmakecache, de.marw.cmake4eclipse.mbs.preferences;x-friends:="de.marw.cmake4eclipse.mbs.ui", de.marw.cmake4eclipse.mbs.settings Automatic-Module-Name: de.marw.cmake4eclipse.mbs -Require-Bundle: org.eclipse.cdt.core;bundle-version="[8.0.0,8.4.0)", - org.eclipse.cdt.managedbuilder.core;bundle-version="[9.5.0,9.6.200)", +Require-Bundle: org.eclipse.cdt.core;bundle-version="8.3.0", + org.eclipse.cdt.managedbuilder.core;bundle-version="9.6.200", org.eclipse.cdt.jsoncdb.core;bundle-version="1.0.0", org.eclipse.core.variables, - org.eclipse.jdt.annotation;bundle-version="2.2.700";resolution:=optional + org.eclipse.jdt.annotation;resolution:=optional, + org.eclipse.cdt.managedbuilder.gnu.ui diff --git a/de.marw.cmake4eclipse.mbs/pom.xml b/de.marw.cmake4eclipse.mbs/pom.xml index a17afb32..b983c7db 100644 --- a/de.marw.cmake4eclipse.mbs/pom.xml +++ b/de.marw.cmake4eclipse.mbs/pom.xml @@ -12,6 +12,6 @@ de.marw.cmake4eclipse.mbs - 2.0.4-SNAPSHOT + 3.0.0-SNAPSHOT eclipse-plugin diff --git a/de.marw.cmake4eclipse.mbs/src/main/java/de/marw/cmake4eclipse/mbs/internal/BuildscriptGenerator.java b/de.marw.cmake4eclipse.mbs/src/main/java/de/marw/cmake4eclipse/mbs/internal/BuildscriptGenerator.java index 32af3e7c..a2233740 100644 --- a/de.marw.cmake4eclipse.mbs/src/main/java/de/marw/cmake4eclipse/mbs/internal/BuildscriptGenerator.java +++ b/de.marw.cmake4eclipse.mbs/src/main/java/de/marw/cmake4eclipse/mbs/internal/BuildscriptGenerator.java @@ -19,9 +19,9 @@ import java.util.ArrayList; import java.util.Date; import java.util.EnumSet; +import java.util.Iterator; import java.util.List; import java.util.Optional; -import java.util.StringTokenizer; import java.util.function.Predicate; import org.eclipse.cdt.core.CCorePlugin; @@ -565,9 +565,9 @@ private List buildCommandline(IPath srcDir, Optional iter = tokenizer.tokenize(otherArguments); iter.hasNext();) { + args.add(iter.next()); } } } diff --git a/releng/cmake4eclipse.launch b/releng/cmake4eclipse.launch index 7e9b7902..e6a097d7 100644 --- a/releng/cmake4eclipse.launch +++ b/releng/cmake4eclipse.launch @@ -9,11 +9,11 @@ - + - + @@ -27,10 +27,14 @@ + + + + @@ -38,45 +42,35 @@ - - - - + - - - + - - - - - + + + - - - + + - - - + + - @@ -84,14 +78,11 @@ - - - + + - - @@ -104,7 +95,6 @@ - @@ -170,9 +160,6 @@ - - - @@ -191,16 +178,10 @@ - - - - - - - + + - @@ -209,10 +190,11 @@ + - - + + @@ -228,7 +210,6 @@ - @@ -244,22 +225,24 @@ - - - + + + - + - + - + + + @@ -275,16 +258,9 @@ - - - - - - - diff --git a/releng/targetplatform/targetplatform.target b/releng/targetplatform/targetplatform.target index eebb1f82..fbbef072 100644 --- a/releng/targetplatform/targetplatform.target +++ b/releng/targetplatform/targetplatform.target @@ -1,9 +1,9 @@ - + - + @@ -11,7 +11,7 @@ - + @@ -89,6 +89,6 @@ -Xms40m -Xmx512M -XX:MaxPermSize=256m --consolelog +-consolelog -console \ No newline at end of file