diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF index 879e9987144..c6e86f76dec 100644 --- a/jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF +++ b/jsoncdb/org.eclipse.cdt.jsoncdb.core/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %bundleName Bundle-Description: %bundleDescription Bundle-Copyright: %Bundle-Copyright Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.core;singleton:=true -Bundle-Version: 1.1.100.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java index 7a52ea8500a..a7fce2e6137 100644 --- a/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java +++ b/jsoncdb/org.eclipse.cdt.jsoncdb.core/src/org/eclipse/cdt/jsoncdb/core/participant/Arglets.java @@ -395,15 +395,29 @@ public final class Arglets { //////////////////////////////////////////////////////////////////// // compiler built-ins detection //////////////////////////////////////////////////////////////////// + + /** + * @deprecated use BuiltinDetectionArgsGeneric instead + */ + @Deprecated + public static abstract class BuiltinDetctionArgsGeneric { + protected int processArgument(IArgumentCollector resultCollector, String argsLine, Matcher[] optionMatchers) { + throw new IllegalStateException( + "This class is deprecated - extend class BuiltinDetectionArgsGeneric instead"); //$NON-NLS-1$ + } + } + /** * A tool argument parser capable to parse arguments from the command-line that * affect built-in detection. + * @since 1.2 */ - public static abstract class BuiltinDetctionArgsGeneric { + public static abstract class BuiltinDetectionArgsGeneric extends BuiltinDetctionArgsGeneric { /** * @see org.eclipse.cdt.jsoncdb.core.participant.IArglet#processArgument(IArgumentCollector, * IPath, String) */ + @Override protected final int processArgument(IArgumentCollector resultCollector, String argsLine, Matcher[] optionMatchers) { for (Matcher matcher : optionMatchers) { @@ -460,7 +474,7 @@ public final class Arglets { * A tool argument parser capable to parse a GCC option to specify paths * {@code --sysrooot}. */ - public static class Sysroot_GCC extends BuiltinDetctionArgsGeneric implements IArglet { + public static class Sysroot_GCC extends BuiltinDetectionArgsGeneric implements IArglet { @SuppressWarnings("nls") private static final Matcher[] optionMatchers = { /* "--sysroot=" quoted directory */ @@ -488,7 +502,7 @@ public final class Arglets { * A tool argument parser capable to parse a Clang option to specify the compilation target {@code --target}. * @since 1.1 */ - public static class Target_Clang extends BuiltinDetctionArgsGeneric implements IArglet { + public static class Target_Clang extends BuiltinDetectionArgsGeneric implements IArglet { private static final Matcher[] optionMatchers = { /* "--target=" triple */ Pattern.compile("--target=\\w+(-\\w+)*").matcher(EMPTY_STR) }; //$NON-NLS-1$ @@ -507,7 +521,7 @@ public final class Arglets { * A tool argument parser capable to parse a GCC option to specify the language * standard {@code -std=xxx}. */ - public static class LangStd_GCC extends BuiltinDetctionArgsGeneric implements IArglet { + public static class LangStd_GCC extends BuiltinDetectionArgsGeneric implements IArglet { @SuppressWarnings("nls") private static final Matcher[] optionMatchers = { Pattern.compile("-std=\\S+").matcher(EMPTY_STR), Pattern.compile("-ansi").matcher(EMPTY_STR), diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF index 5a60baecd3f..8edf6d7b10c 100644 --- a/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF +++ b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %bundleName Bundle-Copyright: %Bundle-Copyright Bundle-SymbolicName: org.eclipse.cdt.jsoncdb.nvidia;singleton:=true -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.0.100.qualifier Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 diff --git a/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java index 576e404556e..5ea509c76a2 100644 --- a/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java +++ b/jsoncdb/org.eclipse.cdt.jsoncdb.nvidia/src/org/eclipse/cdt/jsoncdb/nvidia/NvccLangStdArglet.java @@ -12,7 +12,7 @@ package org.eclipse.cdt.jsoncdb.nvidia; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.cdt.jsoncdb.core.participant.Arglets.BuiltinDetctionArgsGeneric; +import org.eclipse.cdt.jsoncdb.core.participant.Arglets.BuiltinDetectionArgsGeneric; import org.eclipse.cdt.jsoncdb.core.participant.IArglet; import org.eclipse.core.runtime.IPath; @@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IPath; * A tool argument parser capable to parse a nvcc option to specify the language * standard {@code --std=xxx}. */ -public class NvccLangStdArglet extends BuiltinDetctionArgsGeneric implements IArglet { +public class NvccLangStdArglet extends BuiltinDetectionArgsGeneric implements IArglet { private static final Matcher[] optionMatchers = { Pattern.compile("--std \\S+").matcher(""), //$NON-NLS-1$ //$NON-NLS-2$ Pattern.compile("-std \\S+").matcher(""), }; //$NON-NLS-1$ //$NON-NLS-2$