# HG changeset patch # User timkelly # Date 1244148408 18000 # Node ID 7fe2a8c8e309b57c60c728162983f7f495bf84d3 # Parent 2e1a235ea76d6fac99444d4b61cc2f6d39ef0a3f fix bug 9221. When calculating the project root, don't use sourcepaths that don't exist diff -r 2e1a235ea76d -r 7fe2a8c8e309 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Thu Jun 04 13:57:20 2009 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Thu Jun 04 15:46:48 2009 -0500 @@ -16,18 +16,9 @@ */ package com.nokia.carbide.cdt.builder; -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.io.*; +import java.sql.Time; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -441,7 +432,7 @@ IPath root = null; IPath desiredRoot = null; IPath requiredRoot = null; - + if (requiredPaths.size() > 0) { // requiredPaths contains a list of required paths // (for MMPs). Take the shortest common source path of all. @@ -458,7 +449,11 @@ CommonPathFinder finder = new CommonPathFinder(); finder.addDirectory(root); for (IPath path : desiredPaths) { - finder.addDirectory(path); + // boog 9221, bad root can be chosen for non-existent sourcepaths in MMPs + // so ingore those + if (path.toFile().exists()){ + finder.addDirectory(path); + } } desiredRoot = finder.getCommonPath(); root = finder.getCommonPath(); @@ -469,7 +464,11 @@ CommonPathFinder finder = new CommonPathFinder(); finder.addDirectory(root); for (IPath path : optionalPaths) { - finder.addDirectory(path); + // boog 9221, bad root can be chosen for non-existent sourcepaths in MMPs + // so ingore those + if (path.toFile().exists()){ + finder.addDirectory(path); + } } root = finder.getCommonPath(); }