--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/BuildArgumentsInfo.java	Fri Apr 03 23:33:03 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "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.carbide.cdt.internal.builder;
-
-import org.eclipse.cdt.core.settings.model.ICStorageElement;
-
-import com.nokia.carbide.cdt.builder.project.IBuildArgumentsInfo;
-import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
-
-public class BuildArgumentsInfo implements IBuildArgumentsInfo {
-
-	private static final String BLDMAKEBLDFILESARGSSTORAGE = "BLDMAKEBLDFILESARGSSTORAGE"; //$NON-NLS-1$
-	private static final String BLDMAKECLEANARGSSTORAGE = "BLDMAKECLEANARGSSTORAGE"; //$NON-NLS-1$
-	private static final String ABLDBUILDARGSSTORAGE = "ABLDBUILDARGSSTORAGE"; //$NON-NLS-1$
-	private static final String ABLDEXPORTARGSSTORAGE = "ABLDEXPORTARGSSTORAGE"; //$NON-NLS-1$
-	private static final String ABLDMAKEFILEARGSSTORAGE = "ABLDMAKEFILEARGSSTORAGE"; //$NON-NLS-1$
-	private static final String ABLDLIBRARYARGSSTORAGE = "ABLDLIBRARYARGSSTORAGE"; //$NON-NLS-1$
-	private static final String ABLDRESOURCEARGSSTORAGE = "ABLDRESOURCEARGSSTORAGE"; //$NON-NLS-1$
-	private static final String ABLDTARGETARGSSTORAGE = "ABLDTARGETARGSSTORAGE"; //$NON-NLS-1$
-	private static final String ABLDFINALARGSSTORAGE = "ABLDFINALARGSSTORAGE"; //$NON-NLS-1$
-	private static final String ABLDCLEANARGSSTORAGE = "ABLDCLEANARGSSTORAGE"; //$NON-NLS-1$
-	private static final String ABLDFREEZEARGSSTORAGE = "ABLDFREEZEARGSSTORAGE"; //$NON-NLS-1$
-	
-	
-	private String bldmakeBldFilesArgs;
-	private String bldmakeCleanArgs;
-	private String abldBuildArgs;
-	private String abldExportArgs;
-	private String abldMakefileArgs;
-	private String abldLibraryArgs;
-	private String abldResourceArgs;
-	private String abldTargetArgs;
-	private String abldFinalArgs;
-	private String abldCleanArgs;
-	private String abldFreezeArgs;
-	
-	
-	public BuildArgumentsInfo(ISymbianSDK sdk) {
-
-		this.bldmakeBldFilesArgs = ""; //$NON-NLS-1$
-		this.bldmakeCleanArgs = ""; //$NON-NLS-1$
-		this.abldBuildArgs = ""; //$NON-NLS-1$
-		this.abldExportArgs = ""; //$NON-NLS-1$
-		this.abldMakefileArgs = ""; //$NON-NLS-1$
-		this.abldLibraryArgs = ""; //$NON-NLS-1$
-		this.abldResourceArgs = ""; //$NON-NLS-1$
-		this.abldTargetArgs = ""; //$NON-NLS-1$
-		this.abldFinalArgs = ""; //$NON-NLS-1$
-		this.abldCleanArgs = ""; //$NON-NLS-1$
-		this.abldFreezeArgs = ""; //$NON-NLS-1$
-
-		if (sdk.isEKA2()) {
-			this.abldFreezeArgs = "-r"; //$NON-NLS-1$
-			
-		}
-	}
-
-	public BuildArgumentsInfo(String bldmakeBldFilesArgs, String bldmakeCleanArgs, String abldBuildArgs, String abldExportArgs,
-			String abldMakefileArgs, String abldLibraryArgs, String abldResourceArgs, String abldTargetArgs, String abldFinalArgs,
-			String abldCleanArgs, String abldFreezeArgs) {
-
-		this.bldmakeBldFilesArgs = bldmakeBldFilesArgs;
-		this.bldmakeCleanArgs = bldmakeCleanArgs;
-		this.abldBuildArgs = abldBuildArgs;
-		this.abldExportArgs = abldExportArgs;
-		this.abldMakefileArgs = abldMakefileArgs;
-		this.abldLibraryArgs = abldLibraryArgs;
-		this.abldResourceArgs = abldResourceArgs;
-		this.abldTargetArgs = abldTargetArgs;
-		this.abldFinalArgs = abldFinalArgs;
-		this.abldCleanArgs = abldCleanArgs;
-		this.abldFreezeArgs = abldFreezeArgs;
-	}
-	
-	public void loadFromStorage(ICStorageElement rootStorage) {
-		String value = rootStorage.getAttribute(BLDMAKEBLDFILESARGSSTORAGE);
-		if (value != null) {
-			bldmakeBldFilesArgs = value;
-		}
-		
-		value = rootStorage.getAttribute(BLDMAKECLEANARGSSTORAGE);
-		if (value != null) {
-			bldmakeCleanArgs = value;
-		}
-
-		value = rootStorage.getAttribute(ABLDBUILDARGSSTORAGE);
-		if (value != null) {
-			abldBuildArgs = value;
-		}
-
-		value = rootStorage.getAttribute(ABLDEXPORTARGSSTORAGE);
-		if (value != null) {
-			abldExportArgs = value;
-		}
-
-		value = rootStorage.getAttribute(ABLDMAKEFILEARGSSTORAGE);
-		if (value != null) {
-			abldMakefileArgs = value;
-		}
-
-		value = rootStorage.getAttribute(ABLDLIBRARYARGSSTORAGE);
-		if (value != null) {
-			abldLibraryArgs = value;
-		}
-
-		value = rootStorage.getAttribute(ABLDRESOURCEARGSSTORAGE);
-		if (value != null) {
-			abldResourceArgs = value;
-		}
-
-		value = rootStorage.getAttribute(ABLDTARGETARGSSTORAGE);
-		if (value != null) {
-			abldTargetArgs = value;
-		}
-
-		value = rootStorage.getAttribute(ABLDFINALARGSSTORAGE);
-		if (value != null) {
-			abldFinalArgs = value;
-		}
-
-		value = rootStorage.getAttribute(ABLDCLEANARGSSTORAGE);
-		if (value != null) {
-			abldCleanArgs = value;
-		}
-
-		value = rootStorage.getAttribute(ABLDFREEZEARGSSTORAGE);
-		if (value != null) {
-			abldFreezeArgs = value;
-		}
-	}
-	
-	public void saveToStorage(ICStorageElement rootStorage) {
-		if (bldmakeBldFilesArgs.trim().length() > 0) {
-			rootStorage.setAttribute(BLDMAKEBLDFILESARGSSTORAGE, bldmakeBldFilesArgs);
-		}
-
-		if (bldmakeCleanArgs.trim().length() > 0) {
-			rootStorage.setAttribute(BLDMAKECLEANARGSSTORAGE, bldmakeCleanArgs);
-		}
-
-		if (abldBuildArgs.trim().length() > 0) {
-			rootStorage.setAttribute(ABLDBUILDARGSSTORAGE, abldBuildArgs);
-		}
-
-		if (abldExportArgs.trim().length() > 0) {
-			rootStorage.setAttribute(ABLDEXPORTARGSSTORAGE, abldExportArgs);
-		}
-
-		if (abldMakefileArgs.trim().length() > 0) {
-			rootStorage.setAttribute(ABLDMAKEFILEARGSSTORAGE, abldMakefileArgs);
-		}
-
-		if (abldLibraryArgs.trim().length() > 0) {
-			rootStorage.setAttribute(ABLDLIBRARYARGSSTORAGE, abldLibraryArgs);
-		}
-
-		if (abldResourceArgs.trim().length() > 0) {
-			rootStorage.setAttribute(ABLDRESOURCEARGSSTORAGE, abldResourceArgs);
-		}
-
-		if (abldTargetArgs.trim().length() > 0) {
-			rootStorage.setAttribute(ABLDTARGETARGSSTORAGE, abldTargetArgs);
-		}
-
-		if (abldFinalArgs.trim().length() > 0) {
-			rootStorage.setAttribute(ABLDFINALARGSSTORAGE, abldFinalArgs);
-		}
-
-		if (abldCleanArgs.trim().length() > 0) {
-			rootStorage.setAttribute(ABLDCLEANARGSSTORAGE, abldCleanArgs);
-		}
-
-		if (abldFreezeArgs.trim().length() > 0) {
-			rootStorage.setAttribute(ABLDFREEZEARGSSTORAGE, abldFreezeArgs);
-		}
-	}
-
-	public String getBldmakeBldFilesArgs() {
-		return bldmakeBldFilesArgs;
-	}
-
-	public String getBldmakeCleanArgs() {
-		return bldmakeCleanArgs;
-	}
-
-	public String getAbldBuildArgs() {
-		return abldBuildArgs;
-	}
-
-	public String getAbldExportArgs() {
-		return abldExportArgs;
-	}
-
-	public String getAbldMakefileArgs() {
-		return abldMakefileArgs;
-	}
-
-	public String getAbldLibraryArgs() {
-		return abldLibraryArgs;
-	}
-
-	public String getAbldResourceArgs() {
-		return abldResourceArgs;
-	}
-
-	public String getAbldTargetArgs() {
-		return abldTargetArgs;
-	}
-
-	public String getAbldFinalArgs() {
-		return abldFinalArgs;
-	}
-
-	public String getAbldCleanArgs() {
-		return abldCleanArgs;
-	}
-
-	public String getAbldFreezeArgs() {
-		return abldFreezeArgs;
-	}
-}

