mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-31 12:55:40 +02:00
Removed the "All configurations' label from the configuration selector since C8 did not make the M8 build
This commit is contained in:
parent
13b3c99749
commit
266e19853c
1 changed files with 2 additions and 4 deletions
|
@ -429,10 +429,11 @@ public class BuildPropertyPage extends PropertyPage implements IWorkbenchPropert
|
||||||
* @return an array of names for the configurations defined for the chosen target
|
* @return an array of names for the configurations defined for the chosen target
|
||||||
*/
|
*/
|
||||||
private String [] getConfigurationNames () {
|
private String [] getConfigurationNames () {
|
||||||
String [] names = new String[configurations.length];
|
String [] names = new String[configurations.length /*+ 1*/];
|
||||||
for (int index = 0; index < configurations.length; ++index) {
|
for (int index = 0; index < configurations.length; ++index) {
|
||||||
names[index] = configurations[index].getName();
|
names[index] = configurations[index].getName();
|
||||||
}
|
}
|
||||||
|
// names[names.length - 1] = ManagedBuilderUIPlugin.getResourceString(ALL_CONFS);
|
||||||
return names;
|
return names;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -610,7 +611,6 @@ public class BuildPropertyPage extends PropertyPage implements IWorkbenchPropert
|
||||||
configurations = selectedTarget.getConfigurations();
|
configurations = selectedTarget.getConfigurations();
|
||||||
configSelector.removeAll();
|
configSelector.removeAll();
|
||||||
configSelector.setItems(getConfigurationNames());
|
configSelector.setItems(getConfigurationNames());
|
||||||
configSelector.add(ManagedBuilderUIPlugin.getResourceString(ALL_CONFS));
|
|
||||||
configSelector.select(0);
|
configSelector.select(0);
|
||||||
updateConfigs = true;
|
updateConfigs = true;
|
||||||
}
|
}
|
||||||
|
@ -647,7 +647,6 @@ public class BuildPropertyPage extends PropertyPage implements IWorkbenchPropert
|
||||||
configurations = selectedTarget.getConfigurations();
|
configurations = selectedTarget.getConfigurations();
|
||||||
configSelector.removeAll();
|
configSelector.removeAll();
|
||||||
configSelector.setItems(getConfigurationNames());
|
configSelector.setItems(getConfigurationNames());
|
||||||
configSelector.add(ManagedBuilderUIPlugin.getResourceString(ALL_CONFS));
|
|
||||||
configSelector.select(configSelector.indexOf(name));
|
configSelector.select(configSelector.indexOf(name));
|
||||||
updateConfigs = true;
|
updateConfigs = true;
|
||||||
}
|
}
|
||||||
|
@ -875,7 +874,6 @@ public class BuildPropertyPage extends PropertyPage implements IWorkbenchPropert
|
||||||
// Clear and replace the contents of the selector widget
|
// Clear and replace the contents of the selector widget
|
||||||
configSelector.removeAll();
|
configSelector.removeAll();
|
||||||
configSelector.setItems(getConfigurationNames());
|
configSelector.setItems(getConfigurationNames());
|
||||||
configSelector.add(ManagedBuilderUIPlugin.getResourceString(ALL_CONFS));
|
|
||||||
|
|
||||||
// Make sure the active configuration is selected
|
// Make sure the active configuration is selected
|
||||||
IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(getProject());
|
IManagedBuildInfo info = ManagedBuildManager.getBuildInfo(getProject());
|
||||||
|
|
Loading…
Add table
Reference in a new issue