--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml Thu Feb 25 15:40:10 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml Thu Feb 25 15:41:07 2010 -0600
@@ -252,8 +252,10 @@
<!-- DEBUG AS DIALOG -->
<!-- ADDED 2.5 -->
<context id="select_launch_method_dialog" >
- <description>Select the .</description>
- <topic label="Debug As" href="html/reference/view_memory_wnd.htm" />
+ <description>Select the type of Symbian OS device to debug.</description>
+ <topic label="Emulator Launch" href="html/projects/launch/emulator_phone.htm" />
+ <topic label="Phone Launch" href="html/projects/launch/launch_phone.htm" />
+ <topic label="Reference Board Launch" href="html/projects/launch/board_phone.htm" />
</context>
<!-- WORKING SET PAGE -->
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/btn_debug.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/icons/btn_run.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm Thu Feb 25 15:40:10 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_board.htm Thu Feb 25 15:41:07 2010 -0600
@@ -9,7 +9,7 @@
<body>
<h2>Symbian OS Reference Board Launch</h2>
-<p>Use the <b>Configure launch configuration</b> pane of the <b>New Launch Configuration Wizard</b> to review or modify the project's launch configuration for the reference board using JTAG.</p>
+<p>Use the <b>Debug As</b> dialog to select the <b>New Launch Configuration Wizard</b> to create a launch configuration for a development board or reference hardware using a JTAG connection.</p>
<p align="center"><img src="images/launch_board_01.png" width="350" height="350"></p>
<p class="figure">Figure 1. Debug As dialog</p>
<div class="step">
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm Thu Feb 25 15:40:10 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configs_overview.htm Thu Feb 25 15:41:07 2010 -0600
@@ -8,7 +8,7 @@
<body>
<h2>Launch Configuration Overview</h2>
-<p>A <b>launch configuration</b> defines the operational settings used by the Carbide.c++ tools to launch and debug programs. A project must have at least one launch configuration, and can have as many as necessary. This enables you to develop and debug your project using various compilers (GCCE and RVCT) and different targets (emulator and on-device) as each launch configuration can be tailored to fit the intended target. </p>
+<p>A <b>launch configuration</b> defines the operational settings used by the Carbide.c++ tools to launch and debug programs. A project must have at least one launch configuration, and can have as many as necessary. This enables you to develop and debug your project using various compilers (GCCE and RVCT) and different targets (emulator, on-device, and reference boards) as each launch configuration can be tailored to fit the intended target. </p>
<h4>Creating a Launch Configuration </h4>
<p>To create a default launch configuration for a project use the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a>. Using this method ensures that you have a working launch configuration for the project. You can invoke the New Launch Configuration Wizard for projects lacking a launch configuration by selecting the <b>Run > Debug</b> (<span class="code">F11</span>) or<b> </b><b>Run > Run</b> (<span class="code">CTRL+F11</span>) menu options, or clicking the <b>Run</b> (<img src="../../images/icons/btn_run.png" alt="Run icon" width="16" height="16" align="absmiddle" />) or <b>Debug</b> (<img src="../../images/icons/btn_debug.png" width="17" height="16" align="absmiddle" alt="Debug icon"/>) icons in the toolbar. If a project already has a defined launch configuration, selecting the <b>Run</b> or <b>Debug</b> command calls the previously defined and last used launch configuration, bypassing the wizard entirely.</p>
<p>For emulator projects the wizard simply gathers the data it needs from the project and creates an emulator launch configuration and launches the emulator. For on-device targets, more information is required, so the wizard asks for the missing information it needs, creates the launch configuration, then downloads the executable to the device and launches it. Once the emulator or device is loaded with the executable, the debug session commences. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm Thu Feb 25 15:40:10 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_emulator.htm Thu Feb 25 15:41:07 2010 -0600
@@ -9,10 +9,25 @@
<body>
<h2>Symbian OS Emulator Launch</h2>
-<p>The following launch configuration types are available:</p>
-<h4>Other references</h4>
+<p>Use the <b>Debug As</b> dialog<b></b> to select the New Launch Configuration Wizard that will create a launch configuration for the project. </p>
+<p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
+<p class="figure">Figure 1. Debug As dialog</p>
+<div class="step">
+ <h4>Creating a Launch Configuration for an Emulator</h4>
+ <ol>
+ <li>Select the <b>Run > Debug</b> menu item, or click the Debug (<img src="../../reference/images/view_symbianOSbtn_debug.png" width="18" height="17" align="absmiddle">) icon, or press F11<br>
+ <p><b>SHORTCUT</b> Select the <b class="note">Run > Debug As > Debug Symbian OS Application on Emulator</b> menu item to skip Step 2.</p>
+ </li>
+ <li>Select the <b>Symbian OS Emulator Launch</b> item, then click <b>OK</b></li>
+ <li>Complete each page in the New Launch Configuration Wizard , then click Next</li>
+ <li>Review the settings in the <a href="wiz_new_launch_config.htm">New Launch Configuration</a> page</li>
+ <li>Click <b>Debug</b> to download and debug the project on the phone</li>
+ </ol>
+</div>
+<h5>Other references</h5>
<ul>
- <li></li>
+ <li><a href="launch_phone.htm">Symbian OS Phone Launch</a></li>
+ <li><a href="launch_board.htm">Symbian OS Reference Board Launch</a></li>
</ul>
<div id="footer">Copyright © 2010 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm Thu Feb 25 15:40:10 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_phone.htm Thu Feb 25 15:41:07 2010 -0600
@@ -9,7 +9,7 @@
<body>
<h2>Symbian OS Phone Launch</h2>
-<p>Use the <b>Configure launch configuration</b> pane of the <b>New Launch Configuration Wizard</b> to review or modify the project's launch configuration for the remote device.</p>
+<p>Use the <b>Debug As</b> dialog<b></b> to select the New Launch Configuration Wizard that will create a launch configuration for the project. </p>
<p align="center"><img src="images/launch_phone_01.png" width="350" height="350"></p>
<p class="figure">Figure 1. Debug As dialog</p>
<div class="step">
@@ -28,7 +28,7 @@
</ol>
</li>
<li>Review the launch configurations settings</li>
- <li>Click <b>Debug</b><b> to download and debug the project on the phone</b></li>
+ <li>Click <b>Debug</b> to download and debug the project on the phone</li>
</ol>
</div>
<h5>Other references</h5>
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_symbianOSbtn_debug.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/EmulatorToc.htm Thu Feb 25 15:40:10 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/EmulatorToc.htm Thu Feb 25 15:41:07 2010 -0600
@@ -1,16 +1,16 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>Classes</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>Emulator Projects </h2>
- <p>The topics include:</p>
- <ul>
- <li><a href="projects/prj_build_cmd_line.htm">Setting Environment for x86 Compiler </a></li>
- <li><a href="../reference/wnd_carbide_pref_x86.htm">Unseting Built-in Environment </a></li>
- </ul>
-<div id="footer">Copyright © 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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>Classes</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+ <h2>Emulator Projects </h2>
+ <p>The topics include:</p>
+ <ul>
+ <li><a href="projects/prj_build_cmd_line.htm">Setting Environment for x86 Compiler </a></li>
+ <li><a href="../reference/wnd_carbide_pref_x86.htm">Unsetting Built-in Environment </a></li>
+ </ul>
+<div id="footer">Copyright © 2010 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/tocCarbide.xml Thu Feb 25 15:40:10 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Thu Feb 25 15:41:07 2010 -0600
@@ -223,17 +223,28 @@
<topic href="html/tasks/debugger/view_symbian_kernel_set.htm" label="Setting the Refresh Rate"></topic>
</topic>
</topic>
- <topic label="Debugging">
- <topic href="html/projects/launch/launch_emulator.htm" label="Debugging with an emulator">
+
+ <topic label="PnP Debugging" href="html/projects/launch/pnp_debug_overview.htm" >
+ <topic label="Debugging with an emulator" href="html/projects/launch/launch_emulator.htm" >
+ <topic label="Executable Selection" href="html/projects/launch/wiz_new_launch_config.htm#EXE_SEL" />
+ <topic label="Build Options Selection" href="html/projects/launch/wiz_new_launch_config.htm#BLD_OPT" />
+ <topic label="New Launch Configuration" href="html/projects/launch/wiz_new_launch_config.htm#FINISH" />
+ <topic label="Other project options" href="html/tasks/EmulatorToc.htm">
+ <topic label="Setting Environment for x86 Compiler" href="html/tasks/projects/prj_build_cmd_line.htm" />
+ <topic label="Unsetting Built-in Environment" href="html/reference/wnd_carbide_pref_x86.htm" />
+ </topic>
</topic>
+
<topic href="html/projects/launch/launch_phone.htm" label="Debugging a phone">
+ <topic label="Configure launch configuration" href="html/projects/launch/wnd_config_launch_config.htm" />
+ <topic label="Remote connection setting" href="html/projects/launch/wnd_change_connection.htm" />
+ <topic label="Debug process settings" href="html/projects/launch/wnd_change_debug_process.htm" />
+ <topic label="Other settings" href="html/projects/launch/wnd_change_other_settings.htm" />
</topic>
+
<topic href="html/projects/launch/launch_board.htm" label="Debugging a reference board">
</topic>
- <topic label="Emulator projects" href="html/tasks/EmulatorToc.htm">
- <topic label="Setting Environment for x86 Compiler" href="html/tasks/projects/prj_build_cmd_line.htm" />
- <topic label="Unsetting Built-in Environment" href="html/reference/wnd_carbide_pref_x86.htm" />
- </topic>
+
<topic label="Run mode projects" href="html/tasks/RunModeToc.htm">
<topic label="Run Mode Overview" href="html/tasks/start/carbide_overview_trk.htm" ></topic>
<topic href="html/concepts/autotargeting.htm" label="Auto-Targeting of Executables"></topic>
--- a/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml Thu Feb 25 15:40:10 2010 -0600
+++ b/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml Thu Feb 25 15:41:07 2010 -0600
@@ -12,17 +12,11 @@
id="com.nokia.carbide.cpp.debug.cdtactivity">
</activity>
-<!-- The signals view is added to the debug perspective by CDT and therefore it
- tries to show the view no matter what. Because we hide it here it fails to
- show the view properly and gives an error. There is no way to remove it from
- the default debug perspective without modifying CDT. We'll just leave it in
- for now, it won't have any content anyway.
-
<activityPatternBinding
activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+ isEqualityPattern="true"
pattern="org.eclipse.cdt.debug.ui/org.eclipse.cdt.debug.ui.SignalsView">
</activityPatternBinding>
--->
<!-- The following UI elements are from org.eclipse.cdt.launch -->
@@ -137,6 +131,13 @@
pattern="org\.eclipse\.cdt.*/.*NewFolderDropDown">
</activityPatternBinding>
+<!-- The following UI elements are from org.eclipse.cdt.dsf.ui -->
+ <activityPatternBinding
+ activityId="com.nokia.carbide.cpp.debug.cdtactivity"
+ isEqualityPattern="true"
+ pattern="org.eclipse.cdt.dsf.ui/org.eclipse.cdt.dsf.debug.ui.disassembly.view">
+ </activityPatternBinding>
+
<!-- The following UI elements are from org.eclipse.debug.ui -->
<activityPatternBinding
activityId="com.nokia.carbide.cpp.debug.cdtactivity"