daily merge
authorfturovic <frank.turovich@nokia.com>
Wed, 09 Sep 2009 10:24:01 -0500
changeset 485 6a656b7f160f
parent 484 e6bf0f616b9a (diff)
parent 483 34f888c29813 (current diff)
child 486 852b79cf7a65
child 488 745fac120450
daily merge
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_debug_main.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_main_run_mode.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/projects/launch/images/page_main_stop_mode.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Tue Sep 08 14:52:55 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/page_main.htm	Wed Sep 09 10:24:01 2009 -0500
@@ -18,7 +18,7 @@
 <h3><a name="emulator_mode" id="emulator_mode"></a>Emulation Main page </h3>
 <p>The <b>Symbian OS <a href="emulation.htm">Emulation</a></b> launch configuration uses the <b>Main</b> page to define the process to be launched by the emulator. </p>
 <p>The behavior that occurs when launching a debug session varies based upon the <a href="page_main.htm">SDK</a>. Normally, <a href="../../debugger/debug/cmds_starting.htm">starting</a> a debug session launches the emulator (<span class="code">epoc.exe</span>) and you must then navigate to your application and open it. However, starting a debug session for an .exe file will, in most cases, launch the .exe directly. This starts the emulator and then opens your application automatically. Note that some SDKs do not support this behavior. In those cases you must still open your application in the emulator manually.</p>
-<p align="center"><img src="images/page_debug_main.png" width="627" height="243"></p>
+<p align="center"><img src="images/page_debug_main.png" width="562" height="249"></p>
 <p class="figure">Figure 1. Main page (Emulation shown) </p>
 <h5>Table 1. Emulator Main page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
@@ -35,6 +35,10 @@
     <td>The path to the emulator or executable to  launch. For Symbian OS 9.1 the emulator path is required. For Symbian OS 9.2 and later the path to the executable should be used.  Click <b>Browse</b> to select a different emulator. </td>
   </tr>
   <tr>
+    <td><b>Build Configuration</b></td>
+    <td>Use the <b>Build Configuration</b> drop down list to select which configuration to build before launching the resulting <b>Executable</b>. If <b>Use Active</b> is selected, then the build configuration currently active is built and launched, otherwise the chosen build configuration is always used.</td>
+  </tr>
+  <tr>
     <td><b>Build (if required) before launching</b></td>
     <td><p>Controls how auto build is configured for the launch configuration. Changing this setting overrides the global workspace setting and can provide some speed improvements. The options include:</p>
       <ul>
@@ -48,7 +52,7 @@
 
 <h3><a name="run_mode" id="run_mode"></a>Run-mode Main page </h3>
 <p>The <b>Symbian OS <a href="run_mode.htm">Application TRK </a></b> launch configuration uses the <b>Main</b> page to defines the project and the process to launch on the target device. </p>
-<p align="center"><img src="images/page_main_run_mode.png" width="545" height="337"></p>
+<p align="center"><img src="images/page_main_run_mode.png" width="545" height="345"></p>
 <p class="figure">Figure 2 - Main page (Application TRK shown) </p>
 <h5>Table 2.  Run-mode Main page &mdash;items </h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
@@ -75,14 +79,18 @@
     <td>Choose the remote connection type to associate with this launch configuration. Click <a href="../../reference/trk/wnd_new_conn_wiz_add.htm">New</a> to add a new connection, or <a href="../../reference/trk/wnd_new_conn_wiz_edit.htm">Edit</a> to modify the current one.</td>
   </tr>
   <tr>
+    <td><b>Build Configuration</b></td>
+    <td>See <a href="#emulator_mode">Emulation Main page</a> above.</td>
+  </tr>
+  <tr>
     <td><b>Build (if required) before launching</b></td>
     <td>See <a href="#emulator_mode">Emulation Main page</a> above.</td>
   </tr>
 </table>
 <h3><a name="stop_mode" id="stop_mode"></a>Stop-mode Main page </h3>
 <p>The <b>Symbian OS <a href="stop_mode.htm">System TRK</a>, <a href="sophia.htm">Sophia</a></b>, and <b><a href="trace32.htm">Trace32</a> </b> launch configurations uses the <b>Main</b> page to defines the project and the executable to launch on the target device. </p>
-<p align="center"><img src="images/page_main_stop_mode.png" width="603" height="337"></p>
-<p class="figure">Figure 3. Main page </p>
+<p align="center"><img src="images/page_main_stop_mode.png" width="556" height="301"></p>
+<p class="figure">Figure 3. Main page (TRACE32 shown)</p>
 <h5>Table 3. Stop-mode Main page &mdash; items</h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -103,6 +111,10 @@
     <td>See <a href="#run_mode">Run-mode Main page</a> above.</td>
   </tr>
   <tr>
+    <td><b>Build Configuration</b></td>
+    <td>See <a href="#emulator_mode">Emulation Main page</a> above.</td>
+  </tr>
+  <tr>
     <td><b>Build (if required) before launching</b></td>
     <td>See <a href="#emulator_mode">Emulation Main page</a> above.</td>
   </tr>