Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Krasilnikov2007-02-26 12:22:22 +0000
committerOleg Krasilnikov2007-02-26 12:22:22 +0000
commitdc3905bfb1d51b615364fb0fd6831377d8956604 (patch)
tree9d35305bf2dbc12ae54cdef2251cec8dbe8f78bc
parentf55428ec7677034759fb11ce65c54d7e72aa3ed2 (diff)
downloadorg.eclipse.cdt-dc3905bfb1d51b615364fb0fd6831377d8956604.tar.gz
org.eclipse.cdt-dc3905bfb1d51b615364fb0fd6831377d8956604.tar.xz
org.eclipse.cdt-dc3905bfb1d51b615364fb0fd6831377d8956604.zip
Bug #112787 ManagedCommandLineGenerator not called to show Tool Settings.
Applied patch.
-rw-r--r--build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java16
1 files changed, 12 insertions, 4 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java
index ddc070387d3..5b6efbf699c 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java
+++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/newui/ToolSettingsPrefStore.java
@@ -17,6 +17,8 @@ import org.eclipse.cdt.core.settings.model.ICSettingBase;
import org.eclipse.cdt.managedbuilder.core.BuildException;
import org.eclipse.cdt.managedbuilder.core.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.IHoldsOptions;
+import org.eclipse.cdt.managedbuilder.core.IManagedCommandLineGenerator;
+import org.eclipse.cdt.managedbuilder.core.IManagedCommandLineInfo;
import org.eclipse.cdt.managedbuilder.core.IOption;
import org.eclipse.cdt.managedbuilder.core.IOptionCategory;
import org.eclipse.cdt.managedbuilder.core.IResourceInfo;
@@ -27,9 +29,9 @@ import org.eclipse.cdt.managedbuilder.internal.macros.BuildMacroProvider;
import org.eclipse.cdt.managedbuilder.internal.macros.BuildfileMacroSubstitutor;
import org.eclipse.cdt.utils.cdtvariables.SupplierBasedCdtVariableSubstitutor;
import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.core.runtime.ListenerList;
import org.eclipse.jface.util.PropertyChangeEvent;
public class ToolSettingsPrefStore implements IPreferenceStore {
@@ -146,11 +148,17 @@ public class ToolSettingsPrefStore implements IPreferenceStore {
else if(ALL_OPTIONS_ID.equals(name)){
try {
SupplierBasedCdtVariableSubstitutor macroSubstitutor = new BuildfileMacroSubstitutor(null, EMPTY_STRING, " "); //$NON-NLS-1$
- return listToString(((Tool)optCategory).getToolCommandFlags(
+ Tool tool = (Tool)optCategory;
+ String[] flags = tool.getToolCommandFlags(
null,
null,
- macroSubstitutor,
- obtainMacroProvider()));
+ macroSubstitutor,
+ obtainMacroProvider());
+ IManagedCommandLineGenerator cmdLGen = tool.getCommandLineGenerator();
+ IManagedCommandLineInfo cmdLInfo = cmdLGen.generateCommandLineInfo(tool,
+ EMPTY_STRING, flags, EMPTY_STRING, EMPTY_STRING, EMPTY_STRING,
+ null,tool.getCommandLinePattern());
+ return cmdLInfo.getFlags();
} catch (BuildException e) {}
}
} else {

Back to the top