--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java	Tue Aug 17 10:53:02 2010 -0700
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideLanguageData.java	Tue Aug 17 15:50:47 2010 -0700
@@ -18,11 +18,9 @@
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import org.eclipse.cdt.core.CCorePlugin;
@@ -50,12 +48,10 @@
 import com.nokia.carbide.cdt.builder.EpocEngineHelper;
 import com.nokia.carbide.cdt.builder.project.ICarbideBuildConfiguration;
 import com.nokia.carbide.cpp.epoc.engine.model.sbv.ISBVView;
-import com.nokia.carbide.cpp.epoc.engine.preprocessor.DefineFactory;
 import com.nokia.carbide.cpp.epoc.engine.preprocessor.IDefine;
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildContext;
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildInfo;
 import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildContext;
-import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildInfo;
 import com.nokia.carbide.cpp.sdk.core.IBSFPlatform;
 import com.nokia.carbide.cpp.sdk.core.ISBVPlatform;
 import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Tue Aug 17 10:53:02 2010 -0700
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/BuildContextSBSv2.java	Tue Aug 17 15:50:47 2010 -0700
@@ -36,6 +36,8 @@
 	private String displayString;
 	private String configID;  // cconfiguration 'id' attribute from .cproject
 	
+	private boolean reportedSBSVersionError;
+	
 	// Raptor config query data
 	private ISBSv2ConfigQueryData configQueryData;
 	
@@ -302,9 +304,12 @@
 				}
 			}
 		} catch (final SBSv2MinimumVersionException e) {
+			reportedSBSVersionError = true; // only report once per IDE session.
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 				public void run() {
-					MessageDialog.openError(WorkbenchUtils.getSafeShell(), "Minimum sbs version not met.", e.getMessage());
+					if (!reportedSBSVersionError){
+						MessageDialog.openError(WorkbenchUtils.getSafeShell(), "Minimum sbs version not met.", e.getMessage());
+					}
 				}
 			});	
 			Logging.log(SDKCorePlugin.getDefault(), Logging.newSimpleStatus(0, IStatus.ERROR,

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SDKCacheUtils.java	Tue Aug 17 10:53:02 2010 -0700
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SDKCacheUtils.java	Tue Aug 17 15:50:47 2010 -0700
@@ -16,6 +16,8 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectStreamClass;
 
+import javax.swing.filechooser.FileSystemView;
+
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java	Tue Aug 17 10:53:02 2010 -0700
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java	Tue Aug 17 15:50:47 2010 -0700
@@ -537,7 +537,7 @@
 						MessageFormat.format(
 							"Could not find or launch Raptor script ''{0}''; SBSv2 support will not be available",
 							sbsPath), e));
-			}
+			} 
 			if (p != null) {
 				BufferedReader br = new BufferedReader(new InputStreamReader(p.getInputStream()));
 				String overallOutput = "";

--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManagerRaptorOnly.java	Tue Aug 17 10:53:02 2010 -0700
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/SDKManagerRaptorOnly.java	Tue Aug 17 15:50:47 2010 -0700
@@ -46,7 +46,10 @@
 		
 		String message = SBSv2Utils.scanSBSv2();
 		if (message != null) {
-			reportError(message);
+			// If Raptor is not installed version will be 0.0
+			// and a message will be displayed saying that
+			// the minimum version is not met.
+			//reportError(message);
 			
 			// no good will come from checking over and over...
 			return true;
@@ -125,12 +128,6 @@
 		return new File(System.getProperty("user.home"), "devices.xml");
 	}
 
-	/* (non-Javadoc)
-	 * @see com.nokia.carbide.cpp.sdk.core.ISDKManager#setDefaultSDK(com.nokia.carbide.cpp.sdk.core.ISymbianSDK)
-	 */
-	public void setDefaultSDK(ISymbianSDK sdk) {
-		// ignore
-	}
 
 	/* (non-Javadoc)
 	 * @see com.nokia.carbide.cpp.sdk.core.ISDKManager#updateSDK(com.nokia.carbide.cpp.sdk.core.ISymbianSDK)

--- a/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv2PlatformFilterComposite.java	Tue Aug 17 10:53:02 2010 -0700
+++ b/core/com.nokia.carbide.cpp.sdk.ui/src/com/nokia/carbide/cpp/internal/api/sdk/ui/SBSv2PlatformFilterComposite.java	Tue Aug 17 15:50:47 2010 -0700
@@ -243,7 +243,7 @@
 				aliasMap = SBSv2QueryUtils.getCompleteAliasList();
 			} catch (SBSv2MinimumVersionException e) {
 				// Force a scan for version in case system was updated
-				((SDKManager)SDKCorePlugin.getSDKManager()).getSBSv2Version(true);
+				SDKCorePlugin.getSDKManager().getSBSv2Version(true);
 				try {
 					// try, try again...
 					aliasMap = SBSv2QueryUtils.getCompleteAliasList();