mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Qt - better handling when a Qt install hasn't been added.

Browse source 
Used to NPE, now prints a message on the build console at build time.

Change-Id: Ia38161dcc393506e44d4c4fa7e12a25f55e44bd0
This commit is contained in:
Doug Schaefer 2016-01-27 15:39:58 -05:00
parent 095dd5160e
commit e7ef5fb9ac
5 changed files with 40 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/Messages.java Normal file
View file

@ -0,0 +1,15 @@
package org.eclipse.cdt.internal.qt.core;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
private static final String BUNDLE_NAME = "org.eclipse.cdt.internal.qt.core.messages"; //$NON-NLS-1$
public static String QtBuilder_0;
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
}
private Messages() {
}
}

10
qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuildConfigurationFactory.java
View file

@ -107,10 +107,12 @@ public class QtBuildConfigurationFactory implements IAdapterFactory {
// return it if it exists already
for (IBuildConfiguration config : project.getBuildConfigs()) {
QtBuildConfiguration qtConfig = config.getAdapter(QtBuildConfiguration.class);
IQtInstall qtInstall = qtConfig.getQtInstall();
if (qtInstall != null && qtInstallManager.supports(qtInstall, target)
&& launchMode.equals(qtConfig.getLaunchMode())) {
return qtConfig;
if (qtConfig != null) {
IQtInstall qtInstall = qtConfig.getQtInstall();
if (qtInstall != null && qtInstallManager.supports(qtInstall, target)
&& launchMode.equals(qtConfig.getLaunchMode())) {
return qtConfig;
}
}
}

18
qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/build/QtBuilder.java
View file

@ -16,6 +16,7 @@ import java.util.Map;
import org.eclipse.cdt.build.core.IConsoleService;
import org.eclipse.cdt.build.core.IToolChain;
import org.eclipse.cdt.internal.qt.core.Activator;
import org.eclipse.cdt.internal.qt.core.Messages;
import org.eclipse.cdt.qt.core.QtBuildConfiguration;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
@ -37,6 +38,11 @@ public class QtBuilder extends IncrementalProjectBuilder {
try {
IConsoleService console = Activator.getService(IConsoleService.class);
QtBuildConfiguration qtConfig = getBuildConfig().getAdapter(QtBuildConfiguration.class);
if (qtConfig == null) {
// Qt hasn't been configured yet print a message and bale
console.writeError(Messages.QtBuilder_0);
return null;
}
IToolChain toolChain = qtConfig.getToolChain();
Path buildDir = qtConfig.getBuildDirectory();
@ -50,7 +56,7 @@ public class QtBuilder extends IncrementalProjectBuilder {
command.add(config);
}
IFile projectFile = qtConfig.getProject().getFile("main.pro");
IFile projectFile = qtConfig.getProject().getFile("main.pro"); //$NON-NLS-1$
command.add(projectFile.getLocation().toOSString());
ProcessBuilder processBuilder = new ProcessBuilder(command).directory(buildDir.toFile());
@ -68,14 +74,14 @@ public class QtBuilder extends IncrementalProjectBuilder {
// run make
// TODO obviously hardcoding here
boolean isWin = Platform.getOS().equals(Platform.OS_WIN32);
String make = isWin ? "C:/Qt/Tools/mingw492_32/bin/mingw32-make" : "make";
String make = isWin ? "C:/Qt/Tools/mingw492_32/bin/mingw32-make" : "make"; //$NON-NLS-1$ //$NON-NLS-2$
ProcessBuilder procBuilder = new ProcessBuilder(make).directory(buildDir.toFile());
if (isWin) {
// Need to put the toolchain into env
Map<String, String> env = procBuilder.environment();
String path = env.get("PATH");
path = "C:/Qt/Tools/mingw492_32/bin;" + path;
env.put("PATH", path);
String path = env.get("PATH"); //$NON-NLS-1$
path = "C:/Qt/Tools/mingw492_32/bin;" + path; //$NON-NLS-1$
env.put("PATH", path); //$NON-NLS-1$
}
toolChain.setEnvironment(procBuilder.environment());
Process process = procBuilder.start();
@ -85,7 +91,7 @@ public class QtBuilder extends IncrementalProjectBuilder {
project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
return new IProject[] { project };
} catch (IOException e) {
throw new CoreException(new Status(IStatus.ERROR, Activator.ID, "Building " + project.getName(), e));
throw new CoreException(new Status(IStatus.ERROR, Activator.ID, "Building " + project.getName(), e)); //$NON-NLS-1$
}
}

1
qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/internal/qt/core/messages.properties Normal file
View file

@ -0,0 +1 @@
QtBuilder_0=Error: Qt has not been configured.\nPlease add a Qt install in the Qt preferences page.\n

10
qt/org.eclipse.cdt.qt.core/src/org/eclipse/cdt/qt/core/QtLaunchConfigurationDelegate.java
View file

@ -24,10 +24,12 @@ public abstract class QtLaunchConfigurationDelegate extends LaunchConfigurationT
QtBuildConfiguration qtBuildConfig = getQtBuildConfiguration(configuration, mode, target, monitor);
// Set it as active
IProject project = qtBuildConfig.getProject();
IProjectDescription desc = project.getDescription();
desc.setActiveBuildConfig(qtBuildConfig.getBuildConfiguration().getName());
project.setDescription(desc, monitor);
if (qtBuildConfig != null) {
IProject project = qtBuildConfig.getProject();
IProjectDescription desc = project.getDescription();
desc.setActiveBuildConfig(qtBuildConfig.getBuildConfiguration().getName());
project.setDescription(desc, monitor);
}
// And build
return superBuildForLaunch(configuration, mode, monitor);