mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-09-02 13:13:36 +02:00
Code Issues Wiki Activity

Fix problem with converter code

Browse source
This commit is contained in:
Leo Treggiari 2005-07-22 22:52:07 +00:00
parent fb62ab1e5c
commit 0cbe23f5fe
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
View file

@ -2622,16 +2622,14 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
private static boolean checkForMigrationSupport(ManagedBuildInfo buildInfo, private static boolean checkForMigrationSupport(ManagedBuildInfo buildInfo,
boolean forCurrentMbsVersion) { boolean forCurrentMbsVersion) {
IProjectType projectType = null;
IConfigurationElement element = null; IConfigurationElement element = null;
// Get the projectType from buildInfo // Get the managed project from buildInfo
IManagedProject managedProject = buildInfo.getManagedProject(); IManagedProject managedProject = buildInfo.getManagedProject();
projectType = managedProject.getProjectType();
// walk through the hierarchy of the projectType and // walk through the hierarchy of the project and
// call the converters if available for each configuration // call the converters if available for each configuration
IConfiguration[] configs = projectType.getConfigurations(); IConfiguration[] configs = managedProject.getConfigurations();
for (int i = 0; i < configs.length; i++) { for (int i = 0; i < configs.length; i++) {
IConfiguration configuration = configs[i]; IConfiguration configuration = configs[i];
IToolChain toolChain = configuration.getToolChain(); IToolChain toolChain = configuration.getToolChain();
@ -2667,16 +2665,18 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
} }
} }
IBuilder builder = toolChain.getBuilder(); IBuilder builder = toolChain.getBuilder();
if (forCurrentMbsVersion) { if (builder != null) {
element = ((Builder)builder).getCurrentMbsVersionConversionElement(); if (forCurrentMbsVersion) {
} else { element = ((Builder)builder).getCurrentMbsVersionConversionElement();
element = ((Builder)builder).getPreviousMbsVersionConversionElement(); } else {
} element = ((Builder)builder).getPreviousMbsVersionConversionElement();
}
if (element != null) { if (element != null) {
if ( invokeConverter(builder, buildInfo, element) != true ) { if ( invokeConverter(builder, buildInfo, element) != true ) {
buildInfo.getManagedProject().setValid(false); buildInfo.getManagedProject().setValid(false);
return false; return false;
}
} }
} }
} }