# HG changeset patch # User Ed Swartz # Date 1285026672 18000 # Node ID d930aa7f442851edd42628e45be4d950cf6aa04f # Parent 38adc1f9b9ce7b94254bd03245b3e67cfe2192e2# Parent 632d9ed15b2050f514e3d13effaae688fabe6ef9 Merge commit diff -r 38adc1f9b9ce -r d930aa7f4428 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/messages.properties --- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/messages.properties Mon Sep 20 18:50:57 2010 -0500 +++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/ui/messages.properties Mon Sep 20 18:51:12 2010 -0500 @@ -16,7 +16,7 @@ CarbideBuildConfigurationsPage.Content_Search_Location_ToolTip=The root location where PKG contents is specified to search. CarbideBuildConfigurationsPage.Browse_Content_Search_ToolTip=Browse for the location where to start PKG content searchs from. CarbideBuildConfigurationsPage.Partial_Upgrade_Checkbox=Generate partial upgrade when appropriate -CarbideBuildConfigurationsPage.Partial_Upgrade_Checkbox_ToolTip=Enable this option to have the builder create a partial upgrade SIS/SISX file. This can help reduce download times for larger SIS files when launching an App TRK configuration. +CarbideBuildConfigurationsPage.Partial_Upgrade_Checkbox_ToolTip=Enable this option to have the builder create a partial upgrade SIS/SISX file. This can help reduce download times for larger SIS files when launching. CarbideBuildConfigurationsPage.Signing_Options=Signing Options CarbideBuildConfigurationsPage.Dont_Sign=Don't sign sis file CarbideBuildConfigurationsPage.Dont_Sign_ToolTip=The SIS file will be built but not signed diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.cpp.doc.user/book.css diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_symbian_sdks.png Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/prefs_symbian_sdks.png has changed diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_trk_debug_config.png Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_trk_debug_config.png has changed diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_symbian_sdk.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_symbian_sdk.htm Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_symbian_sdk.htm Mon Sep 20 18:51:12 2010 -0500 @@ -24,14 +24,13 @@

Symbian SDKs preference panel

Figure 1. Symbian SDKs preference panel

- + +

Click on a SDK name to see its EPOCROOT location and build configuration status in the SDK Information area.

@@ -46,6 +45,10 @@ + + + + diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/panel_trk_overview.htm Mon Sep 20 18:51:12 2010 -0500 @@ -4,7 +4,7 @@ -TRK Panel Overview +CODA Panel Overview diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Mon Sep 20 18:51:12 2010 -0500 @@ -31,19 +31,28 @@

What's New in 3.0.0

The following features for Symbian development are provided within Carbide.c++:

-

Milestone 2

-

Milestone 1

-

2.7.0

By default, you can click the Debug icon () in the toolbar to launch the New Launch Configuration Wizard. This creates a launch configuration for the project based on project information and any additional input required, like COM port selection. It is the recommended method for creating new launch configurations. Or, use the Debug window to create a customized launch configuration.

-

-

Figure 1. Debug launch configuration for on-device debugging (Application CODA shown)

+

+

Figure 1. Debug launch configuration for on-device debugging (Application TCF CODA shown)

