diff options
3 files changed, 6 insertions, 6 deletions
diff --git a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/wizards/AutotoolsProjectImportWizard.java b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/wizards/AutotoolsProjectImportWizard.java index 69b7c15ebb5..ab02f917558 100644 --- a/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/wizards/AutotoolsProjectImportWizard.java +++ b/build/org.eclipse.cdt.autotools.ui/src/org/eclipse/cdt/internal/autotools/ui/wizards/AutotoolsProjectImportWizard.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015 Mentor Graphics Corporation. + * Copyright (c) 2015, 2020 Mentor Graphics Corporation. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -130,7 +130,7 @@ public class AutotoolsProjectImportWizard extends NewMakeProjFromExisting { CfgHolder cfgHolder = new CfgHolder(toolChain, null); String s = toolChain == null ? "0" : ((ToolChain) toolChain).getId(); //$NON-NLS-1$ - Configuration config = new Configuration(mProj, (ToolChain) toolChain, + Configuration config = new Configuration(mProj, toolChain, ManagedBuildManager.calculateChildId(s, null), cfgHolder.getName()); IBuilder builder = config.getEditableBuilder(); builder.setManagedBuildOn(false); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java index ef201eb64cf..532a8259083 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/NewMakeProjFromExisting.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2018 Wind River Systems and others. + * Copyright (c) 2010, 2020 Wind River Systems and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -109,7 +109,7 @@ public class NewMakeProjFromExisting extends Wizard implements IImportWizard, IN CfgHolder cfgHolder = new CfgHolder(toolChain, null); String s = toolChain == null ? "0" : ((ToolChain) toolChain).getId(); //$NON-NLS-1$ - Configuration config = new Configuration(mProj, (ToolChain) toolChain, + Configuration config = new Configuration(mProj, toolChain, ManagedBuildManager.calculateChildId(s, null), cfgHolder.getName()); IBuilder builder = config.getEditableBuilder(); builder.setManagedBuildOn(false); diff --git a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java index 006b1ea217b..2b065fefe25 100644 --- a/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java +++ b/build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/ui/wizards/STDWizardHandler.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2018 Intel Corporation and others. + * Copyright (c) 2007, 2020 Intel Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -88,7 +88,7 @@ public class STDWizardHandler extends MBSWizardHandler { int work = 50 / cfgs.length; for (int i = 0; i < cfgs.length; i++) { String s = (cfgs[i].getToolChain() == null) ? "0" : ((ToolChain) (cfgs[i].getToolChain())).getId(); //$NON-NLS-1$ - Configuration cfg = new Configuration(mProj, (ToolChain) cfgs[i].getToolChain(), + Configuration cfg = new Configuration(mProj, cfgs[i].getToolChain(), ManagedBuildManager.calculateChildId(s, null), cfgs[i].getName()); cfgs[i].setConfiguration(cfg); IBuilder bld = cfg.getEditableBuilder(); |