Create an SDK with a bad epocroot when a configuration is being loaded but where the SDK is not in the global list. C3_BUILDER_WORK
authortimkelly
Fri, 11 Jun 2010 10:31:54 -0500
branchC3_BUILDER_WORK
changeset 1459 51ff67a50dee
parent 1458 c92585882c83
child 1460 26f585ac8a88
Create an SDK with a bad epocroot when a configuration is being loaded but where the SDK is not in the global list. We add it so it can be displayed along with an error message that the SDK has a bad EPOCROOT.
builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/CarbideConfigurationDataProvider.java
core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/CarbideConfigurationDataProvider.java	Thu Jun 10 15:38:22 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/CarbideConfigurationDataProvider.java	Fri Jun 11 10:31:54 2010 -0500
@@ -244,11 +244,10 @@
 			if (sdk != null){
 				return new BuildContextSBSv2(sdk, platform, target, buidAlias, displayString, configID);
 			} else {
-//				ISymbianSDK deadSDK = SymbianSDKFactory.createInstance(sdkID, "FIXME", "", new Version("0.0"), "", new Version("0.0"), false);
-//				SDKCorePlugin.getSDKManager().addSDK(deadSDK);
-//				
-//				return new BuildContextSBSv2(deadSDK, platform, target, buidAlias, displayString, configID);
-				return null;
+				ISymbianSDK deadSDK = SymbianSDKFactory.createInstance(sdkID, "FIXME", "", new Version("0.0"), "", new Version("0.0"), false);
+				SDKCorePlugin.getSDKManager().addSDK(deadSDK);
+				
+				return new BuildContextSBSv2(deadSDK, platform, target, buidAlias, displayString, configID);
 			}
 		}
 		
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Thu Jun 10 15:38:22 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java	Fri Jun 11 10:31:54 2010 -0500
@@ -145,7 +145,7 @@
 	    	// For now, just filter out anything older than 9.4
 	    	for (ISymbianSDK sdk : sdks) {
 	    		Version osVersion = sdk.getOSVersion();
-	    		if (osVersion.getMajor() > 8 ||
+	    		if (osVersion.getMajor() > 8 || osVersion.getMajor() == 0 ||
 	    				(osVersion.getMajor() == 9 && osVersion.getMinor() > 3)) {
 	    			supportedSDKs.add(sdk);
 	    		}