Defining a Customized Launch Configuration

  1. Choose the Run > Debug As menu item
  2. The Debug window appears.

  3. Select a Configuration type for on-device debugging and click New
  4. -

    Choose the Symbian OS Application CODA or System CODA configuration based on which debug agent is installed on the device, then click New. A new debug launch configuration appears in the Configuration list and the Main tab appears.

    +

    Choose the Symbian OS Application TCF CODA or System CODA configuration based on which debug agent is installed on the device, then click New. A new debug launch configuration appears in the Configuration list and the Main tab appears.

  5. Enter the required information
  6. For debug launch configurations using the CODA debug agent, the following pages require review and possible option settings:

      diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/trk/trk_overview.htm Mon Sep 20 18:51:12 2010 -0500 @@ -4,12 +4,12 @@ -TRK Overview +CODA Overview -

      TRK Overview

      -

      This section describes how to setup and use the on-device debug agent software to debug programs on S60 v3.x and UIQ 3rd edition devices. Topics include:

      +

      CODA Overview

      +

      This section describes how to setup and use the CODA software (Carbide On-device Debug Agent) to debug programs on Symbian ^3, Symbian ^4, Nokia Qt SDK, S60 v5.x devices. Topics include:

      • Preconditions for Using On-device Debugging
      • Installing the On-device Debug Agent on a Device
      • diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.cpp.doc.user/index.xml --- a/core/com.nokia.carbide.cpp.doc.user/index.xml Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/index.xml Mon Sep 20 18:51:12 2010 -0500 @@ -9,7 +9,7 @@ - + @@ -61,10 +61,6 @@ - - - - @@ -140,12 +136,12 @@ - - + + - + @@ -168,6 +164,22 @@ + + + + + + + + + + + + + + + + @@ -299,6 +311,10 @@ + + + + @@ -374,6 +390,10 @@ + + + + @@ -509,6 +529,10 @@ + + + + @@ -610,11 +634,15 @@ + + + + - + @@ -666,18 +694,6 @@ - - - - - - - - - - - - diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.cpp/component.xml --- a/core/com.nokia.carbide.cpp/component.xml Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.cpp/component.xml Mon Sep 20 18:51:12 2010 -0500 @@ -4,5 +4,5 @@ - + diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.cpp/splash.bmp Binary file core/com.nokia.carbide.cpp/splash.bmp has changed diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/icons/debug.png Binary file core/com.nokia.carbide.discovery.ui/icons/debug.png has changed diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/icons/icon_customize.png Binary file core/com.nokia.carbide.discovery.ui/icons/icon_customize.png has changed diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/icons/icon_home.png Binary file core/com.nokia.carbide.discovery.ui/icons/icon_home.png has changed diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/icons/icon_kits.png Binary file core/com.nokia.carbide.discovery.ui/icons/icon_kits.png has changed diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/icons/icon_support.png Binary file core/com.nokia.carbide.discovery.ui/icons/icon_support.png has changed diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/plugin.properties --- a/core/com.nokia.carbide.discovery.ui/plugin.properties Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/plugin.properties Mon Sep 20 18:51:12 2010 -0500 @@ -2,8 +2,13 @@ menu.title = Carbide.c++ Portal portal.desc = Install extensions, get support, install SDKs, find latest news customize.title = Customize -home.title = Home +customize.tooltip = Add-ons and settings +home.title = Welcome +home.tooltip = Information, blogs, etc. support.title = Support +support.tooltip = Support links +kits.title = Kits +kits.tooltip = Installed SDKs install.layer.title = Install Extensions wrenchscience.title = Wrench Science creatingcarbide.title = Creating Carbide diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/plugin.xml --- a/core/com.nokia.carbide.discovery.ui/plugin.xml Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/plugin.xml Mon Sep 20 18:51:12 2010 -0500 @@ -51,27 +51,31 @@ + title="%customize.title" + tooltip="%customize.tooltip"> + title="%home.title" + tooltip="%home.tooltip"> + title="%support.title" + tooltip="%support.tooltip"> + title="%kits.title" + tooltip="%kits.tooltip"> + + + + + + + diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/NavigationBar.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/NavigationBar.java Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/NavigationBar.java Mon Sep 20 18:51:12 2010 -0500 @@ -22,16 +22,108 @@ import org.eclipse.jface.resource.FontDescriptor; import org.eclipse.jface.resource.JFaceResources; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.CLabel; +import org.eclipse.swt.events.MouseAdapter; +import org.eclipse.swt.events.MouseEvent; +import org.eclipse.swt.events.MouseListener; +import org.eclipse.swt.events.MouseTrackAdapter; +import org.eclipse.swt.events.MouseTrackListener; import org.eclipse.swt.events.SelectionAdapter; import org.eclipse.swt.events.SelectionEvent; import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.FontData; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.graphics.Rectangle; import org.eclipse.swt.layout.FillLayout; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Event; + +import com.nokia.cpp.internal.api.utils.core.ListenerList; class NavigationBar extends RoundedCornerComposite { + private class Button extends CLabel { + private ListenerList listeners; + private boolean selection; + private MouseTrackListener mouseTrackListener; + private MouseListener mouseListener; + + public Button(Composite parent) { + super(parent, SWT.CENTER); + listeners = new ListenerList(); + setBackground(getDisplay().getSystemColor(SWT.COLOR_WHITE)); + addMouseTrackListener(mouseTrackListener = new MouseTrackAdapter() { + @Override + public void mouseExit(MouseEvent e) { + if (!selection) + setBackgroundColor(); + + } + + @Override + public void mouseEnter(MouseEvent e) { + if (!selection) + setBackground(getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND)); + } + }); + + addMouseListener(mouseListener = new MouseAdapter() { + @Override + public void mouseUp(MouseEvent e) { + Point size = Button.this.getSize(); + if (new Rectangle(0, 0, size.x, size.y).contains(e.x, e.y)) + setSelection(true); + } + }); + } + + @Override + protected void checkSubclass() { + } + + public void addSelectionListener(SelectionListener listener) { + listeners.add(listener); + } + + public void setSelection(boolean selection) { + if (this.selection != selection) { + this.selection = selection; + setBackgroundColor(); + if (selection) { + for (Control control : getParent().getChildren()) { + if (control instanceof Button) { + if (!control.equals(this)) { + ((Button) control).setSelection(false); + } + } + } + fireSelection(); + } + } + } + + private void fireSelection() { + Event e = new Event(); + e.widget = this; + e.display = getDisplay(); + for (SelectionListener listener : listeners) { + listener.widgetSelected(new SelectionEvent(e)); + } + + } + + private void setBackgroundColor() { + setBackground(getDisplay().getSystemColor(selection ? SWT.COLOR_WIDGET_NORMAL_SHADOW : SWT.COLOR_WHITE)); + } + + @Override + public void dispose() { + removeMouseTrackListener(mouseTrackListener); + removeMouseListener(mouseListener); + super.dispose(); + } + } private final class ButtonListener extends SelectionAdapter { @Override @@ -41,7 +133,7 @@ } } - private static final int BUTTON_SPACING = -2; + private static final int BUTTON_SPACING = 0; private PortalEditor portalEditor; private Map buttonToPageMap; private SelectionListener listener; @@ -70,13 +162,14 @@ public void initUI() { if (buttonToPageMap.isEmpty()) return; - selectNavButton(buttonToPageMap.keySet().iterator().next()); + buttonToPageMap.keySet().iterator().next().setSelection(true); } public void addNavButton(NavigationBar bar, PortalPage page) { - Button b = new Button(bar, SWT.TOGGLE); + Button b = new Button(bar); b.setFont(buttonFont); b.setText(page.getTitle()); + b.setToolTipText(page.getTooltip()); b.setImage(portalEditor.createImage(page.getImageDescriptor(), 32, 32)); b.addSelectionListener(listener); buttonToPageMap.put(b, page); @@ -84,11 +177,6 @@ public void selectNavButton(Button button) { - for (Button other : buttonToPageMap.keySet()) { - other.setSelection(false); - other.setFont(buttonFont); - } - button.setSelection(true); portalEditor.showPage(buttonToPageMap.get(button)); button.setFont(selectedButtonFont); layout(); diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalEditor.java Mon Sep 20 18:51:12 2010 -0500 @@ -163,6 +163,7 @@ String id = element.getAttribute("id"); //$NON-NLS-1$ int order = getOrderStringFromElement(element, id); String title = element.getAttribute("title"); //$NON-NLS-1$ + String tooltip = element.getAttribute("tooltip"); //$NON-NLS-1$ String imageFilePath = element.getAttribute("image"); //$NON-NLS-1$ String pluginId = element.getContributor().getName(); ImageDescriptor imageDesc = AbstractUIPlugin.imageDescriptorFromPlugin(pluginId, imageFilePath); @@ -178,7 +179,7 @@ Activator.logError(MessageFormat.format(Messages.PortalEditor_BadCommandBarFactoryError, id), e); } } - PortalPage portalPage = new PortalPage(title, imageDesc, id, portalLayers, commandBarFactory); + PortalPage portalPage = new PortalPage(title, tooltip, imageDesc, id, portalLayers, commandBarFactory); pageList.add(new Pair(portalPage, order)); } Collections.sort(pageList, new Comparator>() { @@ -193,7 +194,7 @@ } } - private int getOrderStringFromElement(IConfigurationElement element, String id) { + private int getOrderStringFromElement(IConfigurationElement element, String name) { int order = Integer.MAX_VALUE; String orderString = element.getAttribute("order"); //$NON-NLS-1$ if (orderString != null) { @@ -201,7 +202,7 @@ order = Integer.parseInt(orderString); } catch (NumberFormatException e) { - Activator.logError(MessageFormat.format(Messages.PortalEditor_PageRankError, id), e); + Activator.logError(MessageFormat.format(Messages.PortalEditor_PageRankError, name), e); } } return order; diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalPage.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalPage.java Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/editor/PortalPage.java Mon Sep 20 18:51:12 2010 -0500 @@ -94,6 +94,7 @@ } private String title; + private String tooltip; private ImageDescriptor imageDescriptor; private String id; private final ICommandBarFactory commandBarFactory; @@ -104,9 +105,10 @@ private IAction[] actions; private List pageTaskBars; - public PortalPage(String title, ImageDescriptor imageDescriptor, String id, + public PortalPage(String title, String tooltip, ImageDescriptor imageDescriptor, String id, List layerExtensions, ICommandBarFactory commandBarFactory) { this.title = title; + this.tooltip = tooltip; this.imageDescriptor = imageDescriptor; this.id = id; this.commandBarFactory = commandBarFactory; @@ -131,6 +133,10 @@ return title; } + public String getTooltip() { + return tooltip; + } + public ImageDescriptor getImageDescriptor() { return imageDescriptor; } diff -r 38adc1f9b9ce -r d930aa7f4428 core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractBrowserPortalPageLayer.java --- a/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractBrowserPortalPageLayer.java Mon Sep 20 18:50:57 2010 -0500 +++ b/core/com.nokia.carbide.discovery.ui/src/com/nokia/carbide/internal/discovery/ui/extension/AbstractBrowserPortalPageLayer.java Mon Sep 20 18:51:12 2010 -0500 @@ -313,7 +313,7 @@ try { new URL(value); } catch (MalformedURLException e) { - value = "http://" + value; + value = "http://" + value; //$NON-NLS-1$ } return value; }; diff -r 38adc1f9b9ce -r d930aa7f4428 debuggercdi/com.nokia.cdt.debug.common/META-INF/MANIFEST.MF --- a/debuggercdi/com.nokia.cdt.debug.common/META-INF/MANIFEST.MF Mon Sep 20 18:50:57 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.common/META-INF/MANIFEST.MF Mon Sep 20 18:51:12 2010 -0500 @@ -11,7 +11,8 @@ org.eclipse.debug.core;bundle-version="3.6.0", com.nokia.carbide.cdt.builder;bundle-version="2.0.0", com.nokia.carbide.remoteConnections;bundle-version="1.4.0", - org.eclipse.core.filesystem;bundle-version="1.3.0" + org.eclipse.core.filesystem;bundle-version="1.3.0", + org.eclipse.cdt.debug.edc;bundle-version="2.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Export-Package: com.nokia.cdt.debug.common.internal.api, diff -r 38adc1f9b9ce -r d930aa7f4428 debuggercdi/com.nokia.cdt.debug.common/src/com/nokia/cdt/debug/common/internal/executables/SymbianSourceFileRemapping.java --- a/debuggercdi/com.nokia.cdt.debug.common/src/com/nokia/cdt/debug/common/internal/executables/SymbianSourceFileRemapping.java Mon Sep 20 18:50:57 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.common/src/com/nokia/cdt/debug/common/internal/executables/SymbianSourceFileRemapping.java Mon Sep 20 18:51:12 2010 -0500 @@ -46,10 +46,11 @@ private Job saveThePrefsJob = new Job(""){ + @SuppressWarnings("restriction") @Override protected IStatus run(IProgressMonitor monitor) { - System.out.println("save prefs"); - CDebugCorePlugin.getDefault().savePluginPreferences(); + CSourceLookupDirector director = CDebugCorePlugin.getDefault().getCommonSourceLookupDirector(); + director.setSourceContainers(director.getSourceContainers()); // force it to write out the prefs return Status.OK_STATUS; }}; @@ -90,7 +91,7 @@ // here it will be slow and redundant if we are being used to remap a large collection // of source files. So we save the prefs later in a job. saveThePrefsJob.cancel(); - saveThePrefsJob.schedule(1000); + saveThePrefsJob.schedule(2000); } public String remapSourceFile(IPath executable, String filePath) { diff -r 38adc1f9b9ce -r d930aa7f4428 debuggercdi/com.nokia.cdt.debug.launch/plugin.xml --- a/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml Mon Sep 20 18:50:57 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/plugin.xml Mon Sep 20 18:51:12 2010 -0500 @@ -9,7 +9,7 @@ sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator" sourcePathComputerId="com.nokia.cdt.debug.common.internal.source.lookup.CarbideSourcePathComputer" delegateDescription="Launch a classic Carbide Emulator debug session." - name="Classic Symbian OS Emulation" + name="Symbian OS Emulation" delegate="com.nokia.cdt.internal.debug.launch.EmulationLaunchDelegate" modes="run,debug" type="com.nokia.cdt.debug.launch.emulationLaunch" @@ -22,25 +22,25 @@ point="org.eclipse.debug.core.launchConfigurationTypes"> @@ -114,7 +114,7 @@ class="com.nokia.cdt.internal.debug.launch.PhoneLaunchShortcut" icon="icons/launch_config_file_16x16.png" id="com.nokia.cdt.debug.launch.symbianCPPShortcut.phone" - label="Symbian OS Phone or Simulator Launch" + label="Device" modes="run, debug"> @@ -172,20 +172,20 @@ @@ -251,20 +251,20 @@ diff -r 38adc1f9b9ce -r d930aa7f4428 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/messages.properties --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/messages.properties Mon Sep 20 18:50:57 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/messages.properties Mon Sep 20 18:51:12 2010 -0500 @@ -1,7 +1,5 @@ AbstractSymbianLaunchShortcut.ChooseConfigLabel=Select the launch configuration: AbstractSymbianLaunchShortcut.ChooseConfigTitle=Choose configuration -LaunchPlugin.0=Carbide_Sys_TRK -LaunchPlugin.1=System TCF TRK Debugging LaunchPlugin.17=No binaries found for project. Unable to launch. LaunchPlugin.ErrorTitle=Launch Error LaunchPlugin.noTCPIPConnectionType=Unable to locate a TCP/IP connection type. diff -r 38adc1f9b9ce -r d930aa7f4428 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties Mon Sep 20 18:50:57 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/ui/messages.properties Mon Sep 20 18:51:12 2010 -0500 @@ -64,7 +64,7 @@ FileTransferTab.1=File Transfer FileTransferTab.10=Select All FileTransferTab.11=Deselect All -FileTransferTab.Tooltip=Table is initially empty for Application TRK configurations because files are installed on the device. \nUse this table to transfer additional files if needed. +FileTransferTab.Tooltip=Table is initially empty when files are installed on the device. \nUse this table to transfer additional files if needed. FileTransferTab.2=Enabled FileTransferTab.3=File to transfer FileTransferTab.4=Target path @@ -119,16 +119,14 @@ RomLogFileTab.7=Symbian Rom Log files RomLogFileTab.8=All files RomLogFileTab.9=Symbian Epoc32 Directory\: -RunModeDebuggerTab.10=Message retry delay (ms)\: -RunModeDebuggerTab.11=This is the time the debugger will wait for a response from TRK before resending the message. Most users will not need to change this value. RunModeDebuggerTab.12=Debugger RunModeDebuggerTab.13=No break at entry symbol specified. RunModeDebuggerTab.4=Break at entry point\: RunModeDebuggerTab.5=When enabled the debugger will automatically set a breakpoint at the function specified. RunModeDebuggerTab.6=View program output -RunModeDebuggerTab.7=Create a console view to display any data from the communications port that TRK does not understand, such as the output of the executable being debugged +RunModeDebuggerTab.7=Create a console view to display the output of the executable being debugged RunModeDebuggerTab.8=View messages between Carbide and debug agent -RunModeDebuggerTab.9=Create a console view to display all communications between the Carbide debugger and TRK on the phone (this can be useful in debugging communications problems) +RunModeDebuggerTab.9=Opens the EDC TCF Trace view which will display communications between the host debugger and the debug agent on the device (CODA) RunModeMainTab.0=Executable\: RunModeMainTab.1=The symbolics file (.sym) generated when the project was built RunModeMainTab.2=Remote process to launch\: diff -r 38adc1f9b9ce -r d930aa7f4428 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AppTRKLaunchWizard.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AppTRKLaunchWizard.java Mon Sep 20 18:50:57 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,112 +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.cdt.internal.debug.launch.wizard; - -import com.nokia.cdt.debug.cw.symbian.SettingsData; -import com.nokia.cdt.internal.debug.launch.LaunchPlugin; -import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab; -import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; - -import java.util.List; - -public class AppTRKLaunchWizard extends AbstractLaunchWizard { - private BuildOptionsSelectionPage fBuildOptionsSelectionPage; - private TRKConnectionWizardPage fMainPage; - private TRKSISSelectionWizardPage fSISSelectionPage; - private boolean hasFinished = false; - - public AppTRKLaunchWizard(List mmps, List exes, IPath defaultExecutable, IProject project, String configurationName) { - super(project, configurationName, mmps, exes, defaultExecutable, exes.size() > 1, true); - setWindowTitle(Messages.getString("AppTRKLaunchWizard.1")); //$NON-NLS-1$ - } - - @Override - public String getLaunchTypeID() { - return SettingsData.APP_TRK_LAUNCH_TYPE_ID; - } - - @Override - public boolean supportsCategory(String categoryId) { - return categoryId.equals(PHONE_CATEGORY_ID); - } - - public boolean performFinish() { - hasFinished = true; - return true; - } - - public void addPages() { - super.addPages(); - fBuildOptionsSelectionPage = new BuildOptionsSelectionPage(); - fMainPage = new TRKConnectionWizardPage(this, - LaunchPlugin.getDebugServiceId()); - fSISSelectionPage = new TRKSISSelectionWizardPage(this); - addPage(fBuildOptionsSelectionPage); - addPage(fMainPage); - addPage(fSISSelectionPage); - addPage(getSummaryPage()); - MainExecutableSelectionWizardPage binarySelectionPage = getBinarySelectionPage(); - if (binarySelectionPage != null) { - binarySelectionPage.setPathValidator(new IPathValidator() { - public String isValidPath(IPath path) { - return RunModeMainTab.isRemoteTextValid(path.toOSString()); - } - }); - } - } - - public String toString() { - return Messages.getString("AppTRKLaunchWizard.2"); //$NON-NLS-1$ - } - - public String getDescription() { - return Messages.getString("AppTRKLaunchWizard.3"); //$NON-NLS-1$ - } - - public ILaunchConfigurationWorkingCopy createLaunchConfiguration(IPath mmpPath, IPath exePath, IPath processToLaunchTargetPath) { - // if we haven't finished then don't create anything - if (!hasFinished) { - return null; - } - - ILaunchConfigurationWorkingCopy config = null; - try { - // create our config - config = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(SettingsData.APP_TRK_LAUNCH_TYPE_ID).newInstance(null, getConfigName()); - - // set the default values - SettingsData.setDefaults(config, SettingsData.LaunchConfig_AppTRK, getProject(), mmpPath, exePath); - if (processToLaunchTargetPath != null) - SettingsData.setProcessToLaunch(config, processToLaunchTargetPath); - - // now let the wizard pages update values - fBuildOptionsSelectionPage.updateConfiguration(config); - fMainPage.updateConfiguration(config); - fSISSelectionPage.updateConfiguration(config); - - } catch (CoreException e) { - e.printStackTrace(); - } - return config; - } -} diff -r 38adc1f9b9ce -r d930aa7f4428 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AttachTRKLaunchWizard.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/AttachTRKLaunchWizard.java Mon Sep 20 18:50:57 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,96 +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.cdt.internal.debug.launch.wizard; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; - -import java.util.List; - -import com.nokia.cdt.debug.cw.symbian.SettingsData; -import com.nokia.cdt.internal.debug.launch.LaunchPlugin; - -public class AttachTRKLaunchWizard extends AbstractLaunchWizard { - private BuildOptionsSelectionPage fBuildOptionsSelectionPage; - private TRKConnectionWizardPage fMainPage; - private boolean hasFinished = false; - - public AttachTRKLaunchWizard(List mmps, List exes, IPath defaultExecutable, IProject project, String configurationName) { - super(project, configurationName, mmps, exes, defaultExecutable, false, false); - setWindowTitle(Messages.getString("AttachTRKLaunchWizard.1")); //$NON-NLS-1$ - } - - @Override - public String getLaunchTypeID() { - return SettingsData.ATTACH_LAUNCH_TYPE_ID; - } - - @Override - public boolean supportsCategory(String categoryId) { - return categoryId.equals(PHONE_CATEGORY_ID); - } - - public boolean performFinish() { - hasFinished = true; - return true; - } - - public void addPages() { - super.addPages(); - fBuildOptionsSelectionPage = new BuildOptionsSelectionPage(); - fMainPage = new TRKConnectionWizardPage(this, - LaunchPlugin.getDebugServiceId()); - addPage(fBuildOptionsSelectionPage); - addPage(fMainPage); - addPage(getSummaryPage()); - } - - public String toString() { - return Messages.getString("AttachTRKLaunchWizard.2"); //$NON-NLS-1$ - } - - public String getDescription() { - return Messages.getString("AttachTRKLaunchWizard.3"); //$NON-NLS-1$ - } - - public ILaunchConfigurationWorkingCopy createLaunchConfiguration(IPath mmpPath, IPath exePath, IPath processToLaunchTargetPath) { - // if we haven't finished then don't create anything - if (!hasFinished) { - return null; - } - - ILaunchConfigurationWorkingCopy config = null; - try { - // create our config - config = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(SettingsData.ATTACH_LAUNCH_TYPE_ID).newInstance(null, getConfigName()); - - // set the default values - SettingsData.setDefaults(config, SettingsData.LaunchConfig_AppTRK, getProject(), mmpPath, exePath); - - // now let the wizard pages update values - fBuildOptionsSelectionPage.updateConfiguration(config); - fMainPage.updateConfiguration(config); - - } catch (CoreException e) { - e.printStackTrace(); - } - return config; - } -} diff -r 38adc1f9b9ce -r d930aa7f4428 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SystemTRKLaunchWizard.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/SystemTRKLaunchWizard.java Mon Sep 20 18:50:57 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +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.cdt.internal.debug.launch.wizard; - -import com.nokia.cdt.debug.cw.symbian.SettingsData; -import com.nokia.cdt.internal.debug.launch.LaunchPlugin; -import com.nokia.cdt.internal.debug.launch.ui.RunModeMainTab; -import com.nokia.cdt.internal.debug.launch.wizard.MainExecutableSelectionWizardPage.IPathValidator; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IPath; -import org.eclipse.debug.core.DebugPlugin; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; - -import java.util.List; - -public class SystemTRKLaunchWizard extends AbstractLaunchWizard { - private BuildOptionsSelectionPage fBuildOptionsSelectionPage; - private TRKConnectionWizardPage fMainPage; - private boolean hasFinished = false; - - public SystemTRKLaunchWizard(List mmps, List exes, IPath defaultExecutable, IProject project, String configurationName) { - super(project, configurationName, mmps, exes, defaultExecutable, true, true); - setWindowTitle(Messages.getString("SystemTRKLaunchWizard.1")); //$NON-NLS-1$ - } - - @Override - public String getLaunchTypeID() { - return SettingsData.SYS_TRK_LAUNCH_TYPE_ID; - } - - @Override - public boolean supportsCategory(String categoryId) { - return categoryId.equals(PHONE_CATEGORY_ID); - } - - public boolean performFinish() { - hasFinished = true; - return true; - } - - public void addPages() { - super.addPages(); - fBuildOptionsSelectionPage = new BuildOptionsSelectionPage(); - fMainPage = new TRKConnectionWizardPage(this, - LaunchPlugin.getDebugServiceId()); - addPage(fBuildOptionsSelectionPage); - addPage(fMainPage); - addPage(getSummaryPage()); - getBinarySelectionPage().setPathValidator(new IPathValidator() { - public String isValidPath(IPath path) { - return RunModeMainTab.isRemoteTextValid(path.toOSString()); - } - }); - } - - public String toString() { - return Messages.getString("SystemTRKLaunchWizard.2"); //$NON-NLS-1$ - } - - public String getDescription() { - return Messages.getString("SystemTRKLaunchWizard.3"); //$NON-NLS-1$ - } - - public ILaunchConfigurationWorkingCopy createLaunchConfiguration(IPath mmpPath, IPath exePath, IPath processToLaunchTargetPath) { - // if we haven't finished then don't create anything - if (!hasFinished) { - return null; - } - - ILaunchConfigurationWorkingCopy config = null; - try { - // create our config - config = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(SettingsData.SYS_TRK_LAUNCH_TYPE_ID).newInstance(null, getConfigName()); - - // set the default values - SettingsData.setDefaults(config, SettingsData.LaunchConfig_SysTRK, getProject(), mmpPath, exePath); - if (processToLaunchTargetPath != null) - SettingsData.setProcessToLaunch(config, processToLaunchTargetPath); - - // now let the wizard pages update values - fBuildOptionsSelectionPage.updateConfiguration(config); - fMainPage.updateConfiguration(config); - - } catch (CoreException e) { - e.printStackTrace(); - } - return config; - } - -} diff -r 38adc1f9b9ce -r d930aa7f4428 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKSISSelectionWizardPage.java --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/TRKSISSelectionWizardPage.java Mon Sep 20 18:50:57 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,261 +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.cdt.internal.debug.launch.wizard; - -import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin; -import com.nokia.carbide.cdt.builder.project.*; -import com.nokia.cpp.internal.api.utils.core.Check; -import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils; - -import cwdbg.PreferenceConstants; - -import org.eclipse.cdt.core.model.CoreModel; -import org.eclipse.cdt.core.settings.model.CProjectDescriptionEvent; -import org.eclipse.cdt.core.settings.model.ICProjectDescriptionListener; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; -import org.eclipse.jface.dialogs.Dialog; -import org.eclipse.jface.wizard.WizardPage; -import org.eclipse.swt.SWT; -import org.eclipse.swt.events.*; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.*; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.dialogs.PreferencesUtil; - -import java.io.File; -import java.text.MessageFormat; - -public class TRKSISSelectionWizardPage extends WizardPage implements ICProjectDescriptionListener { - - private boolean isDisposed = false; - private Combo sisFile; - private String sisPath = ""; //$NON-NLS-1$ - private Text sisEdit; - private Button sisBrowse; - private final ISummaryTextItemContainer summaryTextItemContainer; - - - public TRKSISSelectionWizardPage(ISummaryTextItemContainer summaryTextItemContainer) { - super(Messages.getString("TRKSISSelectionWizardPage.0")); //$NON-NLS-1$ - Check.checkArg(summaryTextItemContainer); - this.summaryTextItemContainer = summaryTextItemContainer; - setPageComplete(false); - setTitle(Messages.getString("TRKSISSelectionWizardPage.0")); //$NON-NLS-1$ - setDescription(Messages.getString("TRKSISSelectionWizardPage.1")); //$NON-NLS-1$ - } - - public void dispose() { - isDisposed = true; - setSisPath(); - - CoreModel.getDefault().getProjectDescriptionManager().removeCProjectDescriptionListener(this); - - super.dispose(); - } - - /* - * @see IDialogPage#createControl(Composite) - */ - public void createControl(Composite parent) { - Composite composite = new Composite(parent, SWT.NULL); - GridLayout layout = new GridLayout(); - layout.numColumns = 2; - composite.setLayout(layout); - - GridData data = new GridData(); - composite.setLayoutData(data); - - AbstractLaunchWizard wizard = (AbstractLaunchWizard) getWizard(); - final IProject project = wizard.getProject(); - ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project); - if (cpi != null) { - final Label sisLabel = new Label(composite, SWT.NONE); - sisLabel.setText(Messages.getString("TRKSISSelectionWizardPage.2")); //$NON-NLS-1$ - data = new GridData(); - data.horizontalSpan = 1; - sisLabel.setLayoutData(data); - sisLabel.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$ - sisLabel.setData(".uid", "TRKSISSelectionWizard.sisLabel"); - - sisFile = new Combo(composite, SWT.READ_ONLY); - data = new GridData(GridData.HORIZONTAL_ALIGN_FILL); - data.horizontalSpan = 1; - sisFile.setLayoutData(data); - sisFile.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$ - sisFile.add(Messages.getString("TRKSISSelectionWizardPage.5")); //$NON-NLS-1$ - sisFile.setData(".uid", "TRKSISSelectionWizard.sisFile"); - - ICarbideBuildConfiguration config = cpi.getDefaultConfiguration(); - for (ISISBuilderInfo info : config.getSISBuilderInfoList()) { - IPath sisPath = info.getSigningType() == ISISBuilderInfo.DONT_SIGN ? info.getUnsignedSISFullPath() : info.getSignedSISFullPath(); - sisFile.add(sisPath.toOSString()); - } - - // select the first sis file if any, otherwise select none - if (sisFile.getItemCount() > 1) { - sisFile.select(1); - } else { - sisFile.select(0); - } - - // listen for events so we can detect if they click on the link below and add new sis info. - CoreModel.getDefault().getProjectDescriptionManager().addCProjectDescriptionListener(this, CProjectDescriptionEvent.APPLIED); - - Link link = new Link(composite, SWT.NONE); - link.setText("" + Messages.getString("TRKSISSelectionWizardPage.4") + "..."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - link.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 2, 1)); - link.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent e) { - PreferencesUtil.createPropertyDialogOn(getShell(), project, "com.nokia.carbide.cdt.internal.builder.ui.CarbideBuildConfigurationsPage", null, null).open(); //$NON-NLS-1$ - } - }); - link.setData(".uid", "TRKSISSelectionWizard.link"); - } else { - // not a Carbide project, just an executable. show a browse/edit combo - // to let them select a sis file if they want to. - final Label sisLabel = new Label(composite, SWT.NONE); - sisLabel.setText(Messages.getString("TRKSISSelectionWizardPage.2")); //$NON-NLS-1$ - data = new GridData(); - data.horizontalSpan = 2; - sisLabel.setLayoutData(data); - sisLabel.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$ - sisLabel.setData(".uid", "TRKSISSelectionWizard.sisLabel"); - - sisEdit = new Text(composite, SWT.BORDER); - sisEdit.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false)); - sisEdit.setToolTipText(Messages.getString("TRKSISSelectionWizardPage.3")); //$NON-NLS-1$ - sisEdit.addModifyListener(new ModifyListener() { - public void modifyText(ModifyEvent e) { - checkValid(); - } - }); - sisEdit.setData(".uid", "TRKSISSelectionWizard.sisEdit"); - - sisBrowse = new Button(composite, SWT.NONE); - sisBrowse.setText(Messages.getString("TRKSISSelectionWizardPage.9")); //$NON-NLS-1$ - sisBrowse.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, false, false)); - sisBrowse.addSelectionListener(new SelectionAdapter() { - public void widgetSelected(SelectionEvent evt) { - FileDialog dialog = new FileDialog(getShell(), SWT.NONE); - - dialog.setText(Messages.getString("TRKSISSelectionWizardPage.6")); //$NON-NLS-1$ - dialog.setFilterExtensions(new String[] {"*.sis*", "*.*"}); //$NON-NLS-1$ //$NON-NLS-2$ - dialog.setFilterNames(new String[] {Messages.getString("TRKSISSelectionWizardPage.7"), Messages.getString("TRKSISSelectionWizardPage.8")}); //$NON-NLS-1$ //$NON-NLS-2$ - - BrowseDialogUtils.initializeFrom(dialog, sisEdit); - - String result = dialog.open(); - if (result != null && new File(result).exists()) { - sisEdit.setText(result); - checkValid(); - } - } - }); - sisBrowse.setData(".uid", "TRKSISSelectionWizard.sisBrowse"); - } - - setControl(composite); - Dialog.applyDialogFont(parent); - setPageComplete(true); - } - - private void checkValid() { - setErrorMessage(null); - - if (sisEdit != null) { - String text = sisEdit.getText().trim(); - if (text.length() > 0) { - // empty is allowed, but if they specify something, make sure - // it exists - File file = new File(text); - if (!file.exists()) { - setErrorMessage(Messages.getString("TRKSISSelectionWizardPage.10")); //$NON-NLS-1$ - } - } - } - } - - private void setSisPath() { - if (sisFile != null) { - sisPath = sisFile.getSelectionIndex() == 0 ? "" : sisFile.getText(); //$NON-NLS-1$ - } else if (sisEdit != null) { - sisPath = sisEdit.getText(); - } - } - - void updateConfiguration(ILaunchConfigurationWorkingCopy config) { - if (!isDisposed) - setSisPath(); - - config.setAttribute(PreferenceConstants.J_PN_SisFileHostPath, sisPath); - } - - @Override - public void performHelp() { - PlatformUI.getWorkbench().getHelpSystem().displayHelp(LaunchWizardHelpIds.WIZARD_TRK_SIS_SELECTION_PAGE); - } - - public void handleEvent(CProjectDescriptionEvent event) { - if (isDisposed || !isCurrentPage()) { - return; - } - - IProject project = event.getProject() ; - AbstractLaunchWizard wizard = (AbstractLaunchWizard) getWizard(); - - if (project != wizard.getProject()) { - return; - } - - if (sisFile != null) { - ICarbideProjectInfo cpi = CarbideBuilderPlugin.getBuildManager().getProjectInfo(project); - if (cpi != null) { - sisFile.removeAll(); - - sisFile.add(Messages.getString("TRKSISSelectionWizardPage.5")); //$NON-NLS-1$ - - ICarbideBuildConfiguration config = cpi.getDefaultConfiguration(); - for (ISISBuilderInfo info : config.getSISBuilderInfoList()) { - IPath sisPath = info.getSigningType() == ISISBuilderInfo.DONT_SIGN ? info.getUnsignedSISFullPath() : info.getSignedSISFullPath(); - sisFile.add(sisPath.toOSString()); - } - - // select the first sis file if any, otherwise select none - if (sisFile.getItemCount() > 1) { - sisFile.select(1); - } else { - sisFile.select(0); - } - } - } - } - - public void setVisible(boolean visible) { - super.setVisible(visible); - if (!visible) { - setSisPath(); - summaryTextItemContainer.putSummaryTextItem("SisFile", //$NON-NLS-1$ - MessageFormat.format("{0} {1}", new Object[] { //$NON-NLS-1$ - Messages.getString("TRKSISSelectionWizardPage.2"), //$NON-NLS-1$ - sisPath.length() == 0 ? Messages.getString("TRKSISSelectionWizardPage.5") : sisPath})); //$NON-NLS-1$ - } - } - -} \ No newline at end of file diff -r 38adc1f9b9ce -r d930aa7f4428 debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties --- a/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties Mon Sep 20 18:50:57 2010 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.launch/src/com/nokia/cdt/internal/debug/launch/wizard/messages.properties Mon Sep 20 18:51:12 2010 -0500 @@ -1,9 +1,3 @@ -AppTRKLaunchWizard.1=New Application TCF Debugger Launch Configuration -AppTRKLaunchWizard.2=Application TCF Debugger Launch Configuration -AppTRKLaunchWizard.3=Application TCF Debugger is a debug agent that runs on released phones and allows you to debug your executables. The debugger downloads the Symbian OS installation file to the phone and installs it prior to launching. -AttachTRKLaunchWizard.1=New Attach to Process Launch Configuration -AttachTRKLaunchWizard.2=Attach to Process Launch Configuration -AttachTRKLaunchWizard.3=The debugger attempts to debug a process already running on the phone. BuildOptionsSelectionPage.Title=Build Options Selection BuildOptionsSelectionPage.Description=Select build options before launching BuildOptionsSelectionPage.OptionsGroupLabel=Build (if required) before launching @@ -19,7 +13,7 @@ LaunchCategorySelectionPage.title=Launch Categories LaunchCategorySelectionPage.description=Select a launch category. LaunchCategorySelectionPage.phone=Phone -LaunchCategorySelectionPage.phoneDesc=Launches on a phone using System or Application TCF TRK. +LaunchCategorySelectionPage.phoneDesc=Launches on a phone using CODA. LaunchCategorySelectionPage.categoryLabel=Select where you want to launch LaunchWizardSelectionPage.0=Launch Wizard LaunchWizardSelectionPage.1=Launch Types @@ -46,23 +40,7 @@ MainExecutableSelectionWizardPage.SelectExectuableTitle=Select Exectuable To Launch MainExecutableSelectionWizardPage.UsePathLabel.device=Specify device path of remote process to launch MainExecutableSelectionWizardPage.UsePathLabel.device.ToolTip=The specified process will be launched on the phone -SystemTRKLaunchWizard.1=New System TCF TRK Launch Configuration -SystemTRKLaunchWizard.2=System TCF TRK Launch Configuration -SystemTRKLaunchWizard.3=System TCF TRK is a debug agent that runs on reference boards and prototype phones and allows you to debug your executables. The debugger downloads the executable files to the phone prior to launching. With the System TCF TRK, you can also debug the binaries included in the ROM image. TRKConnectionWizardPage.0=Connection Settings TRKConnectionWizardPage.1=Select the remote connection to use to connect for debugging -TRKConnectionWizardPage.2=Serial Port\: -TRKConnectionWizardPage.3=Specify which serial port on your PC to use for TRK connection TRKConnectionWizardPage.ConnectionSummaryLabel=Connection TRKConnectionWizardPage.NoConnectionError=A valid remote connection must be selected. If none exist, create a new one. -TRKSISSelectionWizardPage.0=TRK SIS Selection -TRKSISSelectionWizardPage.1=Select the SIS file to install -TRKSISSelectionWizardPage.10=The file specified does not exist. -TRKSISSelectionWizardPage.2=SIS File to Install\: -TRKSISSelectionWizardPage.3=Specify which SIS file to install on the phone prior to launching -TRKSISSelectionWizardPage.4=Modify SIS builder settings for build configuration -TRKSISSelectionWizardPage.5=None -TRKSISSelectionWizardPage.6=Select installation file -TRKSISSelectionWizardPage.7=Installation Files -TRKSISSelectionWizardPage.8=All Files -TRKSISSelectionWizardPage.9=Browse... diff -r 38adc1f9b9ce -r d930aa7f4428 project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/mmp/MMPView.java --- a/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/mmp/MMPView.java Mon Sep 20 18:50:57 2010 -0500 +++ b/project/com.nokia.carbide.cpp.epoc.engine/src/com/nokia/carbide/internal/cpp/epoc/engine/model/mmp/MMPView.java Mon Sep 20 18:51:12 2010 -0500 @@ -1179,7 +1179,7 @@ // replace any "/~/" sequences if (dirPath.segmentCount() > 0) dirPath = new Path(dirPath.addTrailingSeparator().toPortableString() - .replace("/~/", "/"+implDirectory+"/")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + .replace("~/", implDirectory+"/")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } // version identifier overrides unicode
NameFunction
NameFunction
Symbian SDK's

Lists all the installed and recognized SDKs that are supported by the IDE. SDKs no longer supported by Carbide are not shown. You can double-click the SDK ID or Location entry to edit them directly.

Checked SDKs indicate build configurations available for creating projects. Unchecked SDKs are not displayed when creating new projects.

SDKs shown in RED indicate a problem, usually no EPOCROOT or unsupported Symbian OS version.

-

Click on a SDK name to see its EPOCROOT location and build configuration status in the SDK Information area.

-
Add

Click to view and edit the properties of the currently selected SDK in the Symbian SDKs list.

Scan for installable features in SDKsControls whether Carbide dynamically discovers and installs features from SDKs during startup and SDK rescanning. Disable to not perform this scan of SDKs. It is on by default.

Rescan All SDKs

Click to rescan the drive for newly installed SDKs.

NOTE Carbide.c++ scans for available SDKs each time it is started.