Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorLeo Treggiari2005-07-22 22:52:07 +0000
committerLeo Treggiari2005-07-22 22:52:07 +0000
commit0cbe23f5fe4381b32f451fdc66bbabee1f22123a (patch)
tree76b8a96270f7d2e58a9962a066d01e9e628815ac /build
parentfb62ab1e5c37e4eda1aabeccef867cd0373fc5b7 (diff)
downloadorg.eclipse.cdt-0cbe23f5fe4381b32f451fdc66bbabee1f22123a.tar.gz
org.eclipse.cdt-0cbe23f5fe4381b32f451fdc66bbabee1f22123a.tar.xz
org.eclipse.cdt-0cbe23f5fe4381b32f451fdc66bbabee1f22123a.zip
Fix problem with converter code
Diffstat (limited to 'build')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java30
1 files changed, 15 insertions, 15 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
index 9d71cc0a9e0..c60a55284ad 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
+++ b/build/org.eclipse.cdt.managedbuilder.core/src/org/eclipse/cdt/managedbuilder/core/ManagedBuildManager.java
@@ -2622,16 +2622,14 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
private static boolean checkForMigrationSupport(ManagedBuildInfo buildInfo,
boolean forCurrentMbsVersion) {
- IProjectType projectType = null;
IConfigurationElement element = null;
- // Get the projectType from buildInfo
+ // Get the managed project from buildInfo
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
- IConfiguration[] configs = projectType.getConfigurations();
+ IConfiguration[] configs = managedProject.getConfigurations();
for (int i = 0; i < configs.length; i++) {
IConfiguration configuration = configs[i];
IToolChain toolChain = configuration.getToolChain();
@@ -2667,16 +2665,18 @@ public class ManagedBuildManager extends AbstractCExtension implements IScannerI
}
}
IBuilder builder = toolChain.getBuilder();
- if (forCurrentMbsVersion) {
- element = ((Builder)builder).getCurrentMbsVersionConversionElement();
- } else {
- element = ((Builder)builder).getPreviousMbsVersionConversionElement();
- }
-
- if (element != null) {
- if ( invokeConverter(builder, buildInfo, element) != true ) {
- buildInfo.getManagedProject().setValid(false);
- return false;
+ if (builder != null) {
+ if (forCurrentMbsVersion) {
+ element = ((Builder)builder).getCurrentMbsVersionConversionElement();
+ } else {
+ element = ((Builder)builder).getPreviousMbsVersionConversionElement();
+ }
+
+ if (element != null) {
+ if ( invokeConverter(builder, buildInfo, element) != true ) {
+ buildInfo.getManagedProject().setValid(false);
+ return false;
+ }
}
}
}

Back to the top