--- a/frameworkplugins/com.nokia.s60tools.extensions.framework/feature.xml Wed Sep 15 17:28:26 2010 +0300
+++ b/frameworkplugins/com.nokia.s60tools.extensions.framework/feature.xml Tue Sep 21 09:43:02 2010 +0300
@@ -2,7 +2,7 @@
<feature
id="com.nokia.s60tools.extensions.framework"
label="Carbide.c++ Extensions - Framework plug-ins"
- version="1.9.0"
+ version="1.9.0.qualifier"
provider-name="Nokia">
<description>
--- a/frameworkplugins/com.nokia.s60tools.extensions.framework/release_notes.txt Wed Sep 15 17:28:26 2010 +0300
+++ b/frameworkplugins/com.nokia.s60tools.extensions.framework/release_notes.txt Tue Sep 21 09:43:02 2010 +0300
@@ -1,7 +1,7 @@
-------------------------
-------------------------
Framework – Version 1.9.0
-Released 13th April 2010
+Released 31st August 2010
-------------------------
-------------------------
--- a/frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/sourcecode/ProjectUtils.java Wed Sep 15 17:28:26 2010 +0300
+++ b/frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/sourcecode/ProjectUtils.java Tue Sep 21 09:43:02 2010 +0300
@@ -31,6 +31,7 @@
import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
import com.nokia.carbide.cpp.project.core.ProjectCorePlugin;
+import com.nokia.carbide.cpp.sdk.core.ISDKBuildInfo;
import com.nokia.carbide.cpp.sdk.core.ISDKManager;
import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID;
@@ -159,10 +160,14 @@
boolean sbsv2Project = project.hasNature(CarbideBuilderPlugin.CARBIDE_SBSV2_PROJECT_NATURE_ID);
String builderId = sbsv2Project ?
ISymbianBuilderID.SBSV2_BUILDER : ISymbianBuilderID.SBSV1_BUILDER;
-
- List<ISymbianBuildContext> buildConfigs =
- sdk.getBuildInfo(builderId).getFilteredBuildConfigurations();
-
+
+ // If there is no build info for the builderId, null is returned.
+ ISDKBuildInfo info = sdk.getBuildInfo(builderId);
+
+ // null buildConfigs list is not allowed.
+ List<ISymbianBuildContext> buildConfigs = (null != info) ?
+ info.getFilteredBuildConfigurations() : new ArrayList<ISymbianBuildContext>();
+
List<String> infComponentsList = new ArrayList<String>();
ICProject cProject = ProjectCorePlugin.postProjectCreatedActions(