Skip to main content
summaryrefslogtreecommitdiffstats
path: root/qt
diff options
context:
space:
mode:
authorDoug Schaefer2016-08-17 14:34:02 -0400
committerGerrit Code Review @ Eclipse.org2016-08-17 15:30:45 -0400
commit4afa9e24da257ab3ebbda71e1b8c1604991901eb (patch)
tree1bad1e4e8e4c149660eb694e8e34561093333a1d /qt
parentcf0271a5edd706218978c49fa29a3473992424d7 (diff)
downloadorg.eclipse.cdt-4afa9e24da257ab3ebbda71e1b8c1604991901eb.tar.gz
org.eclipse.cdt-4afa9e24da257ab3ebbda71e1b8c1604991901eb.tar.xz
org.eclipse.cdt-4afa9e24da257ab3ebbda71e1b8c1604991901eb.zip
CMake updates. Clean, error parsers, add to category.xml.
Make CMake public with the change to category.xml. It's getting close to being usable in 9.1. Change-Id: If3e80aa5d5314cb42bbf0d253157d7ecb7d13046
Diffstat (limited to 'qt')
-rw-r--r--qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java55
1 files changed, 28 insertions, 27 deletions
diff --git a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java
index f66e451b6f..b49a689e3c 100644
--- a/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java
+++ b/qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfiguration.java
@@ -274,39 +274,40 @@ public class QtBuildConfiguration extends CBuildConfiguration implements ICBuild
return null;
}
- try (ErrorParserManager epm = new ErrorParserManager(project, getBuildDirectoryURI(), this,
- getToolChain().getErrorParserIds())) {
- Path buildDir = getBuildDirectory();
- if (!buildDir.resolve("Makefile").toFile().exists()) { //$NON-NLS-1$
- // Need to run qmake
- List<String> command = new ArrayList<>();
- command.add(getQmakeCommand().toString());
-
- String[] config = getQmakeConfig();
- if (config != null) {
- for (String str : config) {
- command.add(str);
- }
- }
-
- IFile projectFile = project.getFile(project.getName() + ".pro"); //$NON-NLS-1$
- command.add(projectFile.getLocation().toOSString());
+ Path buildDir = getBuildDirectory();
- ProcessBuilder processBuilder = new ProcessBuilder(command).directory(getBuildDirectory().toFile());
- setBuildEnvironment(processBuilder.environment());
- Process process = processBuilder.start();
+ if (!buildDir.resolve("Makefile").toFile().exists()) { //$NON-NLS-1$
+ // Need to run qmake
+ List<String> command = new ArrayList<>();
+ command.add(getQmakeCommand().toString());
- StringBuffer msg = new StringBuffer();
- for (String arg : command) {
- msg.append(arg).append(' ');
+ String[] config = getQmakeConfig();
+ if (config != null) {
+ for (String str : config) {
+ command.add(str);
}
- msg.append('\n');
- outStream.write(msg.toString());
+ }
+
+ IFile projectFile = project.getFile(project.getName() + ".pro"); //$NON-NLS-1$
+ command.add(projectFile.getLocation().toOSString());
- // TODO qmake error parser
- watchProcess(process, new IConsoleParser[0], console);
+ ProcessBuilder processBuilder = new ProcessBuilder(command).directory(getBuildDirectory().toFile());
+ setBuildEnvironment(processBuilder.environment());
+ Process process = processBuilder.start();
+
+ StringBuffer msg = new StringBuffer();
+ for (String arg : command) {
+ msg.append(arg).append(' ');
}
+ msg.append('\n');
+ outStream.write(msg.toString());
+ // TODO qmake error parser
+ watchProcess(process, new IConsoleParser[0], console);
+ }
+
+ try (ErrorParserManager epm = new ErrorParserManager(project, getBuildDirectoryURI(), this,
+ getToolChain().getErrorParserIds())) {
// run make
ProcessBuilder processBuilder = new ProcessBuilder(makeCommand.toString(), "all").directory(buildDir.toFile());
setBuildEnvironment(processBuilder.environment());

Back to the top