From 0ccb310931f1361aa394dde5d7f446d0d40859de Mon Sep 17 00:00:00 2001 From: Martin Weber Date: Sun, 30 Aug 2020 13:49:13 +0200 Subject: [PATCH] Print build-start and -end message to consoleInfoStream. This make messages stand out more prominently in the build console. Change-Id: I180a7eb6631870004cca94a7f1d2c8bda5b044f8 Signed-off-by: Martin Weber --- .../core/internal/CMakeBuildConfiguration.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java b/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java index cb82bf041b7..9adc2484f59 100644 --- a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java +++ b/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java @@ -119,12 +119,11 @@ public class CMakeBuildConfiguration extends CBuildConfiguration { project.deleteMarkers(ICModelMarker.C_MODEL_PROBLEM_MARKER, false, IResource.DEPTH_INFINITE); infoPerResource = new HashMap<>(); - ConsoleOutputStream outStream = console.getOutputStream(); + ConsoleOutputStream infoStream = console.getInfoStream(); Path buildDir = getBuildDirectory(); - // TODO print to info stream here - outStream.write(String.format(Messages.CMakeBuildConfiguration_BuildingIn, buildDir.toString())); + infoStream.write(String.format(Messages.CMakeBuildConfiguration_BuildingIn, buildDir.toString())); // Make sure we have a toolchain file if cross if (toolChainFile == null && !isLocal()) { @@ -155,8 +154,7 @@ public class CMakeBuildConfiguration extends CBuildConfiguration { if (runCMake) { CMakeBuildConfiguration.deleteCMakeErrorMarkers(project); - // TODO print to info stream here - console.getOutputStream().write(String.format(Messages.CMakeBuildConfiguration_Configuring, buildDir)); + infoStream.write(String.format(Messages.CMakeBuildConfiguration_Configuring, buildDir)); // clean output to make sure there is no content // incompatible with current settings (cmake config would fail) cleanBuildDirectory(buildDir); @@ -190,7 +188,7 @@ public class CMakeBuildConfiguration extends CBuildConfiguration { IContainer srcFolder = project; command.add(new File(srcFolder.getLocationURI()).getAbsolutePath()); - outStream.write(String.join(" ", command) + '\n'); //$NON-NLS-1$ + infoStream.write(String.join(" ", command) + '\n'); //$NON-NLS-1$ org.eclipse.core.runtime.Path workingDir = new org.eclipse.core.runtime.Path( getBuildDirectory().toString()); @@ -239,7 +237,7 @@ public class CMakeBuildConfiguration extends CBuildConfiguration { command.addAll(Arrays.asList(buildCommand.split(" "))); //$NON-NLS-1$ } - outStream.write(String.join(" ", command) + '\n'); //$NON-NLS-1$ + infoStream.write(String.join(" ", command) + '\n'); //$NON-NLS-1$ org.eclipse.core.runtime.Path workingDir = new org.eclipse.core.runtime.Path( getBuildDirectory().toString()); @@ -259,8 +257,7 @@ public class CMakeBuildConfiguration extends CBuildConfiguration { // output processCompileCommandsFile(console, monitor); - // TODO print to info stream here - outStream.write(String.format(Messages.CMakeBuildConfiguration_BuildingComplete, epm.getErrorCount(), + infoStream.write(String.format(Messages.CMakeBuildConfiguration_BuildingComplete, epm.getErrorCount(), epm.getWarningCount(), buildDir.toString())); }