--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/error/parsers/GCCEErrorParser.java	Fri Apr 03 23:33:03 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "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.carbide.cdt.internal.builder.error.parsers;
-
-import org.eclipse.cdt.core.ErrorParserManager;
-import org.eclipse.cdt.core.IMarkerGenerator;
-import org.eclipse.cdt.internal.errorparsers.GCCErrorParser;
-
-public class GCCEErrorParser extends GCCErrorParser {
-
-	public boolean processLine(String line, ErrorParserManager eoParser) {
-		String lineLC = line.toLowerCase();
-		
-		// check if the tool is installed.  if not then give add a user friendly error to the problems view.
-		if (lineLC.startsWith("'arm-none-symbianelf-g++.exe' is not recognized")) {
-			eoParser.generateMarker(eoParser.getProject(), 0, "GCCE not found on the PATH.  Please check your GCCE installation.", IMarkerGenerator.SEVERITY_ERROR_BUILD, null);
-			return true;
-		}
-		
-		// case for arm-none-symbianelf-ld:
-		if (lineLC.contains("no such file: no such file or directory") || lineLC.contains("no such file or directory")) {
-			eoParser.generateMarker(eoParser.getProject(), 0, line, IMarkerGenerator.SEVERITY_ERROR_BUILD, null);
-			return true;
-		}
-		
-		// fix bug #4541 (and #5618).  undefined reference linker errors.  note that they work correctly already for udeb
-		// build because the error is reported with the source path and line #.  urel builds give an offset to
-		// the text section.
-		//Test2.cpp:(.text+0x1a4): undefined reference to `foo()' (UREL)
-		//..\\src\/Test2.cpp:69: undefined reference to `foo()' (UDEB)
-		if ((lineLC.contains("(.text") || lineLC.contains("(.rodata")) && lineLC.contains(": undefined reference to ")) {
-			eoParser.generateMarker(eoParser.getProject(), 0, line, IMarkerGenerator.SEVERITY_ERROR_BUILD, null);
-			return true;
-		}
-
-		// fix bug #6417. multiple definition linker errors.  note that they work correctly already for udeb
-		// build because the error is reported with the source path and line #.  urel builds give an offset to
-		// the text section.
-		//b6417_2.cpp:(.text+0x88): multiple definition of `E32Main()'
-		//\Symbian\9.2\S60_3rd_FP1\EPOC32\BUILD\Eclipse\rc1torc2workspace\b6417\group\B6417\GCCE\UREL\b6417.o:b6417.cpp:(.text+0x88): first defined here
-		if ((lineLC.contains("(.text") || lineLC.contains("(.rodata")) &&
-				(lineLC.contains(": multiple definition of ") || lineLC.contains(": first defined here"))) {
-			eoParser.generateMarker(eoParser.getProject(), 0, line, IMarkerGenerator.SEVERITY_ERROR_BUILD, null);
-			return true;
-		}
-
-		// the default gcce error parser
-		return super.processLine(line, eoParser);
-	}
-	
-}

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/Import_wizard_page.JPG has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/after_new_site.jpg has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/before_new_site.jpg has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/find_install.jpg has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/launch_config.JPG has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/new_features.jpg has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/new_site_dialog.jpg has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/plugin_selection_wizard.JPG has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/plugins_and_frags_wizard.JPG has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/preferences_command.jpg has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/proxy_setup.jpg has changed

