--- a/frameworkplugins/com.nokia.s60tools.extensions.framework/feature.xml Fri Aug 27 06:53:57 2010 -0500
+++ b/frameworkplugins/com.nokia.s60tools.extensions.framework/feature.xml Tue Aug 31 11:53:05 2010 +0300
@@ -2,7 +2,7 @@
<feature
id="com.nokia.s60tools.extensions.framework"
label="Carbide.c++ Extensions - Framework plug-ins"
- version="1.8.0"
+ version="1.9.0"
provider-name="Nokia">
<description>
@@ -48,7 +48,6 @@
<import plugin="org.eclipse.ui.console"/>
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.core.resources"/>
- <import plugin="com.freescale.cdt.debug.cw.core" version="1.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.cdt.core" version="5.0.1" match="greaterOrEqual"/>
<import plugin="com.nokia.carbide.cpp.project.core"/>
</requires>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/frameworkplugins/com.nokia.s60tools.extensions.framework/release_notes.txt Tue Aug 31 11:53:05 2010 +0300
@@ -0,0 +1,22 @@
+-------------------------
+-------------------------
+Framework – Version 1.9.0
+Released 13th April 2010
+-------------------------
+-------------------------
+
+Contents:
+---------
+
+- com.nokia.s60tools.extensions.framework
+- com.nokia.s60tools.sdk
+- com.nokia.s60tools.ui
+- com.nokia.s60tools.util
+
+What's new:
+-----------
+
+* The framework is updated to be Carbide 3.0 compatible.
+
+Version history:
+----------------
--- a/frameworkplugins/com.nokia.s60tools.sdk/META-INF/MANIFEST.MF Fri Aug 27 06:53:57 2010 -0500
+++ b/frameworkplugins/com.nokia.s60tools.sdk/META-INF/MANIFEST.MF Tue Aug 31 11:53:05 2010 +0300
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Carbide.c++ Extensions - SDK Manager Service
Bundle-SymbolicName: com.nokia.s60tools.sdk
-Bundle-Version: 1.8.0
+Bundle-Version: 1.9.0.qualifier
Bundle-Activator: com.nokia.s60tools.sdk.internal.SdkPlugin
Bundle-Vendor: Nokia
Require-Bundle: org.eclipse.core.runtime,
--- a/frameworkplugins/com.nokia.s60tools.sdk/src/com/nokia/s60tools/sdk/SdkManager.java Fri Aug 27 06:53:57 2010 -0500
+++ b/frameworkplugins/com.nokia.s60tools.sdk/src/com/nokia/s60tools/sdk/SdkManager.java Tue Aug 31 11:53:05 2010 +0300
@@ -190,7 +190,7 @@
// i.e. call to sdk.getId() does not return
// valid SDK ID, but sdk.getLabel() does.
sdkInfoReturned.setSdkId(sdk.getUniqueId());
- sdkInfoReturned.setSdkName(sdk.getName());
+
sdkInfoReturned.setEpocRootDir(sdk.getEPOCROOT());
sdkInfoReturned.setReleaseRootDir(sdk.getReleaseRoot().toOSString());//Returns IPath
sdkInfoReturned.setEpoc32ToolsDir(sdk.getToolsPath().toOSString());
--- a/frameworkplugins/com.nokia.s60tools.ui/META-INF/MANIFEST.MF Fri Aug 27 06:53:57 2010 -0500
+++ b/frameworkplugins/com.nokia.s60tools.ui/META-INF/MANIFEST.MF Tue Aug 31 11:53:05 2010 +0300
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Carbide.c++ Extensions - UI Services
Bundle-SymbolicName: com.nokia.s60tools.ui;singleton:=true
-Bundle-Version: 1.8.0
+Bundle-Version: 1.9.0.qualifier
Bundle-Activator: com.nokia.s60tools.ui.internal.S60ToolsUiPlugin
Bundle-Vendor: Nokia
Require-Bundle: org.eclipse.ui,
--- a/frameworkplugins/com.nokia.s60tools.util/META-INF/MANIFEST.MF Fri Aug 27 06:53:57 2010 -0500
+++ b/frameworkplugins/com.nokia.s60tools.util/META-INF/MANIFEST.MF Tue Aug 31 11:53:05 2010 +0300
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: Carbide.c++ Extensions - Utilities
Bundle-SymbolicName: com.nokia.s60tools.util
-Bundle-Version: 1.8.0
+Bundle-Version: 1.9.0.qualifier
Bundle-Activator: com.nokia.s60tools.util.internal.UtilPlugin
Bundle-Vendor: Nokia
Require-Bundle: org.eclipse.core.runtime,
@@ -10,10 +10,10 @@
org.eclipse.ui,
org.eclipse.ui.ide,
org.eclipse.core.resources,
- com.freescale.cdt.debug.cw.core;bundle-version="1.4.0",
org.eclipse.cdt.core;bundle-version="5.0.1",
com.nokia.carbide.cpp.project.core,
- com.nokia.carbide.cpp.sdk.core
+ com.nokia.carbide.cpp.sdk.core,
+ com.nokia.carbide.cdt.builder
Bundle-ActivationPolicy: lazy
Export-Package: com.nokia.s60tools.util.cmdline,
com.nokia.s60tools.util.console,
@@ -21,7 +21,6 @@
com.nokia.s60tools.util.exceptions,
com.nokia.s60tools.util.python,
com.nokia.s60tools.util.resource,
- com.nokia.s60tools.util.serial,
com.nokia.s60tools.util.sourcecode,
com.nokia.s60tools.util.xml
Bundle-RequiredExecutionEnvironment: J2SE-1.5
--- a/frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/serial/ComPortUtil.java Fri Aug 27 06:53:57 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-package com.nokia.s60tools.util.serial;
-
-import com.freescale.cdt.debug.cw.core.ComPortHelper;
-
-/**
- * Class for getting information of serial ports from OS.
- */
-public class ComPortUtil {
-
- private static final String COM_PORT_PREFIX = "COM"; //$NON-NLS-1$
- private static final int COM_PORT_NUMBER = 256;
-
- /**
- * Gets array of COM ports. Shows names for registered ports.
- * In case of failure returns anyway all ports as array without
- * additional information from OS.
- * @return Array of COM ports
- */
- static public String[] getComPortNames() {
- String[] comPortNames = null;
- boolean excOccured = false;
-
- try {
- comPortNames = ComPortHelper.getComPortNames();
- } catch (Exception e) {
- excOccured = true;
- }
-
- if (excOccured || comPortNames == null || !comPortNames[0].startsWith(COM_PORT_PREFIX + 1)) {
- // Failed to get port names from ComPortHelper
- // Generate list of COM ports
- comPortNames = new String[COM_PORT_NUMBER];
- for (int i = 0; i < comPortNames.length; i++)
- {
- comPortNames[i] = COM_PORT_PREFIX + (i+1);
- }
- }
-
- return comPortNames;
- }
-}
-
\ No newline at end of file
--- a/frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/serial/package.html Fri Aug 27 06:53:57 2010 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-
-<!-- Place for package short description text-->
-Provides serial communication related utilities.
-
-<p>
-<!-- Place for package long description text-->
-<p/>
-
-</body>
-</html>
--- a/frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/sourcecode/ProjectUtils.java Fri Aug 27 06:53:57 2010 -0500
+++ b/frameworkplugins/com.nokia.s60tools.util/src/com/nokia/s60tools/util/sourcecode/ProjectUtils.java Tue Aug 31 11:53:05 2010 +0300
@@ -29,9 +29,11 @@
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.ui.PartInitException;
+import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
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;
import com.nokia.s60tools.util.console.IConsolePrintUtility;
@@ -154,7 +156,13 @@
ISymbianSDK sdk = manager.getSDK(sdkID, true);//get currently used SDK
//Get all build configurations of used SDK
- List<ISymbianBuildContext> buildConfigs = sdk.getUnfilteredBuildConfigurations();
+ 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();
+
List<String> infComponentsList = new ArrayList<String>();
ICProject cProject = ProjectCorePlugin.postProjectCreatedActions(