mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-30 21:55:31 +02:00
Fix for [Bug 192423] Project conversion should NOT occur in case the tool-chain definition is not installed
This commit is contained in:
parent
b71d4ab820
commit
d8ba0d98a9
2 changed files with 14 additions and 9 deletions
|
@ -29,7 +29,6 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
|
|||
import org.eclipse.cdt.core.settings.model.ICExternalSetting;
|
||||
import org.eclipse.cdt.core.settings.model.ICProjectDescription;
|
||||
import org.eclipse.cdt.core.settings.model.ICStorageElement;
|
||||
import org.eclipse.cdt.core.settings.model.WriteAccessException;
|
||||
import org.eclipse.cdt.core.settings.model.extension.CConfigurationData;
|
||||
import org.eclipse.cdt.core.settings.model.extension.ICProjectConverter;
|
||||
import org.eclipse.cdt.core.settings.model.util.PathEntryTranslator;
|
||||
|
@ -502,7 +501,7 @@ public class ProjectConverter implements ICProjectConverter {
|
|||
convertOldStdMakeToNewStyle(project, false, monitor, true);
|
||||
}
|
||||
|
||||
private IManagedBuildInfo convertManagedBuildInfo(IProject project, ICProjectDescription newDes){
|
||||
private IManagedBuildInfo convertManagedBuildInfo(IProject project, ICProjectDescription newDes) throws CoreException {
|
||||
IManagedBuildInfo info = ManagedBuildManager.getBuildInfoLegacy(project);
|
||||
|
||||
synchronized(LOCK){
|
||||
|
@ -516,21 +515,23 @@ public class ProjectConverter implements ICProjectConverter {
|
|||
for(int i = 0; i < cfgs.length; i++){
|
||||
cfg = (Configuration)cfgs[i];
|
||||
data = cfg.getConfigurationData();
|
||||
try {
|
||||
// try {
|
||||
ICConfigurationDescription cfgDes = newDes.createConfiguration(ManagedBuildManager.CFG_DATA_PROVIDER_ID, data);
|
||||
if(cfg.getConfigurationDescription() != null) {
|
||||
//copy cfg to avoid raise conditions
|
||||
cfg = ConfigurationDataProvider.copyCfg(cfg, cfgDes);
|
||||
}
|
||||
cfg.setConfigurationDescription(cfgDes);
|
||||
} catch (WriteAccessException e) {
|
||||
ManagedBuilderCorePlugin.log(e);
|
||||
} catch (CoreException e) {
|
||||
ManagedBuilderCorePlugin.log(e);
|
||||
}
|
||||
// } catch (WriteAccessException e) {
|
||||
// ManagedBuilderCorePlugin.log(e);
|
||||
// } catch (CoreException e) {
|
||||
// ManagedBuilderCorePlugin.log(e);
|
||||
// }
|
||||
cfg.exportArtifactInfo();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
throw new CoreException(new Status(IStatus.ERROR, ManagedBuilderCorePlugin.getUniqueIdentifier(), "failed to load the build info for the old-style project"));
|
||||
}
|
||||
}
|
||||
return info;
|
||||
|
|
|
@ -288,7 +288,11 @@ implements IExecutableExtension, IWizardWithMemory
|
|||
public IPath getLastProjectLocation() {
|
||||
return lastProjectLocation;
|
||||
}
|
||||
|
||||
|
||||
public IProject getLastProject() {
|
||||
return newProject;
|
||||
}
|
||||
|
||||
// Methods below should provide data for language check
|
||||
public String[] getLanguageIDs (){
|
||||
return EMPTY_ARR;
|
||||
|
|
Loading…
Add table
Reference in a new issue