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

make the cmake error parser public API #72

Merged
merged 1 commit into from
Sep 14, 2022
Merged

make the cmake error parser public API #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmake/org.eclipse.cdt.cmake.core.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...e/core/internal/CMakeErrorParserTest.java → .../cdt/cmake/core/CMakeErrorParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion cmake/org.eclipse.cdt.cmake.core/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.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,
Expand Down
6 changes: 4 additions & 2 deletions ...cmake/core/internal/CMakeErrorParser.java → ...ipse/cdt/cmake/core/CMakeErrorParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -17,6 +17,7 @@
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;
Expand All @@ -35,8 +36,9 @@
* </p>
*
* @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;
Expand Down
5 changes: 4 additions & 1 deletion ...internal/CMakeExecutionMarkerFactory.java → ...ake/core/CMakeExecutionMarkerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -27,6 +29,7 @@
* Default implementation of {@code ICMakeExecutionMarkerFactory}.
*
* @author Martin Weber
* @since 1.5.0
*/
public class CMakeExecutionMarkerFactory implements ICMakeExecutionMarkerFactory {

Expand Down
6 changes: 4 additions & 2 deletions ...nternal/ICMakeExecutionMarkerFactory.java → ...ke/core/ICMakeExecutionMarkerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -21,9 +22,10 @@
* 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)
Expand Down
5 changes: 3 additions & 2 deletions .../internal/ParsingConsoleOutputStream.java → ...make/core/ParsingConsoleOutputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -20,8 +20,9 @@
* 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;
Expand Down
4 changes: 4 additions & 0 deletions ...lipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@
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;
Expand Down