diff options
| author | Doug Schaefer | 2017-11-27 23:04:40 +0000 |
|---|---|---|
| committer | Doug Schaefer | 2017-11-27 23:04:40 +0000 |
| commit | 6db1357b1abf4944e40d8aa6ddd1520c2e224ce8 (patch) | |
| tree | 0fcfb52fac567e624da2713b5ebca0ab567ed8d3 /build/org.eclipse.cdt.make.ui | |
| parent | 0ed7b10dea94cf37c6da0593ccfb94002b5385e8 (diff) | |
| download | org.eclipse.cdt-6db1357b1abf4944e40d8aa6ddd1520c2e224ce8.tar.gz org.eclipse.cdt-6db1357b1abf4944e40d8aa6ddd1520c2e224ce8.tar.xz org.eclipse.cdt-6db1357b1abf4944e40d8aa6ddd1520c2e224ce8.zip | |
Stop launch on error. Fix up set/get make commands.
We were missing the dialog to ask if you wanted to continue
after build errors in a project. We were missing the method
that provided the list of projects to do that check.
Also while testing that noticed the handling of the build
and clean command UI was broken with make projects.
Change-Id: I698e151672a114bb22c815f49d362b6413b9c315
Diffstat (limited to 'build/org.eclipse.cdt.make.ui')
3 files changed, 39 insertions, 7 deletions
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java index 9a66e66d4b7..8caf73f4d01 100644 --- a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/MakeBuildSettingsTab.java @@ -54,31 +54,31 @@ public class MakeBuildSettingsTab extends CommonBuildTab { // Build Output Group
Group outputGroup = new Group(comp, SWT.NONE);
- outputGroup.setText("Build Output Location");
+ outputGroup.setText(Messages.MakeBuildSettingsTab_BuildOutputLocation);
outputGroup.setLayout(new GridLayout());
outputGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
projectButton = new Button(outputGroup, SWT.RADIO);
- projectButton.setText("Build in project directory");
+ projectButton.setText(Messages.MakeBuildSettingsTab_BuildInProjectDir);
projectButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
configButton = new Button(outputGroup, SWT.RADIO);
- configButton.setText("Build in configuration specific folder");
+ configButton.setText(Messages.MakeBuildSettingsTab_BuildInConfigDir);
configButton.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
Group cmdGroup = new Group(comp, SWT.NONE);
- cmdGroup.setText("Build Commands");
+ cmdGroup.setText(Messages.MakeBuildSettingsTab_BuildCommands);
cmdGroup.setLayout(new GridLayout(2, false));
cmdGroup.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
Label label = new Label(cmdGroup, SWT.NONE);
- label.setText("Build:");
+ label.setText(Messages.MakeBuildSettingsTab_Build);
buildCmdText = new Text(cmdGroup, SWT.BORDER);
buildCmdText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
label = new Label(cmdGroup, SWT.NONE);
- label.setText("Clean:");
+ label.setText(Messages.MakeBuildSettingsTab_Clean);
cleanCmdText = new Text(cmdGroup, SWT.BORDER);
cleanCmdText.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
@@ -86,7 +86,7 @@ public class MakeBuildSettingsTab extends CommonBuildTab { @Override
public String getName() {
- return "Makefile";
+ return Messages.MakeBuildSettingsTab_Makefile;
}
@Override
@@ -195,11 +195,15 @@ public class MakeBuildSettingsTab extends CommonBuildTab { String buildCommand = buildCmdText.getText().trim();
if (!buildCommand.isEmpty()) {
stdConfig.setBuildCommand(buildCommand.split(" ")); //$NON-NLS-1$
+ } else {
+ stdConfig.setBuildCommand(null);
}
String cleanCommand = cleanCmdText.getText().trim();
if (!cleanCommand.isEmpty()) {
stdConfig.setCleanCommand(cleanCommand.split(" ")); //$NON-NLS-1$
+ } else {
+ stdConfig.setCleanCommand(null);
}
}
} catch (CoreException e) {
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/Messages.java b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/Messages.java new file mode 100644 index 00000000000..cfc24769b6e --- /dev/null +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/Messages.java @@ -0,0 +1,21 @@ +package org.eclipse.cdt.make.internal.ui;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = "org.eclipse.cdt.make.internal.ui.messages"; //$NON-NLS-1$
+ public static String MakeBuildSettingsTab_Build;
+ public static String MakeBuildSettingsTab_BuildCommands;
+ public static String MakeBuildSettingsTab_BuildInConfigDir;
+ public static String MakeBuildSettingsTab_BuildInProjectDir;
+ public static String MakeBuildSettingsTab_BuildOutputLocation;
+ public static String MakeBuildSettingsTab_Clean;
+ public static String MakeBuildSettingsTab_Makefile;
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ }
+}
diff --git a/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/messages.properties b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/messages.properties new file mode 100644 index 00000000000..0b143a70f3d --- /dev/null +++ b/build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/internal/ui/messages.properties @@ -0,0 +1,7 @@ +MakeBuildSettingsTab_Build=Build:
+MakeBuildSettingsTab_BuildCommands=Build Commands
+MakeBuildSettingsTab_BuildInConfigDir=Build in configuration specific directory
+MakeBuildSettingsTab_BuildInProjectDir=Build in project directory
+MakeBuildSettingsTab_BuildOutputLocation=Build Output Location
+MakeBuildSettingsTab_Clean=Clean:
+MakeBuildSettingsTab_Makefile=Makefile
|