diff --git a/cmake/org.eclipse.cdt.cmake.core.tests/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.core.tests/META-INF/MANIFEST.MF index bc6a7e6aa49..fdf1b41feb8 100644 --- a/cmake/org.eclipse.cdt.cmake.core.tests/META-INF/MANIFEST.MF +++ b/cmake/org.eclipse.cdt.cmake.core.tests/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.cdt.cmake.core.tests Bundle-Version: 1.0.0.qualifier -Fragment-Host: org.eclipse.cdt.cmake.core;bundle-version="1.3.0" +Fragment-Host: org.eclipse.cdt.cmake.core;bundle-version="1.5.0" Automatic-Module-Name: org.eclipse.cdt.cmake.core.tests Bundle-Vendor: %Bundle-Vendor Bundle-Copyright: %Bundle-Copyright diff --git a/cmake/org.eclipse.cdt.cmake.core.tests/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParserTest.java b/cmake/org.eclipse.cdt.cmake.core.tests/src/org/eclipse/cdt/cmake/core/CMakeErrorParserTest.java similarity index 99% rename from cmake/org.eclipse.cdt.cmake.core.tests/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParserTest.java rename to cmake/org.eclipse.cdt.cmake.core.tests/src/org/eclipse/cdt/cmake/core/CMakeErrorParserTest.java index 268fef30c8c..4da8007c05c 100644 --- a/cmake/org.eclipse.cdt.cmake.core.tests/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParserTest.java +++ b/cmake/org.eclipse.cdt.cmake.core.tests/src/org/eclipse/cdt/cmake/core/CMakeErrorParserTest.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.cdt.cmake.core.internal; +package org.eclipse.cdt.cmake.core; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF b/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF index bcd9ed8b4bc..1608c58788c 100644 --- a/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF +++ b/cmake/org.eclipse.cdt.cmake.core/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.cdt.cmake.core;singleton:=true -Bundle-Version: 1.4.400.qualifier +Bundle-Version: 1.5.0.qualifier Bundle-Activator: org.eclipse.cdt.cmake.core.internal.Activator Bundle-Vendor: %providerName Require-Bundle: org.eclipse.core.runtime, diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeErrorParser.java similarity index 98% rename from cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeErrorParser.java index e15cd609dc5..5aa1ca34848 100644 --- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeErrorParser.java +++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeErrorParser.java @@ -6,7 +6,7 @@ * * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.cdt.cmake.core.internal; +package org.eclipse.cdt.cmake.core; import java.util.Arrays; import java.util.HashMap; @@ -17,6 +17,7 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.eclipse.cdt.cmake.core.internal.Activator; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IStatus; @@ -35,8 +36,9 @@ import org.eclipse.core.runtime.Status; *

* * @author Martin Weber + * @since 1.5.0 */ -/* package */ class CMakeErrorParser implements AutoCloseable { +public class CMakeErrorParser implements AutoCloseable { /** matches the Start of a message, also ending the previous message */ private static final Pattern PTN_MSG_START; diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeExecutionMarkerFactory.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeExecutionMarkerFactory.java similarity index 95% rename from cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeExecutionMarkerFactory.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeExecutionMarkerFactory.java index dd17e02ffc5..46513ac118b 100644 --- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeExecutionMarkerFactory.java +++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/CMakeExecutionMarkerFactory.java @@ -9,12 +9,14 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.cdt.cmake.core.internal; +package org.eclipse.cdt.cmake.core; import java.util.Map; import java.util.Map.Entry; import java.util.Objects; +import org.eclipse.cdt.cmake.core.internal.Activator; +import org.eclipse.cdt.cmake.core.internal.Messages; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IMarker; import org.eclipse.core.runtime.CoreException; @@ -27,6 +29,7 @@ import org.eclipse.core.runtime.Status; * Default implementation of {@code ICMakeExecutionMarkerFactory}. * * @author Martin Weber + * @since 1.5.0 */ public class CMakeExecutionMarkerFactory implements ICMakeExecutionMarkerFactory { diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeExecutionMarkerFactory.java similarity index 93% rename from cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeExecutionMarkerFactory.java index 1380cf44714..59cd5e671ee 100644 --- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ICMakeExecutionMarkerFactory.java +++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ICMakeExecutionMarkerFactory.java @@ -9,10 +9,11 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.cdt.cmake.core.internal; +package org.eclipse.cdt.cmake.core; import java.util.Map; +import org.eclipse.cdt.cmake.core.internal.Activator; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; @@ -21,9 +22,10 @@ import org.eclipse.core.runtime.CoreException; * build. * * @author Martin Weber + * @since 1.5.0 */ @FunctionalInterface -interface ICMakeExecutionMarkerFactory { +public interface ICMakeExecutionMarkerFactory { /** ID for error markers related to execution of the cmake tool. * @see IResource#createMarker(String) diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ParsingConsoleOutputStream.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ParsingConsoleOutputStream.java similarity index 93% rename from cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ParsingConsoleOutputStream.java rename to cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ParsingConsoleOutputStream.java index 8a1ef1ad25c..3ce4960040e 100644 --- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/ParsingConsoleOutputStream.java +++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/ParsingConsoleOutputStream.java @@ -9,7 +9,7 @@ * SPDX-License-Identifier: EPL-2.0 *******************************************************************************/ -package org.eclipse.cdt.cmake.core.internal; +package org.eclipse.cdt.cmake.core; import java.io.IOException; import java.util.Objects; @@ -20,8 +20,9 @@ import org.eclipse.cdt.core.ConsoleOutputStream; * Intercepts output to a console output stream and forwards it to a CMakeErrorParser for processing. * * @author Martin Weber + * @since 1.5.0 */ -class ParsingConsoleOutputStream extends ConsoleOutputStream { +public class ParsingConsoleOutputStream extends ConsoleOutputStream { private final ConsoleOutputStream os; private final CMakeErrorParser parser; diff --git a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java index 0827caca307..55eca78c4e8 100644 --- a/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java +++ b/cmake/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java @@ -24,8 +24,12 @@ import java.util.Map; import java.util.Objects; import java.util.function.Consumer; +import org.eclipse.cdt.cmake.core.CMakeErrorParser; +import org.eclipse.cdt.cmake.core.CMakeExecutionMarkerFactory; +import org.eclipse.cdt.cmake.core.ICMakeExecutionMarkerFactory; import org.eclipse.cdt.cmake.core.ICMakeToolChainFile; import org.eclipse.cdt.cmake.core.ICMakeToolChainManager; +import org.eclipse.cdt.cmake.core.ParsingConsoleOutputStream; import org.eclipse.cdt.cmake.core.internal.CommandDescriptorBuilder.CommandDescriptor; import org.eclipse.cdt.cmake.core.properties.CMakeGenerator; import org.eclipse.cdt.cmake.core.properties.ICMakeProperties;