Revert "Bug 568397: Hide "Build settings" if using custom command"
This reverts commit 1d226f92731b30e3894ccdf884341e58d9990508.
Reason for revert: Due to some concerns about use cases and the
desire to resolve those concerns with separate build and args
text boxes this is being reverted for 10.1 until this change
can be done at the same time as https://git.eclipse.org/r/c/cdt/org.eclipse.cdt/+/173118
Change-Id: Iffa37087c00f434d4e684eea19ecacde36004b80
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
index fb218cd..c175826 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/internal/core/Builder.java
@@ -1085,20 +1085,18 @@
@Override
public String getArguments() {
String args = getArgumentsAttribute();
- if (isDefaultBuildCmd()) {
- String stopOnErrCmd = getStopOnErrCmd(isStopOnError());
- int parallelNum = getParallelizationNum();
- String parallelCmd = isParallelBuildOn() ? getParallelizationCmd(parallelNum) : EMPTY_STRING;
+ String stopOnErrCmd = getStopOnErrCmd(isStopOnError());
+ int parallelNum = getParallelizationNum();
+ String parallelCmd = isParallelBuildOn() ? getParallelizationCmd(parallelNum) : EMPTY_STRING;
- String reversedStopOnErrCmd = getStopOnErrCmd(!isStopOnError());
- String reversedParallelBuildCmd = !isParallelBuildOn() ? getParallelizationCmd(parallelNum) : EMPTY_STRING;
+ String reversedStopOnErrCmd = getStopOnErrCmd(!isStopOnError());
+ String reversedParallelBuildCmd = !isParallelBuildOn() ? getParallelizationCmd(parallelNum) : EMPTY_STRING;
- args = removeCmd(args, reversedStopOnErrCmd);
- args = removeCmd(args, reversedParallelBuildCmd);
+ args = removeCmd(args, reversedStopOnErrCmd);
+ args = removeCmd(args, reversedParallelBuildCmd);
- args = addCmd(args, stopOnErrCmd);
- args = addCmd(args, parallelCmd);
- }
+ args = addCmd(args, stopOnErrCmd);
+ args = addCmd(args, parallelCmd);
return args != null ? args.trim() : null;
}
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
index 77c487c..af690ef 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/properties/BuildBehaviourTab.java
@@ -69,8 +69,6 @@
private Button b_parallelUnlimited;
private Spinner s_parallelNumber;
- private Group grp_buildSettings;
-
private Label title2;
private Button b_autoBuild; //3
private Text t_autoBuild;
@@ -91,13 +89,13 @@
usercomp.setLayout(new GridLayout(1, false));
// Build setting group
- grp_buildSettings = setupGroup(usercomp, Messages.BuilderSettingsTab_9, 2, GridData.FILL_HORIZONTAL);
+ Group g3 = setupGroup(usercomp, Messages.BuilderSettingsTab_9, 2, GridData.FILL_HORIZONTAL);
GridLayout gl = new GridLayout(2, true);
gl.verticalSpacing = 0;
gl.marginWidth = 0;
- grp_buildSettings.setLayout(gl);
+ g3.setLayout(gl);
- Composite c1 = new Composite(grp_buildSettings, SWT.NONE);
+ Composite c1 = new Composite(g3, SWT.NONE);
setupControl(c1, 1, GridData.FILL_BOTH);
GridData gd = (GridData) c1.getLayoutData();
gd.verticalSpan = 2;
@@ -111,7 +109,7 @@
b_stopOnError = setupCheck(c1, Messages.BuilderSettingsTab_10, 1, GridData.BEGINNING);
- Composite c2 = new Composite(grp_buildSettings, SWT.NONE);
+ Composite c2 = new Composite(g3, SWT.NONE);
setupControl(c2, 1, GridData.FILL_BOTH);
gl = new GridLayout(1, false);
gl.verticalSpacing = 0;
@@ -121,7 +119,7 @@
b_parallel = setupCheck(c2, Messages.BuilderSettingsTab_EnableParallelBuild, 1, GridData.BEGINNING);
- Composite c3 = new Composite(grp_buildSettings, SWT.NONE);
+ Composite c3 = new Composite(g3, SWT.NONE);
setupControl(c3, 1, GridData.FILL_BOTH);
gl = new GridLayout(2, false);
gl.verticalSpacing = 0;
@@ -339,11 +337,6 @@
t_cmdClean.setText(bldr.getBuildAttribute(IBuilder.BUILD_TARGET_CLEAN, EMPTY_STR));
}
- boolean defaultBuildCommand = bldr.isDefaultBuildCmd();
- grp_buildSettings.setVisible(defaultBuildCommand);
- ((GridData) grp_buildSettings.getLayoutData()).exclude = !defaultBuildCommand;
- grp_buildSettings.getParent().layout();
-
boolean external = !isInternalBuilderEnabled();
title2.setVisible(external);
t_autoBuild.setVisible(external);