Binary file carbidesdk/com.nokia.carbide.cpp.sdk.doc.user/html/img/target_platform.JPG has changed

--- a/connectivity/com.nokia.tcf.test/src/com/nokia/tcf/test/TestPlatSim.java	Fri Apr 03 23:33:03 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "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.tcf.test;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import org.eclipse.core.runtime.IStatus;
-
-import com.nokia.tcf.api.ITCAPIConnection;
-import com.nokia.tcf.api.ITCMessage;
-import com.nokia.tcf.api.ITCMessageIds;
-import com.nokia.tcf.api.ITCMessageInputStream;
-import com.nokia.tcf.api.ITCMessageOptions;
-import com.nokia.tcf.api.ITCRealTCPConnection;
-import com.nokia.tcf.api.TCFClassFactory;
-import com.nokia.tcf.impl.TCAPIConnection;
-
-import junit.framework.TestCase;
-
-/**
- *
- */
-public class TestPlatSim extends TestCase {
-
-	public void testPlatSim() {
-		// connection
-		ITCRealTCPConnection conn = (ITCRealTCPConnection)TCFClassFactory.createITCRealTCPConnection("127.0.0.1", "7654");
-		// set platsim decoding for this connection
-		conn.setDecodeFormat("platsim");
-		
-		// message options
-		ITCMessageOptions options = TCFClassFactory.createITCMessageOptions();
-		// Ask TCF to encode the protocol (we will send raw messages)
-		options.setMessageEncodeFormat(ITCMessageOptions.ENCODE_FORMAT);
-		// ask TCF to delete the protocol on incoming messages
-		options.setUnWrapFormat(ITCMessageOptions.UNWRAP_DELETE_HEADERS);
-		options.setInputStreamSize(64);
-		
-		// Message ID to capture is 0x32 (TraceCore configure response)
-		ITCMessageIds ids = TCFClassFactory.createITCMessageIds();
-		ids.addMessageId((byte)0x32); // Tracecore response
-
-		// TraceCore configure message
-		// RAW message
-		byte[] tcConfigMsg = {0x1, 0x1, 0x0, 0x0};
-		// convert to ITCMessage
-		ITCMessage tcTCFConfigMsg = TCFClassFactory.createITCMessage(tcConfigMsg);
-		// Use the TraceCore configure message req ID (0x31)
-		tcTCFConfigMsg.setUseMyMessageId(true, (byte)0x31);
-
-		// uncomment this to do a non-plugin Junit
-		TCAPIConnection api2 = new TCAPIConnection();
-		api2.nativeStartServer();
-
-		int iconnect = 0;
-		for (iconnect=0; iconnect < 1; iconnect++) {
-			// connect
-			ITCAPIConnection api = TCFClassFactory.createITCAPIConnection();
-			IStatus connStatus = api.connect(conn, options, ids);
-			System.out.printf("iconnect=%d connStatus=%d\n", iconnect, connStatus.getCode());
-			
-			// get stream reference
-			ITCMessageInputStream stream = null;
-			if (connStatus.isOK()) {
-				stream = api.getInputStream();
-				System.out.printf("stream=%s\n", stream.toString());
-			}
-			
-			// send trk ping
-			if (connStatus.isOK()) {
-				IStatus sendStatus = api.sendMessage(tcTCFConfigMsg);
-				if (sendStatus.isOK()) {
-					// wait for response
-					int numberMessages = 0;
-					int numberPeeks = 0;
-					int numberSleeps = 0;
-					for (int i = 0; i < 100; i ++) {
-						try {
-							if (stream != null)
-								numberMessages = stream.peekMessages();
-							numberPeeks++;
-							if (numberMessages < 1) {
-								try {
-									Thread.sleep(100);
-									numberSleeps++;
-								} catch (InterruptedException e) {
-									e.printStackTrace();
-								}
-							}
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-						if (numberMessages >= 1) {
-							break;
-						}
-					}
-					System.out.printf("NumberMessages = %d numberPeeks = %d numberSleeps = %d\n", numberMessages, numberPeeks, numberSleeps);
-					if (numberMessages > 0) {
-						try {
-							
-//							ITCMessage[] message = stream.readMessages(1);
-//							byte[] b = stream.readBytes(1);
-							ByteBuffer barray = java.nio.ByteBuffer.wrap(stream.readBytes(1));
-//							byte[] b = message[0].getMessage();
-							System.out.printf("msg: length=%d\n", barray.limit());
-							byte[] b = barray.array();
-							for (int i = 0; i < b.length; i++) {
-								System.out.printf("%x ", b[i]);
-							}
-							System.out.printf("\n");
-							numberMessages = stream.peekMessages();
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-					}
-				}
-				if (connStatus.isOK()) {
-					api.disconnect();
-				}
-				try {
-					Thread.sleep(1000);
-				} catch (InterruptedException e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		// uncomment this when using a non-plugin junit test
-		api2.nativeStopServer();
-	}
-}

--- a/connectivity/com.nokia.tcf.test/src/com/nokia/tcf/test/TestPlatSimTRK.java	Fri Apr 03 23:33:03 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "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.tcf.test;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import org.eclipse.core.runtime.IStatus;
-
-import com.nokia.tcf.api.ITCMessage;
-import com.nokia.tcf.api.ITCMessageIds;
-import com.nokia.tcf.api.ITCMessageInputStream;
-import com.nokia.tcf.api.ITCMessageOptions;
-import com.nokia.tcf.api.ITCRealTCPConnection;
-import com.nokia.tcf.api.ITCAPIConnection;
-import com.nokia.tcf.api.TCFClassFactory;
-import com.nokia.tcf.impl.TCAPIConnection;
-
-import junit.framework.TestCase;
-
-/**
- *
- */
-public class TestPlatSimTRK extends TestCase {
-
-	public void testPlatSimTRK() {
-		// connection
-		// PlatSim 
-		ITCRealTCPConnection conn = (ITCRealTCPConnection)TCFClassFactory.createITCRealTCPConnection("127.0.0.1", "7654");
-		conn.setDecodeFormat("platsim");
-
-		// message options
-		ITCMessageOptions options = TCFClassFactory.createITCMessageOptions();
-		// Ask TCF to encode the protocol (we will send raw TRK messages)
-		options.setMessageEncodeFormat(ITCMessageOptions.ENCODE_FORMAT);
-		// ask TCF to delete the protocol on incoming messages
-		options.setUnWrapFormat(ITCMessageOptions.UNWRAP_DELETE_HEADERS);
-//		options.setInputStreamOverflowOption(ITCMessageOptions.INPUTSTREAM_OVERFLOW_NONE);
-		options.setInputStreamSize(64);
-		
-		// message Ids to capture (we must capture TRK response messages = id=0x45)
-		ITCMessageIds ids = TCFClassFactory.createITCMessageIds();
-		// The PN msg ID for TRK responses is 0x45 per DSS
-		ids.addMessageId((byte)0x45); // TRK response
-
-		// TRK ping message
-		// RAW message
-		byte[] trkping = {0x7e, 0, 0, (byte)0xff, 0x7e};
-		// convert to ITCMessage
-		ITCMessage tcMsgPing = TCFClassFactory.createITCMessage(trkping);
-		// Ask TCF to use the PN msg ID for TRK requests (0x44) per DSS
-		tcMsgPing.setUseMyMessageId(true, (byte)0x44);
-		
-		// TRK version message
-		// RAW message
-		byte[] trkversion = {0x7e, 0x08, 0x01, (byte)0xf6, 0x7e};
-		// convert to ITCMessage
-		ITCMessage tcMsgVersion = TCFClassFactory.createITCMessage(trkversion);
-		// Ask TCF to use the PN msg ID for TRK requests (0x44) per DSS
-		tcMsgVersion.setUseMyMessageId(true, (byte)0x44);
-
-		// uncomment this to do a non-plugin Junit
-		TCAPIConnection api2 = new TCAPIConnection();
-		api2.nativeStartServer();
-
-		int iconnect = 0;
-		for (iconnect=0; iconnect < 1; iconnect++) {
-			// connect
-			ITCAPIConnection api = TCFClassFactory.createITCAPIConnection();
-			IStatus connStatus = api.connect(conn, options, ids);
-			System.out.printf("iconnect=%d connStatus=%d\n", iconnect, connStatus.getCode());
-			
-			// get stream reference
-			ITCMessageInputStream stream = null;
-			if (connStatus.isOK()) {
-				stream = api.getInputStream();
-				System.out.printf("stream=%s\n", stream.toString());
-			}
-			
-			// send trk ping
-			if (connStatus.isOK()) {
-				IStatus sendStatus = api.sendMessage(tcMsgPing);
-				if (sendStatus.isOK()) {
-					// wait for response
-					int numberMessages = 0;
-					int numberPeeks = 0;
-					int numberSleeps = 0;
-					for (int i = 0; i < 200; i ++) {
-						try {
-							if (stream != null)
-								numberMessages = stream.peekMessages();
-							numberPeeks++;
-							if (numberMessages < 1) {
-								try {
-									Thread.sleep(100);
-									numberSleeps++;
-								} catch (InterruptedException e) {
-									e.printStackTrace();
-								}
-							}
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-						if (numberMessages >= 1) {
-							break;
-						}
-					}
-					System.out.printf("NumberMessages = %d numberPeeks = %d numberSleeps = %d\n", numberMessages, numberPeeks, numberSleeps);
-					if (numberMessages > 0) {
-						try {
-							
-//							ITCMessage[] message = stream.readMessages(1);
-//							byte[] b = stream.readBytes(1);
-							ByteBuffer barray = java.nio.ByteBuffer.wrap(stream.readBytes(1));
-//							byte[] b = message[0].getMessage();
-							System.out.printf("msg: length=%d\n", barray.limit());
-							byte[] b = barray.array();
-							for (int i = 0; i < b.length; i++) {
-								System.out.printf("%x ", b[i]);
-							}
-							System.out.printf("\n");
-							numberMessages = stream.peekMessages();
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-					}
-				}
-			}
-			// send trk version
-			if (connStatus.isOK()) {
-				IStatus sendStatus = api.sendMessage(tcMsgVersion); 
-				if (sendStatus.isOK()) {
-					// wait for response
-					int numberMessages = 0;
-					int numberPeeks = 0;
-					int numberSleeps = 0;
-					for (int i = 0; i < 200; i ++) {
-						try {
-							if (stream != null)
-								numberMessages = stream.peekMessages();
-							numberPeeks++;
-							if (numberMessages < 1) {
-								try {
-									Thread.sleep(100);
-									numberSleeps++;
-								} catch (InterruptedException e) {
-									e.printStackTrace();
-								}
-							}
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-						if (numberMessages == 1) {
-							break;
-						}
-					}
-					System.out.printf("NumberMessages = %d numberPeeks = %d numberSleeps = %d\n", numberMessages, numberPeeks, numberSleeps);
-					if (numberMessages > 0) {
-						try {
-							
-							ITCMessage message = stream.readMessage();
-							byte[] b = message.getMessage();
-							System.out.printf("msg: length=%d\n", b.length);
-							for (int i = 0; i < b.length; i++) {
-								System.out.printf("%x ", b[i]);
-							}
-							System.out.printf("\n");
-							numberMessages = stream.peekMessages();
-						} catch (IOException e) {
-							e.printStackTrace();
-						}
-					}
-				}
-			}
-			
-			if (connStatus.isOK()) {
-				api.disconnect();
-			}
-			try {
-				Thread.sleep(1000);
-			} catch (InterruptedException e) {
-				e.printStackTrace();
-			}
-		}
-		// uncomment this when using a non-plugin junit test
-		api2.nativeStopServer();
-		
-	}
-}

--- a/connectivity/com.nokia.tcf.test/src/com/nokia/tcf/test/TestVirtualSerial.java	Fri Apr 03 23:33:03 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "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.tcf.test;
-
-import java.io.IOException;
-
-import org.eclipse.core.runtime.IStatus;
-
-import com.nokia.tcf.api.ITCAPIConnection;
-import com.nokia.tcf.api.ITCMessage;
-import com.nokia.tcf.api.ITCMessageIds;
-import com.nokia.tcf.api.ITCMessageInputStream;
-import com.nokia.tcf.api.ITCMessageOptions;
-import com.nokia.tcf.api.ITCVirtualSerialConnection;
-import com.nokia.tcf.api.ITCConnection;
-import com.nokia.tcf.api.TCFClassFactory;
-import junit.framework.TestCase;
-
-/**
- * 1 client 1 connection RAW TRK (non-TraceCore TRK) over USB
- */
-public class TestVirtualSerial extends TestCase {
-
-	public void testVirtualSerial() {
-//		TCFClassFactory factory = new TCFClassFactory();
-		
-		// connection
-		ITCVirtualSerialConnection conn = (ITCVirtualSerialConnection)TCFClassFactory.createITCVirtualSerialConnection("COM13");
-		conn.setRetryInterval(5);
-		conn.setRetryTimeout(60);
-		String desc = conn.getConnectionDescription();
-		System.out.println(desc);
-		assertTrue("description != null", desc != null);
-		
-		// messageIds
-		ITCMessageIds messageIds = TCFClassFactory.createITCMessageIds();
-		messageIds.addMessageId((byte)0x7E);
-		
-		// messageOptions - all default
-		ITCMessageOptions messageOptions = TCFClassFactory.createITCMessageOptions();
-		conn.setDecodeFormat("rawtrk");
-		messageOptions.setMessageEncodeFormat(ITCMessageOptions.ENCODE_NO_FORMAT);
-		ITCAPIConnection api = TCFClassFactory.createITCAPIConnection();
-		IStatus connStatus = api.connect(conn, messageOptions, messageIds);
-		assertTrue("connect is not ok", connStatus.isOK());
-
-		// message
-		int[] trkpingi = {0x7e, 00, 00, 0xff, 0x7e};
-		byte[] trkping = new byte[5];
-		for (int i = 0; i < 5; i++) trkping[i] = (byte)(trkpingi[i] & 0xff);
-		ITCMessage tcMsgPing = TCFClassFactory.createITCMessage(trkping);
-		System.out.println("ping message:");
-		for (int i = 0; i < tcMsgPing.size(); i++) {
-			System.out.printf(" %x", tcMsgPing.getMessage()[i]);			
-		}
-		System.out.printf("\n");
-		tcMsgPing.setUseMyMessageId(false, (byte)0);
-		
-		int[] trkversioni = {0x7e, 0x08, 0x01, 0xf6, 0x7e};
-		byte[] trkversion = new byte[5];
-		for (int i = 0; i < 5; i++) trkversion[i] = (byte)(trkversioni[i] & 0xff);
-		ITCMessage tcMsgVersion = TCFClassFactory.createITCMessage(trkversion);
-		System.out.println("version message:");
-		for (int i = 0; i < tcMsgVersion.size(); i++) {
-			System.out.printf(" %x", tcMsgVersion.getMessage()[i]);			
-		}
-		System.out.printf("\n");
-		tcMsgVersion.setUseMyMessageId(false, (byte)0);
-	
-		
-		IStatus sendStatus = null;
-
-		if (connStatus.isOK()) {
-			sendStatus = api.sendMessage(tcMsgPing);
-			sendStatus = api.sendMessage(tcMsgVersion);
-		}
-
-		ITCMessageInputStream stream = api.getInputStream();
-		ITCMessage msg = null;
-		int numberMessages = 0;
-		try {
-			numberMessages = stream.peekMessages();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		System.out.printf("numberMessages = %d\n", numberMessages);
-		if (numberMessages > 0) {
-			try {
-				msg = stream.readMessage();
-				System.out.printf("messageSize = %d\n", msg.size());
-				if (msg.size() > 0) {
-					for (int i = 0; i < msg.size(); i++) {
-						System.out.printf(" %x", msg.getMessage()[i]);
-					}
-					System.out.printf("\n");
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-
-		// shutdown BT on phone then execute this
-		if (connStatus.isOK()) {
-			sendStatus = api.sendMessage(tcMsgPing);
-			sendStatus = api.sendMessage(tcMsgVersion);
-		}
-		
-		numberMessages = 0;
-		try {
-			numberMessages = stream.peekMessages();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		System.out.printf("numberMessages = %d\n", numberMessages);
-		if (numberMessages > 0) {
-			try {
-				msg = stream.readMessage();
-				System.out.printf("messageSize = %d\n", msg.size());
-				if (msg.size() > 0) {
-					for (int i = 0; i < msg.size(); i++) {
-						System.out.printf(" %x", msg.getMessage()[i]);
-					}
-					System.out.printf("\n");
-				}
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-		if (connStatus.isOK()) {
-			api.disconnect();
-		}
-		
-	}
-}

--- a/core/com.nokia.carbide.cpp.doc.user/html/license.htm	Fri Apr 03 23:33:03 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-
-<html>
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-	<title>Carbide Licenses</title>
-    <link href="../book.css" rel="stylesheet" type="text/css">
-</head>
-
-<body>
-<h2>Carbide Licenses</h2>
-<p>Carbide licenses can be installed and tested from commands in the Help menu. Additional menu options are also available for licenses. All Carbide.c++ Editions, except Carbide.c++ Express, require a valid license to access and use specific features. Once you register your copy of Carbide.c++ a license for your specific product edition is emailed to you. Use the following information to install, test, view, and generally manage your Carbide license. </p>
-<p>The following license commands are available.</p>
-<ul>
-  <li><a href="#install">Install License</a></li>
-  <li> <a href="#select">Select New Active License File...</a></li>
-  <li> <a href="#test">Test Licenses...</a></li>
-  <li><a href="#view">View Licenses...</a></li>
-  <li> <a href="#borrow">Borrow Floating Licenses...</a></li>
-  <li><a href="#return">Return Borrowed Licenses</a></li>
-</ul>
-<h3>Install License<a name="install"></a></h3>
-<p>Select the install license menu option (<b>Help &gt; Carbide Licenses &gt; Install License...</b>) to display the Install License window (figure 1).</p>
-<p align="center"><img src="images/install_license_file.png" width="500" height="375"></p>
-<p class="figure">Figure 1. Install License Window</p>
-<p>Copy and paste your license key data into the window. Enter a filename for the new license and click the OK button.</p>
-<p class="note"><b>NOTE</b> Restart Carbide.c++ for the new license to take effect.</p>
-<h3>Select New Active License File...<a name="select"></a></h3>
-<p>Choose the Select New Active License File... menu option (<b>Help &gt; Carbide Licenses &gt; Select New Active License File...</b>) to display an Open window that allows you to select a license (.lic) file.</p>
-<p align="center"><img src="images/select_license_file.png" width="563" height="419"></p>
-<p class="figure">Figure 2. Select New Active License File</p>
-<h3>Test Licenses...<a name="test"></a></h3>
-<p>Select <b>Help &gt; Carbide Licenses &gt; Test Licenses...</b> to test the validity of the current license file. If the license file is valid a Carbide License Manager Verification window appears and confirms that the file is valid.</p>
-<p align="center"><img src="images/test_license_file.png" width="441" height="146"></p>
-<p class="figure">Figure 3. Carbide License Manager Verification Window</p>
-<h3>View Licenses...<a name="view"></a></h3>
-<p>Select <b>Help &gt; Carbide Licenses &gt; View License File...</b> to display a Current License Contents window (figure 4). The window displays information about installed features, such as name of feature, related version, expiration date, and status.</p>
-<p align="center"><img src="images/view_license_file.png" width="693" height="375"></p>
-<p class="figure">Figure 4. Current License Contents Window</p>
-<h3><a name="borrow"></a>Borrow Floating Licenses...</h3>
-<p>Select <b>Help &gt; Carbide Licenses &gt; Borrow Floating Licenses...</b> to display a Borrow License Window (figure 5). Specify a return date and time for features that can be borrowed.</p>
-<p align="center"><img src="images/borrow_license_file.png" width="268" height="182"></p>
-<p class="figure">Figure 5. Borrow License Window </p>
-<h3><a name="return"></a>Return Borrowed Licenses</h3>
-<p>Select <b>Help &gt; Carbide Licenses &gt; Return Borrowed Licenses</b> to return borrowed licenses to their previous state.</p>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
\ No newline at end of file

--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_install.htm	Fri Apr 03 23:33:03 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Carbide.c++ Installation</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Carbide.c++ Installation</h2>
-<p>You must install Carbide.c++ on a computer in order to create Symbian programs. </p>
-<p class="note"><b>NOTE</b> Also, see <a href="carbide_requirements.htm">Carbide.c++ Requirements</a> to ensure you have everything required to develop Symbian programs.</p>
-<div class="step">
-  <h4>Installing Carbide.c++ </h4>
-  <ol>
-    <li>Launch the Carbide.c++ installer</li>
-    <p>The first page of install wizard appears.</p>
-    <li>Follow install wizard instructions and accept default settings</li>
-        <li>Click Finish in installer window</li>
-    <p>The installer exits.</p>
-<li>Install a software development kit (SDK) for Symbian development</li>
-    <p>You must have at least one Symbian OS SDK's installed to develop programs for Symbian devices. See <a href="carbide_requirements.htm">System Requirements</a> for a complete list of supported SDKs.</p>
-    <li>Install Perl</li>
-    <p>Download and install <a href="ftp://ftp.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.635-MSWin32-x86.msi">ActivePerl-5.6.1.635.</a></p>
-    <li>Install the &#8220;Symbian Connect&#8221; software that came with your phone</li>
-    <p>You need software that communicates with the target device from your PC. For more information, see <a href="carbide_deploying.htm">Deploying Programs to Devices</a>.</p>
-  </ol>
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>