--- a/core/com.nokia.carbide.cpp.doc.user/book.css Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/book.css Tue Apr 20 13:08:10 2010 -0500
@@ -57,7 +57,7 @@
}
.listing {
- background-color: #ffe869;
+ background-color: #FFFFCC;
font-family: "Courier New", Courier, mono;
font-size: 1.1em;
color: #000000;
@@ -120,7 +120,7 @@
div h5, div h4 {
padding:5px 0px 5px 12px;
- background-color: #ffd62c;
+ background-color: #FFCC00;
font-weight:bold;
color: #000000;
}
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Tue Apr 20 13:08:10 2010 -0500
@@ -25,11 +25,18 @@
<li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10525">10525</a> - Raptor builds correctly report an error of a missing header file and not the input source file itself. </li>
<li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10591">10591</a> - Carbide now recognizes the Symbian ^3 SDK and supplies the proper templates and build configurations. </li>
<li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10659">10659</a> - Updated x86 WINSCW tools to build 489. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10674">10674</a> - Resolved an issue where SBSv2 variant names where not parsed and located correctly. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10681">10681</a> - Carbide is now more robust in automatically detecting Qt installations. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10742">10742</a> - SBSv2 now always appears as a build option and now displays appropriate errors if the SBS_HOME environment variable is missing.</li>
<li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10743">10743</a> - Corrected an issue that prevented compiling of files with different case handling of file names across different OS systems. </li>
<li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10759">10759</a> - Corrected an issue where a remote connection was not removed from the Remote Connections view when the device was no longer connected. </li>
<li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10795">10795</a> - Carbide detection of Symbian^3 SDKs is now more robust. </li>
<li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10805">10805</a> - Improved device connection behavior when devices are plugged and unplugged or when devices are swapped making notification message more reliable. </li>
<li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10861">10861</a> - Launch wizard can no longer automatically select DLLs as the executable.</li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=10967">10967</a> - Resolved an issue where use of the hyphen character (-) in a file name was not recognized as a valid character. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11022">11022</a> - Carbide no longer relies on the <span class="code">SBS_HOME</span> environment variable being present to work with Raptor builds.</li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11072">11072</a> - Fixed an indentation issue that added additional tabs after typing <enter>. </li>
+ <li><a href="https://xdabug001.ext.nokia.com/bugzilla/show_bug.cgi?id=11096">11096</a> - Resolved a crasher where the number of binaries being debugged exceeded the stop-mode limit allowed.</li>
</ul>
<h3><a name="bugs250" id="bugs9"></a>Bugs Fixed in v2.5.0</h3>
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/AIFDefWizard.html Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/AIFDefWizard.html Tue Apr 20 13:08:10 2010 -0500
@@ -64,7 +64,7 @@
<li><a href="../reference/AIFEditor.html">AIF Editor</a></li>
<li><a href="../reference/MMP_Editor.html">MMP Editor</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/arm_registers.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/arm_registers.htm Tue Apr 20 13:08:10 2010 -0500
@@ -33,7 +33,7 @@
<ul>
<li><a href="../reference/view_registers.htm">View Registers</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm Tue Apr 20 13:08:10 2010 -0500
@@ -60,7 +60,7 @@
<li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
<li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Clearing Breakpoints</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml Tue Apr 20 13:08:10 2010 -0500
@@ -27,14 +27,20 @@
<context id="project_properties_page" >
<description>Use the Carbide Project Settings window to specify project build options.</description>
<topic label="Carbide Project Settings" href="html/reference/build_properties/pane_project_settings.htm" />
+ <topic label="Carbide Build Configurations" href="html/reference/build_properties/pane_build_config.htm" />
+ <topic label="Macro Settings" href="html/reference/build_properties/pane_macro_settings.htm" />
<topic label="Building Projects" href="html/tasks/projects/prj_build.htm" />
- <topic label="Carbide Build Configurations" href="html/reference/build_properties/pane_build_config.htm" />
</context>
<!-- Carbide Build Configurations Page -->
<context id="project_configurations_page" >
<description>The Carbide Build Configurations page allows you to specify SIS file options and environment variable settings for the selected build configuration</description>
<topic label="Carbide Build Configurations" href="html/reference/build_properties/pane_build_config.htm" />
+ <topic label="SIS Builder" href="html/reference/build_properties/pane_build_config_sis.htm" />
+ <topic label="SBSv2" href="html/reference/build_properties/pane_build_config_sbsv2.htm" />
+ <topic label="Environment" href="html/reference/build_properties/pane_build_config_env.htm" />
+ <topic label="Paths and Symbols" href="html/reference/build_properties/pane_build_config_paths.htm" />
+ <topic label="ROM Builder" href="html/reference/ROM_build_settings.html" />
<topic label="Carbide Build Configurations Manage SDK" href="html/reference/ProjectTypeandSDK.html" />
<topic label="Environment Variables" href="html/reference/build_properties/pane_build_config_env.htm" />
</context>
@@ -130,11 +136,13 @@
</context>
<!-- Carbide Project Settings Page -->
+ <!-- DUPLICATE DEFINITION
<context id="project_properties_page" >
<description>Project Properties page</description>
<topic label="Project Properties page" href="html/tasks/ImportingProjects.html" />
<topic label="Importing Projects" href="html/tasks/ImportingProjects.html" />
</context>
+ -->
<!-- Choose Project Page -->
<context id="choose_project_page" >
--- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml Tue Apr 20 13:08:10 2010 -0500
@@ -310,6 +310,16 @@
<topic label="Console view" href="html/reference/view_log.htm" />
</context>
+
+ <!-- ============================================================== -->
+ <!-- PROJECT PROPERTY DIALOG -->
+ <context id="property_dialog_context" >
+ <description>Carbide specific project settings.</description>
+ <topic label="Carbide Build Configurations" href="html/reference/build_properties/pane_build_config.htm" />
+ <topic label="Macro Settings" href="html/reference/build_properties/pane_macro_settings.htm" />
+ <topic label="Project Settings" href="html/reference/build_properties/pane_project_settings.htm" />
+ </context>
+
<!-- PREFERENCE PANELS -->
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm Tue Apr 20 13:08:10 2010 -0500
@@ -19,6 +19,6 @@
<ul>
<li><a href="variables.htm">Variables and Expressions Overview</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm Tue Apr 20 13:08:10 2010 -0500
@@ -14,6 +14,6 @@
<ul>
<li><a href="launch_configs_overview.htm">Launch Configuration Overview</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm Tue Apr 20 13:08:10 2010 -0500
@@ -21,7 +21,7 @@
<li>The <a href="page_debugger.htm">Debugger</a> tab defines debug configurations, such as entry point to begin debugging, target options, and instruction set.</li>
<li>The <a href="page_rom_log.htm">ROM Log </a> tab allows you to specify where the ROM log file is stored and the <span class="code">Epoc32</span> directory.</li>
<li>The <a href="page_executables.htm">Executables</a> tab allows you to specify which executables that you want to debug that are part of the project.</li>
- <li>The <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> tab (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
+ <li>The <a href="../../reference/trk/wnd_new_connection_wizard.htm">Source</a> tab (<i>standard CDT page</i>) defines the location of source files used to display source when debugging an application. By default, these settings are derived from the associated project's build path. You may override these settings here. </li>
<li>The <a href="wiz_new_launch_config.htm">Common</a> tab (<i>standard CDT page</i>) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.</li>
</ul>
<h4>Other references</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm Tue Apr 20 13:08:10 2010 -0500
@@ -4,27 +4,26 @@
<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>Launch Configuration Filters</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<title>Launch Configuration Filtering</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
</head>
<body bgcolor="#FFFFFF">
-<h2>Launch Configuration Filters</h2>
-<p>Use the <b>Launch Configurations</b> panel to filter out which launch configurations appear in the <b>Run</b> or <b>Debug</b> window used to define launch configurations. For example, select the <b>Delete configurations when associated resource is deleted</b> option and check the configuration types that you do not want to appear in the <b>Run > Run...</b> or <b>Run > Debug...</b> window, as shown in Figure 1. </p>
-<p align="center"><img src="images/filter_launch_config.png" width="627" height="557" /></p>
-<p class="figure">Figure 1 - Launch Configurations preference panel</p>
+<h2>Launch Configuration Filtering </h2>
+<p>Use the <b>Launch Configuration </b> preference panel to filter the launch configurations that appear in the configurations list in the <b>Run</b> or <b><a href="wnd_debug_configuration.htm">Debug</a></b> dialog. This allows you to manage which configuration types are shown. For example, enable the <b>Filter checked launch configuration types</b> option and check the configuration types that you do not want to appear in the <b>Run</b> and <b>Debug</b> dialogs. As shown in Figure 1, all the configurations related to TRK have been enabled and won't appear in the configurations list. </p>
+<p align="center"><img src="images/filter_launch_config.png" width="627" height="574" /></p>
+<p class="figure">Figure 1 - Launch Configurations preference panel </p>
<h5>Related references</h5>
<ul>
- <li><a href="../reference/wnd_debug_configuration.htm">Debug Window</a> </li>
+ <li><a href="wnd_debug_configuration.htm">Debug Window</a> </li>
</ul>
<h5>Related tasks </h5>
<ul>
- <li><a href="../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
- <li><a href="../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
- <li><a href="../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
+ <li><a href="../../tasks/projects/prj_debug_config.htm">Creating a Launch Configuration</a></li>
+ <li><a href="../../tasks/projects/prj_new_build_config.htm">Adding/Removing Build Configurations</a></li>
+ <li><a href="../../tasks/projects/prj_set_build_tgt.htm">Setting a Build Configuration </a></li>
</ul>
<div class="step">
<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>
-
</div>
</body>
</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm Tue Apr 20 13:08:10 2010 -0500
@@ -20,9 +20,9 @@
<li><a href="page_rom_image.htm">ROM Image</a></li>
<li><a href="page_rom_log.htm">ROM Log</a></li>
<li><a href="page_exceptions.htm">x86 Exceptions</a></li>
- <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_run_dbg_srce.htm">Source</a> (<i>standard CDT page</i>) </li>
+ <li><a href="../../reference/trk/wnd_new_connection_wizard.htm">Source</a> (<i>standard CDT page</i>) </li>
<li><a href="wiz_new_launch_config.htm">Common</a> (<i>standard CDT page</i>) </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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/AIFEditor.html Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/AIFEditor.html Tue Apr 20 13:08:10 2010 -0500
@@ -91,7 +91,7 @@
<ul>
<li><a href="../tasks/AppInfoFile.html">Creating an AIF File</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>
+ <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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm Tue Apr 20 13:08:10 2010 -0500
@@ -11,7 +11,7 @@
<body bgcolor="#FFFFFF">
<h2>Carbide Build Configurations </h2>
<p>Use the <b>Carbide Build Configurations</b> panel to specify the project's <a href="../../concepts/build_configurations.htm">active build configuration</a> and its related build properties. </p>
-<p align="center"><img src="../images/carbide_build_config.png" width="778" height="675" /></p>
+<p align="center"><img src="../images/carbide_build_config.png" width="795" height="692" /></p>
<p class="figure">Figure 1 - Carbide Build Configurations panel </p>
<h5>Table 1 Carbide Build Configuration items </h5>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -32,17 +32,12 @@
<td><p>The <a href="pane_build_config_sis.htm">SIS Builder</a> pane is used to specify a .pkg file and .sis file options to create an application .sis file. These settings apply to the currently selected Configuration.</p></td>
</tr>
<tr>
- <td><b>Environment</b></td>
- <td><p>The <a href="pane_build_config_env.htm">Environment</a> tab allows you to view the current User and System environment variables that will be used when any abld command is invoked.</p></td>
+ <td><b>SBSv2</b></td>
+ <td>The <a href="pane_build_config_sbsv2.htm">SBSv2</a> pane is used to define which build configuration variant to use.</td>
</tr>
<tr>
- <td><b>Arguments</b></td>
- <td><p>The <a href="pane_build_config_args.htm">Arguments</a> tab allows you to add additional arguments to common build commands used by Carbide during the build process including: </p>
- <ul>
- <li>Bldmake Arguments</li>
- <li>Abld Arguments</li>
- </ul>
- <p>See the Symbian OS documentation for a specific command for a complete list of valid arguments. </p></td>
+ <td><b>Environment</b></td>
+ <td><p>The <a href="pane_build_config_env.htm">Environment</a> tab allows you to view the current User and System environment variables that will be used when any abld command is invoked.</p></td>
</tr>
<tr>
<td><b>Paths and Symbols </b></td>
@@ -56,11 +51,12 @@
<h5>Other references</h5>
<ul>
<li><a href="pane_build_config.htm">SIS Builder</a></li>
+ <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
<li><a href="../../concepts/build_configurations.htm">Active Configuration</a></li>
<li><a href="../../tasks/projects/prj_build.htm">Building Projects</a></li>
<li><a href="../../tasks/projects/working_with_sis_pkg_files.htm">Creating a .PKG file</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>
+<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/html/reference/build_properties/pane_build_config_env.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm Tue Apr 20 13:08:10 2010 -0500
@@ -16,7 +16,7 @@
<li><span class="code">PATH</span> — will always place "<span class="code">${EPOCROOT}\epoc32\tools;${EPOCROOT}\epoc32\gcc\bin;</span>" at the front of the <span class="code">PATH</span> regardless of what it is changed to </li>
<li><span class="code">PATH</span>, <span class="code">EPOCROOT</span>, and <span class="code">*MW</span> variables — <span class="note">cannot be undefined as they are required for system builds</span></li>
</ul>
-<p align="center"><img src="../images/page_build_config_env.png" width="558" height="456"></p>
+<p align="center"><img src="../images/page_build_config_env.png" width="575" height="473"></p>
<p class="figure">Figure 1 - Environment Variables</p>
<h5>Table 1 Environment variable items</h5>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -53,8 +53,9 @@
<ul>
<li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
<li><a href="pane_build_config.htm">SIS Builder</a></li>
- <li><a href="pane_build_config_args.htm">Arguments</a></li>
+ <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
<li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
+ <li><a href="../ROM_build_settings.html">ROM Builder</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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm Tue Apr 20 13:08:10 2010 -0500
@@ -17,14 +17,15 @@
<li>Using the Macro File defined in the <a href="pane_macro_settings.htm">Carbide Macro Settings</a> panel </li>
</ul>
<p>You can also specify a macro file using the <a href="pane_macro_settings.htm">Carbide Macro Settings</a> page in the <b>Properties for <i>project</i></b> dialog. </p>
-<p align="center"><img src="../images/page_build_config_paths.png" width="558" height="456"></p>
+<p align="center"><img src="../images/page_build_config_paths.png" width="575" height="473"></p>
<p class="figure">Figure 1 - Paths and Symbols pane </p>
<h5>Other references </h5>
<ul>
<li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
<li><a href="pane_build_config.htm">SIS Builder</a></li>
+ <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
<li><a href="pane_build_config_env.htm">Environment</a></li>
- <li><a href="pane_build_config_args.htm">Arguments</a></li>
+ <li><a href="../ROM_build_settings.html">ROM Builder</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>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sbsv2.htm Tue Apr 20 13:08:10 2010 -0500
@@ -0,0 +1,43 @@
+<!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" />
+<meta name="keywords" content="abld, abld build, abld export, abld makefile, abld library, abld resource, abld target, abld final, abld clean, abld freeze, bldmake, bldmake bldfiles, bldmake clean" >
+<title>SBSv2 page</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>SBSv2 page </h2>
+<p> The <b>SBSv2 </b> pane allows you to define which build configuration variant to use when building a project. This tab is only visible for SBSv2 projects. The possible variants are listed in the <span class="code">variant_configs.xml</span> file.</p>
+<p class="note"><b>WARNING</b> The project's MMP file must include the <span class="code">FEATUREVARIANT</span> settings.</p>
+<p align="center"><img src="../images/carbide_build_config_sbsv2.png" width="558" height="242"></p>
+<p class="figure">Figure 1 - SBSv2 pane</p>
+<h5>Table 1 SBSv2 items</h5>
+<table width="100%" border="0" cellpadding="2" cellspacing="0">
+ <tr>
+ <th width="29%" scope="col">Item</th>
+ <th width="57%" scope="col">Explanation</th>
+ </tr>
+ <tr>
+ <td><b>Apply variant to build configuration</b></td>
+ <td><p>Enter build configuration variant name. Names must start with a "." (period) to be identified as a variant.</p> </td>
+ </tr>
+ <tr>
+ <td><b>Build Details</b></td>
+ <td>Shows the command line sent to make and the destination of the output based on the variant name specified.</td>
+ </tr>
+</table>
+<h5>Other references </h5>
+<ul>
+ <li><a href="pane_build_config.htm">Carbide Build Configurations</a></li>
+ <li><a href="pane_build_config.htm">SIS Builder</a></li>
+ <li><a href="pane_build_config_env.htm">Environment</a></li>
+ <li><a href="pane_build_config_paths.htm">Paths and Symbols </a></li>
+ <li><a href="../ROM_build_settings.html">ROM Builder</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/html/reference/build_properties/pane_build_config_sis.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm Tue Apr 20 13:08:10 2010 -0500
@@ -17,7 +17,7 @@
<li><b>Unsigned SIS file</b> - names of the unsigned SIS files used by the project </li>
<li><b>Signed SIS file</b> - names of the signed SIS files created by the project </li>
</ul>
-<p align="center"><img src="../images/carbide_build_config.png" width="778" height="675" /></p>
+<p align="center"><img src="../images/carbide_build_config.png" width="795" height="692" /></p>
<p class="figure">Figure 1 - SIS Builder pane</p>
<h5>Table 1 <span class="figure">SIS Builder</span> items </h5>
<table width="100%" border="0" cellpadding="2" cellspacing="0">
@@ -59,9 +59,10 @@
<h5>Other references</h5>
<ul>
<li><a href="pane_build_config.htm">Carbide Build Configurations </a><a href="../../tasks/projects/working_with_sis_pkg_files.htm"></a></li>
+ <li><a href="pane_build_config_sbsv2.htm">SBSv2</a></li>
<li><a href="pane_build_config_env.htm">Environment</a></li>
- <li><a href="pane_build_config_args.htm">Arguments</a></li>
<li><a href="pane_build_config_paths.htm">Paths and Symbols</a></li>
+ <li><a href="../ROM_build_settings.html">ROM Builder</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>
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_build_config_sbsv2.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/indexer.html Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/indexer.html Tue Apr 20 13:08:10 2010 -0500
@@ -4,9 +4,9 @@
</head>
<body>
<h2>Indexer</h2>
-<p>The C/C++ indexer uses the parser to create a database of your source and header files that provides the basis for C/C++ search, navigation features and content assist. The goal of indexing is to record all named elements in a project's source code and store them with their related data. The indexer parses each source file in your project and updates related indexes. By indexing your files with the indexer, useful features such as code completion and fast file search can be used. It is also possible to specify different indexer settings for each project in your workspace.</p>
- <p>If you choose to perform the Full C/C++ Indexer option the indexer will consume the CPU for some time, but you will gain more benefit from the process after it completes.
- However, if you do not require the benefits of indexing your project, select the No Indexer option to speed up the process of building your project.</p>
+<p>The C/C++ <b>Indexer</b> uses the parser to create a database of source and header files that provide the basis for C/C++ search, navigation features and content assist. The goal of indexing is to record all named elements in a project's source code and store them with their related data. The indexer parses each source file in your project and updates related indexes. By indexing your files with the indexer, useful features such as code completion and fast file search can be used. It is also possible to specify different indexer settings for each project in your workspace.</p>
+ <p>If you choose to perform the <b>Full C/C++ Indexer </b>option the indexer will consume the CPU for some time, but you will gain more benefit from the process after it completes.
+ However, if you do not require the benefits of indexing your project, select the <b>No Indexer</b> option to speed up the process of building your project.</p>
<p>The indexer runs on a background thread and reacts to resource change events such as:</p>
<ul>
<li>C/C++ project creation/deletion</li>
@@ -14,24 +14,23 @@
<li>File imports</li>
<li> Source file content changes</li>
</ul>
- <p>The Preferences Indexer can be accessed by selecting Window > Preferences then expanding the C/C++ group and selecting Indexer (figure 1). The Project Properties Indexer can be accessed by selecting a project in the C/C++ Projects or Symbian Project Navigator view and selecting Project > Properties, then select C/C++ Indexer (figure 2).</p>
- <p class="note"><b>NOTE</b> You can also rebuild a project's index by selecting a project, right-click to display the context menu and select <b>Rebuild Index</b>. </p>
- <p align="center" class="Image"><img src="images/indexer.png" width="663" height="439" /></p>
+ <p>The global <b>Indexer</b> is accessed by selecting <b>Window > Preferences > C/C++ > Indexer</b> (figure 1). The sections outlined in red appear as part of the project level indexer.</p>
+ <p class="note"><b>NOTE</b> You can also rebuild a project's index by selecting a project, then right-click and select the <b>Rebuild Index</b> menu item. </p>
+ <p align="center" class="Image"><img src="images/indexer.png" width="627" height="704" /></p>
<p align="left" class="figure">Figure 1 - Indexer Window in Preferences Panels</p>
- <p align="left" class="Image"> </p>
- <p align="center" class="Image"><img src="images/indexer_prop.png" width="616" height="392" /></p>
- <p align="left" class="figure">Figure 2 - Indexer Window in Project Properties</p>
- <p align="left" class="Image"> </p>
+ <p align="left" class="Image">The project indexer is accessed by selecting a project in the Project Explorer or Symbian Project Navigator view and selecting <b>Project > Properties > C/C++ General > Indexer</b> (figure 2).</p>
+ <p align="center" class="Image"><img src="images/indexer_prop.png" width="682" height="579" /></p>
+ <p align="left" class="figure">Figure 2 - Indexer Window in Project Properties </p>
<table cellpadding="2" cellspacing="0"
border="0">
<tr valign="top"><th width="221" class="Cell">Name</th><th width="558" class="Cell">Function</th></tr>
<tr valign="top">
- <td class="Cell"><b>Available indexers </b></td>
+ <td class="Cell"><b>Select indexer </b></td>
<td class="Cell"><p>Dropdown list of available index options.</p>
<ul>
- <li>No Indexer - Project source files will not be indexed, therefore search features will not work accurately and code completion will not be available.</li>
<li>Fast C/C++ Indexer - Source files will be indexed and eat up a lot of CPU time and memory during the first generation of the indexer. This can take some time depending on the size of your project. Afterwards the indexer will only reindex the relevant parts you changed in your code and not the whole source tree.</li>
<li>Full C/C++ Indexer - Performs a complete parse of all source files and takes up the most amount of time to complete.</li>
+ <li>No Indexer - Project source files are not indexed, therefore search features will not work accurately and code completion will not be available.</li>
</ul></td>
</tr>
<tr valign="top">
@@ -61,7 +60,7 @@
<li><a href="../tasks/projects/prj_debug_config.htm">Creating Launch Configurations</a></li>
<li><a href="../tasks/projects/prj_new_build_config.htm">Creating Build Configurations</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm Tue Apr 20 13:08:10 2010 -0500
@@ -40,7 +40,7 @@
<li><a href="../../reference/wnd_debug_configuration.htm">Debug Window </a></li>
<li><a href="../../reference/view_symbian_kernel.htm">Symbian OS View</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>
+<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>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Tue Apr 20 11:17:10 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Tue Apr 20 13:08:10 2010 -0500
@@ -97,6 +97,7 @@
<topic label="SIS Builder" href="html/reference/build_properties/pane_build_config_sis.htm" >
<topic label="SIS Properties" href="html/reference/build_properties/wnd_sis_properties.htm" />
</topic>
+ <topic label="SBSv2" href="html/reference/build_properties/pane_build_config_sbsv2.htm" />
<topic label="Environment" href="html/reference/build_properties/pane_build_config_env.htm" />
<topic label="Arguments" href="html/reference/build_properties/pane_build_config_args.htm" />
<topic label="Paths and Symbols" href="html/reference/build_properties/pane_build_config_paths.htm" />
@@ -341,6 +342,7 @@
<topic label="Troubleshooting" href="html/tasks/trk/trk_troubleshooting.htm"/>
</topic>
+
<topic href="html/reference/search/wnd_system_search.htm" label="System Search">
<topic label="System Search view" href="html/reference/search/view_system_search.htm" />
<topic label="System Search preferences" href="html/reference/search/wnd_system_search_prefs.htm" />
