# HG changeset patch
# User wpaul
# Date 1244486859 18000
# Node ID ee14f3fff9eff226a0413dc83e6db59134f99013
# Parent  0e84cf0560e1fe753c6f9fa7739b940b798698f6# Parent  2a6ed62483645693d516a9164a65b8dbdd6510eb
merged

diff -r 0e84cf0560e1 -r ee14f3fff9ef 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	Mon Jun 08 13:46:12 2009 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java	Mon Jun 08 13:47:39 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();
 		}
diff -r 0e84cf0560e1 -r ee14f3fff9ef core/com.nokia.carbide.cpp/plugin_customization.ini
--- a/core/com.nokia.carbide.cpp/plugin_customization.ini	Mon Jun 08 13:46:12 2009 -0500
+++ b/core/com.nokia.carbide.cpp/plugin_customization.ini	Mon Jun 08 13:47:39 2009 -0500
@@ -1,5 +1,5 @@
-# WARNING: A VERSION OF THIS FILE FOR S60 DEVELOPLENT ALSO EXISTS UNDER ./ini_alt/plugin.customization.ini
-# IF YOU MAKE CHANGES HERE THINK ABOUT IF YOU NEED TO MAKE CHANGES THERE TOO (LIKELY YOU WILL)
+# WARNING: A VERSION OF THIS FILE FOR S60 DEVELOPMENT EXISTS UNDER internal\core\com.nokia.carbide.cpp\plugin_customization.ini
+# IF YOU MAKE CHANGES HERE, THINK ABOUT IF YOU NEED TO MAKE CHANGES THERE TOO (LIKELY YOU WILL)
 
 # plugin_customization.ini 
 # sets default values for plug-in-specific preferences