# HG changeset patch # User timkelly # Date 1276270314 18000 # Node ID 51ff67a50dee164ebab6512482dc18a6661c27c2 # Parent c92585882c833485493453ff19bdf8497057e646 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. diff -r c92585882c83 -r 51ff67a50dee builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/CarbideConfigurationDataProvider.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); } } diff -r c92585882c83 -r 51ff67a50dee core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/api/sdk/SBSv2Utils.java --- 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); }