Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Riley2018-02-13 16:42:33 +0000
committerWilliam Riley2018-02-13 16:42:33 +0000
commit689ad9f6ec4ed40cafccf60aae2ec866203b321b (patch)
tree3efd08b9cff2b15ecd6dbd4cb5ff56b86676a39e /build/org.eclipse.cdt.cmake.core
parent9a4853aa2d1f6a718f9f0356bb7dd9d2311087ad (diff)
downloadorg.eclipse.cdt-689ad9f6ec4ed40cafccf60aae2ec866203b321b.tar.gz
org.eclipse.cdt-689ad9f6ec4ed40cafccf60aae2ec866203b321b.tar.xz
org.eclipse.cdt-689ad9f6ec4ed40cafccf60aae2ec866203b321b.zip
Bug 531043 - Display errors/warning count for makefile & cmake builds
Change-Id: I8b2ab525af137ddd890f5713a3278cce6d17bffd Signed-off-by: William Riley <william.riley@renesas.com>
Diffstat (limited to 'build/org.eclipse.cdt.cmake.core')
-rw-r--r--build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/CMakeBuildConfiguration.java11
-rw-r--r--build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/messages.properties2
2 files changed, 7 insertions, 6 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 fbaaa6c81ce..fab83820cc1 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
@@ -200,14 +200,15 @@ public class CMakeBuildConfiguration extends CBuildConfiguration {
Process process = processBuilder.start();
outStream.write(String.join(" ", command) + '\n'); //$NON-NLS-1$
watchProcess(process, new IConsoleParser[] { epm });
- }
- project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
+ project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
- // Load compile_commands.json file
- processCompileCommandsFile(monitor);
+ // Load compile_commands.json file
+ processCompileCommandsFile(monitor);
- outStream.write(String.format(Messages.CMakeBuildConfiguration_BuildingComplete, buildDir.toString()));
+ outStream.write(String.format(Messages.CMakeBuildConfiguration_BuildingComplete, epm.getErrorCount(),
+ epm.getWarningCount(), buildDir.toString()));
+ }
return new IProject[] { project };
} catch (IOException e) {
diff --git a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/messages.properties b/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/messages.properties
index db58245796d..a1feb4b8bf2 100644
--- a/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/messages.properties
+++ b/build/org.eclipse.cdt.cmake.core/src/org/eclipse/cdt/cmake/core/internal/messages.properties
@@ -7,7 +7,7 @@
################################################################################
CMakeBuildConfiguration_Building=Building %s
CMakeBuildConfiguration_BuildingIn=Building in: %s\n
-CMakeBuildConfiguration_BuildingComplete=Build complete: %s\n
+CMakeBuildConfiguration_BuildingComplete=Build complete (%d errors, %d warnings): %s\n:
CMakeBuildConfiguration_Cleaning=Cleaning %s
CMakeBuildConfiguration_NotFound=CMakeFiles not found. Assuming clean.
CMakeBuildConfiguration_NoToolchainFile=No CMake toolchain file found for this target.

Back to the top