mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-08-04 14:55:41 +02:00
"ARTIFACT" moved to MBS
This commit is contained in:
parent
5b31b196fa
commit
0d958cf286
4 changed files with 6 additions and 8 deletions
|
@ -21,9 +21,8 @@ import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
|
||||||
import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIImages;
|
import org.eclipse.cdt.managedbuilder.ui.properties.ManagedBuilderUIImages;
|
||||||
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
|
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
|
||||||
import org.eclipse.cdt.ui.newui.UIMessages;
|
import org.eclipse.cdt.ui.newui.UIMessages;
|
||||||
import org.eclipse.cdt.ui.wizards.CDTMainWizardPage;
|
|
||||||
import org.eclipse.cdt.ui.wizards.ICWizardHandler;
|
|
||||||
import org.eclipse.cdt.ui.wizards.CDTCommonProjectWizard;
|
import org.eclipse.cdt.ui.wizards.CDTCommonProjectWizard;
|
||||||
|
import org.eclipse.cdt.ui.wizards.CDTMainWizardPage;
|
||||||
import org.eclipse.core.resources.IProject;
|
import org.eclipse.core.resources.IProject;
|
||||||
import org.eclipse.jface.resource.ImageDescriptor;
|
import org.eclipse.jface.resource.ImageDescriptor;
|
||||||
import org.eclipse.jface.viewers.CheckStateChangedEvent;
|
import org.eclipse.jface.viewers.CheckStateChangedEvent;
|
||||||
|
@ -215,7 +214,7 @@ public class CDTConfigWizardPage extends WizardPage {
|
||||||
for (int i=0; i < tcs.length; i++) {
|
for (int i=0; i < tcs.length; i++) {
|
||||||
CfgHolder[] cfgs = null;
|
CfgHolder[] cfgs = null;
|
||||||
if (id != null)
|
if (id != null)
|
||||||
cfgs = CfgHolder.cfgs2items(ManagedBuildManager.getExtensionConfigurations(tcs[i], ICWizardHandler.ARTIFACT, id));
|
cfgs = CfgHolder.cfgs2items(ManagedBuildManager.getExtensionConfigurations(tcs[i], MBSWizardHandler.ARTIFACT, id));
|
||||||
else if (pt != null)
|
else if (pt != null)
|
||||||
cfgs = CfgHolder.cfgs2items(ManagedBuildManager.getExtensionConfigurations(tcs[i], pt));
|
cfgs = CfgHolder.cfgs2items(ManagedBuildManager.getExtensionConfigurations(tcs[i], pt));
|
||||||
else { // Create default configuration for StdProject
|
else { // Create default configuration for StdProject
|
||||||
|
|
|
@ -24,7 +24,6 @@ import org.eclipse.cdt.managedbuilder.core.IToolChain;
|
||||||
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
|
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
|
||||||
import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
|
import org.eclipse.cdt.managedbuilder.ui.properties.Messages;
|
||||||
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
|
import org.eclipse.cdt.ui.newui.CDTPrefUtil;
|
||||||
import org.eclipse.cdt.ui.wizards.ICWizardHandler;
|
|
||||||
import org.eclipse.cdt.ui.wizards.EntryDescriptor;
|
import org.eclipse.cdt.ui.wizards.EntryDescriptor;
|
||||||
import org.eclipse.jface.wizard.IWizard;
|
import org.eclipse.jface.wizard.IWizard;
|
||||||
import org.eclipse.swt.graphics.Image;
|
import org.eclipse.swt.graphics.Image;
|
||||||
|
@ -40,13 +39,13 @@ public class CNewWizard extends AbstractCWizard {
|
||||||
*/
|
*/
|
||||||
public EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard) {
|
public EntryDescriptor[] createItems(boolean supportedOnly, IWizard wizard) {
|
||||||
IBuildPropertyManager bpm = ManagedBuildManager.getBuildPropertyManager();
|
IBuildPropertyManager bpm = ManagedBuildManager.getBuildPropertyManager();
|
||||||
IBuildPropertyType bpt = bpm.getPropertyType(ICWizardHandler.ARTIFACT);
|
IBuildPropertyType bpt = bpm.getPropertyType(MBSWizardHandler.ARTIFACT);
|
||||||
IBuildPropertyValue[] vs = bpt.getSupportedValues();
|
IBuildPropertyValue[] vs = bpt.getSupportedValues();
|
||||||
|
|
||||||
ArrayList items = new ArrayList();
|
ArrayList items = new ArrayList();
|
||||||
// new style project types
|
// new style project types
|
||||||
for (int i=0; i<vs.length; i++) {
|
for (int i=0; i<vs.length; i++) {
|
||||||
IToolChain[] tcs = ManagedBuildManager.getExtensionsToolChains(ICWizardHandler.ARTIFACT, vs[i].getId());
|
IToolChain[] tcs = ManagedBuildManager.getExtensionsToolChains(MBSWizardHandler.ARTIFACT, vs[i].getId());
|
||||||
if (tcs == null || tcs.length == 0) continue;
|
if (tcs == null || tcs.length == 0) continue;
|
||||||
MBSWizardHandler h = new MBSWizardHandler(vs[i], parent, wizard);
|
MBSWizardHandler h = new MBSWizardHandler(vs[i], parent, wizard);
|
||||||
for (int j=0; j<tcs.length; j++) {
|
for (int j=0; j<tcs.length; j++) {
|
||||||
|
|
|
@ -61,6 +61,8 @@ import org.eclipse.swt.widgets.TableItem;
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class MBSWizardHandler extends CWizardHandler implements ICBuildWizardHandler {
|
public class MBSWizardHandler extends CWizardHandler implements ICBuildWizardHandler {
|
||||||
|
public static final String ARTIFACT = "org.eclipse.cdt.build.core.buildArtefactType"; //$NON-NLS-1$
|
||||||
|
|
||||||
private static final String PROPERTY = "org.eclipse.cdt.build.core.buildType"; //$NON-NLS-1$
|
private static final String PROPERTY = "org.eclipse.cdt.build.core.buildType"; //$NON-NLS-1$
|
||||||
private static final String PROP_VAL = PROPERTY + ".debug"; //$NON-NLS-1$
|
private static final String PROP_VAL = PROPERTY + ".debug"; //$NON-NLS-1$
|
||||||
private static final String tooltip =
|
private static final String tooltip =
|
||||||
|
|
|
@ -17,8 +17,6 @@ import org.eclipse.core.runtime.CoreException;
|
||||||
import org.eclipse.jface.wizard.IWizardPage;
|
import org.eclipse.jface.wizard.IWizardPage;
|
||||||
|
|
||||||
public interface ICWizardHandler extends Cloneable {
|
public interface ICWizardHandler extends Cloneable {
|
||||||
static final String ARTIFACT = "org.eclipse.cdt.build.core.buildArtefactType"; //$NON-NLS-1$
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called when user selects corresponding item in wizard tree
|
* Called when user selects corresponding item in wizard tree
|
||||||
*
|
*
|
||||||
|
|
Loading…
Add table
Reference in a new issue