--- a/carbidesdk/com.nokia.carbide.cpp.sdk.examples/src/com/nokia/carbide/cpp/sdk/examples/jobs/NewProjectJob.java Fri Jun 11 14:13:49 2010 -0500
+++ b/carbidesdk/com.nokia.carbide.cpp.sdk.examples/src/com/nokia/carbide/cpp/sdk/examples/jobs/NewProjectJob.java Mon Jun 14 08:34:05 2010 -0500
@@ -142,7 +142,7 @@
List<ISymbianBuildContext> result = new ArrayList<ISymbianBuildContext>();
List<ISymbianSDK> sdks = SDKCorePlugin.getSDKManager().getSDKList();
ISymbianSDK sdk = sdks.get(0);
- result.addAll(sdk.getFilteredBuildConfigurations());
+ result.addAll(sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getFilteredBuildConfigurations());
return result;
}
--- a/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/MissingSdkTest.java Fri Jun 11 14:13:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/MissingSdkTest.java Mon Jun 14 08:34:05 2010 -0500
@@ -37,6 +37,7 @@
import com.nokia.carbide.cpp.project.core.ProjectCorePlugin;
import com.nokia.carbide.cpp.sdk.core.ISDKManager;
import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
+import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID;
import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
import com.nokia.carbide.cpp.sdk.core.SDKCorePlugin;
@@ -89,7 +90,7 @@
// put up to 4 configs among each SDK in devices.xml (to improve speed with custkits)
List<ISymbianBuildContext> allConfigs = new ArrayList<ISymbianBuildContext>();
for (ISymbianSDK sdk : sdkList) {
- List<ISymbianBuildContext> sdkConfigs = sdk.getFilteredBuildConfigurations();
+ List<ISymbianBuildContext> sdkConfigs = sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getFilteredBuildConfigurations();
if (sdkConfigs == null)
continue;
if (sdkConfigs.size() <= 0)
--- a/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestsPlugin.java Fri Jun 11 14:13:49 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.core.tests/src/com/nokia/carbide/cpp/project/core/tests/TestsPlugin.java Mon Jun 14 08:34:05 2010 -0500
@@ -76,7 +76,7 @@
*/
public static List<ISymbianBuildContext> getUsableBuildConfigs() {
for (ISymbianSDK sdk : SDKCorePlugin.getSDKManager().getSDKList()) {
- List<ISymbianBuildContext> contexts = sdk.getUnfilteredBuildConfigurations();
+ List<ISymbianBuildContext> contexts = sdk.getBuildInfo(ISymbianBuilderID.SBSV1_BUILDER).getAllBuildConfigurations();
if (contexts.size() > 0)
return contexts.subList(0, Math.min(contexts.size(), 8));
}