--- a/core/com.nokia.carbide.cpp.doc.user/book.css Fri Aug 06 08:56:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/book.css Fri Aug 06 10:58:40 2010 -0500
@@ -12,7 +12,7 @@
/* 20091007 added verdana and ariel to list to match SFO website fonts choices */
body, p, table, li {
font-family: Verdana, Ariel, Helvetica, sans-serif;
- font-size: 0.9em;
+ font-size: 1.0em;
font-weight: normal;
}
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html Fri Aug 06 08:56:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor.html Fri Aug 06 10:58:40 2010 -0500
@@ -7,11 +7,11 @@
<h2>INF Editor - Overview Tab</h2>
<p>
- The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's .INF file. You can view the .inf file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
+ The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's <span class="code">.INF</span> file. You can view the <span class="code">.INF</span> file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
<p>
The INF Editor is shown when an INF file is
opened from the <a href="view_proj_explorer.htm">Project Explorer</a> view or <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
- <p align="center"><img src="images/inf_editor_overview.png" width="656" height="563" /></p>
+ <p align="center"><img src="images/inf_editor_overview.png" width="727" height="626" /></p>
<p align="left" class="figure">Figure 1 - INF Editor</p>
<p></p>
<table cellpadding="2" cellspacing="0"
@@ -22,14 +22,14 @@
<p>
Add components such as MMP and make files to be part of the normal build process.</p>
<ul>
- <li>Create New MMP File - creates a new MMP file at the bottom of the Component list.</li>
- <li>Add Existing MMP File - imports a MMP file at the bottom of the Component list.</li>
- <li>Add Existing Makefile - adds a make file to the bottom of the Component list. </li>
- <li>Edit - Select a component and click Edit to apply the Tidy attribute or specify the Build as ARM option.</li>
- <li>Open - Select a component and click Open to open the component in an editor window.</li>
- <li>Up - Select a component and click Up to move the component up in the list.</li>
- <li>Down - Select a component and click Down to move the component down in the list.</li>
- <li>Remove - Select a component and click Remove to remove the component from the build process.</li>
+ <li><a href="NewMMP_wizard.html">Create New MMP File</a> - creates a new MMP file at the bottom of the Component list.</li>
+ <li><a href="INF_Editor_addedit_mmp.html">Add Existing MMP File</a> - imports a MMP file at the bottom of the Component list.</li>
+ <li><a href="INF_Editor_addedit_make.html">Add Existing Makefile</a> - adds a smake file to the bottom of the Component list. </li>
+ <li><a href="INF_Editor_addedit_mmp.html">Edit</a> - Select a component and click Edit to apply the Tidy attribute or specify the Build as ARM option.</li>
+ <li><a href="INF_Editor_file.html">Open</a> - Select a component and click Open to open the component in an editor window.</li>
+ <li><strong>Up</strong> - Select a component and click Up to move the component up in the list.</li>
+ <li><strong>Down</strong> - Select a component and click Down to move the component down in the list.</li>
+ <li><strong>Remove</strong> - Select a component and click Remove to remove the component from the build process.</li>
</ul></td></tr><tr valign="top"><td class="Cell">
<p>
<b>Test Components</b>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_make.html Fri Aug 06 08:56:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_make.html Fri Aug 06 10:58:40 2010 -0500
@@ -1,47 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>INF Editor - Create/Edit Make</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>INF Editor - Create / Edit Makefile Entry</h2>
-
- <p align="left">The <b>Add Makefile entry</b> dialog (figure 1) is used to add a makefile to the build process. Enter or browse to the make file in the File path field and, if desired, apply the Tidy attribute or specify the Build as ARM option to the make file. </p>
- <p align="center"><img src="images/inf_editor_addMake.png" width="600" height="210" /></p>
- <p align="left" class="figure">Figure 1 - Add/Edit makefile entry</p>
- <h5>Table 1. Add/Edit Makefile entry — items</h5>
- <table width="796"
-border="0" cellpadding="2" cellspacing="0">
- <tr valign="top">
- <th width="186" class="Cell">Name</th>
- <th width="600" class="Cell">Function</th>
- </tr>
- <tr valign="top">
- <td class="Cell"><p> <b>File path</b></p></td>
- <td class="Cell"><p>Type the path and filename for the makefile to create or click Browse to set a path.</p> </td>
- </tr>
- <tr valign="top">
- <td class="Cell"><p><b>Tidy</b> </p></td>
- <td class="Cell"><p>Specify the tidy attribute if the release that an .mmp file defines is internal to your component and not required by other components or for your component to execute.</p></td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Build as ARM</b></td>
- <td class="Cell">Specifies the <span class="code">build_as_arm</span> statement, which instructs an ARMV5 build to build the project for the ARM instruction set and not the THUMB instruction set.</td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Makefile format</b></td>
- <td class="Cell">Set the format of the makefile to be created.</td>
- </tr>
- </table>
- <h5>Other references</h5>
- <ul>
- <li><a href="INF_Editor.html">INF Editor</a></li>
- <li><a href="INF_Editor_exports.html">INF Editor - Exports</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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head>
+<title>INF Editor - Create/Edit Make</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+ <h2>INF Editor - Create / Edit Makefile Entry</h2>
+
+ <p align="left">The <b>Add Makefile entry</b> dialog (figure 1) is used to add a makefile to the build process. Enter or browse to the make file in the File path field and, if desired, apply the Tidy attribute or specify the Build as ARM option to the make file. </p>
+ <p align="center"><img src="images/inf_editor_addMake.png" width="600" height="210" /></p>
+ <p align="left" class="figure">Figure 1 - Add/Edit makefile entry</p>
+ <h5>Table 1. Add/Edit Makefile entry — items</h5>
+ <table width="796"
+border="0" cellpadding="2" cellspacing="0">
+ <tr valign="top">
+ <th width="186" class="Cell">Name</th>
+ <th width="600" class="Cell">Function</th>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><p> <b>File path</b></p></td>
+ <td class="Cell"><p>Type the path and filename for the makefile to create or click <strong>Browse</strong> to set a path.</p> </td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><p><b>Tidy</b> </p></td>
+ <td class="Cell"><p>Specify the tidy attribute if the release that an <span class="code">.mmp</span> file defines is internal to your component and not required by other components or for your component to execute.</p></td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><b>Build as ARM</b></td>
+ <td class="Cell">Specifies the <span class="code">build_as_arm</span> statement, which instructs an ARMV5 or later build to build the project for the ARM instruction set and not the THUMB instruction set.</td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><b>Makefile format</b></td>
+ <td class="Cell">Set the format of the makefile to be created.</td>
+ </tr>
+ </table>
+ <h5>Other references</h5>
+ <ul>
+ <li><a href="INF_Editor.html">INF Editor</a></li>
+ <li><a href="INF_Editor_exports.html">INF Editor - Exports</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/INF_Editor_addedit_mmp.html Fri Aug 06 08:56:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/INF_Editor_addedit_mmp.html Fri Aug 06 10:58:40 2010 -0500
@@ -1,43 +1,47 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html><head>
-<title>INF Editor - Add/Edit MMP</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
- <body>
- <h2>INF Editor - Add / Edit MMP File Entry</h2>
-
- The <b>Add MMP file entry</b> dialog (figure 1) is used to add a mmp file and, if desired, apply the Tidy attribute or specify the Build as ARM option to the mmp file.
- <p align="center"><img src="images/inf_editor_addMMP.png" width="600" height="180" /></p>
- <p align="left" class="figure">Figure 1 - Add MMP File Entry</p>
- <h5>Table 1. Add MMP file entry — items</h5>
- <table width="796"
-border="0" cellpadding="2" cellspacing="0">
- <tr valign="top">
- <th width="186" class="Cell">Name</th>
- <th width="600" class="Cell">Function</th>
- </tr>
- <tr valign="top">
- <td class="Cell"><p> <b>File path</b></p></td>
- <td class="Cell"><p>Type the path and filename for the MMP file to create or click Browse to set a path.</p></td>
- </tr>
- <tr valign="top">
- <td class="Cell"><p><b>Tidy</b> </p></td>
- <td class="Cell"><p>Specify the tidy attribute if the release that an .mmp file defines is internal to your component and not required by other components or for your component to execute.</p></td>
- </tr>
- <tr valign="top">
- <td class="Cell"><b>Build as ARM</b></td>
- <td class="Cell">Specifies the <span class="code">build_as_arm</span> statement, which instructs an ARMV5 build to build the project for the ARM instruction set and not the THUMB instruction set.</td>
- </tr>
- </table>
- <h5>Other references</h5>
- <ul>
- <li><a href="INF_Editor.html">INF Editor</a> </li>
- <li><a href="INF_Editor_exports.html">INF Editor - Exports</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>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html><head>
+<title>INF Editor - Add/Edit MMP</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+ <body>
+ <h2>INF Editor - Add / Edit MMP File Entry</h2>
+
+ The <b>Add MMP File Entry</b> dialog (figure 1) is used to add a mmp file and apply the Tidy, Manual, and Support attributes.
+ <p align="center"><img src="images/inf_editor_addMMP.png" width="600" height="200" /></p>
+ <p align="left" class="figure">Figure 1 - Add MMP File Entry</p>
+ <h5>Table 1. Add MMP file entry — items</h5>
+ <table width="796"
+border="0" cellpadding="2" cellspacing="0">
+ <tr valign="top">
+ <th width="186" class="Cell">Name</th>
+ <th width="600" class="Cell">Function</th>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><p> <b>File path</b></p></td>
+ <td class="Cell"><p>Type the path and filename for the MMP file to create or click Browse to set a path.</p></td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><p><b>Tidy</b> </p></td>
+ <td class="Cell"><p>Specify the tidy attribute if the release that an .mmp file defines is internal to your component and not required by other components or for your component to execute.</p></td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><strong>Manual</strong></td>
+ <td class="Cell">Checkmark to indicate a test that requires manual interaction to complete.</td>
+ </tr>
+ <tr valign="top">
+ <td class="Cell"><strong>Support</strong></td>
+ <td class="Cell">Checkmark to not include the test in a batch file.</td>
+ </tr>
+ </table>
+ <h5>Other references</h5>
+ <ul>
+ <li><a href="INF_Editor.html">INF Editor</a> </li>
+ <li><a href="INF_Editor_exports.html">INF Editor - Exports</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
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/inf_editor_addMMP.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/inf_editor_addMake.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/inf_editor_overview.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_sdk_preference.html Fri Aug 06 08:56:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/pref_carb_sdk_preference.html Fri Aug 06 10:58:40 2010 -0500
@@ -10,12 +10,13 @@
color: #FF0000;
font-weight: bold;
}
+.style3 {color: #EE0000}
-->
</style>
</head>
<body>
<div class="Head1">
-<h2>SDK Preferences</h2>
+<h2>SDK Preferences (<span class="style3">deprecated</span>)</h2>
</div>
Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.window.preferences(preferencePageId=com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage)")'>
SDK Preferences</a> page in the <b>Preferences</b> window to control which installed SDKs are available to projects during an import. To
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm Fri Aug 06 08:56:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/start/carbide_requirements.htm Fri Aug 06 10:58:40 2010 -0500
@@ -49,7 +49,7 @@
</tr>
<tr>
<th scope="row">Operating System </th>
- <td><p>Microsoft® Windows® XP (Service Pack 2/3) recommended, Microsoft® Windows® Vista® and Microsoft® Windows® 7 supported </p>
+ <td><p>Microsoft® Windows® XP (Service Pack 2/3) recommended, Microsoft® Windows® 7 supported </p>
<p class="note"><b>NOTE</b> While Carbide.c++ supports many different OS configurations, only the ones listed here provide for optimal Symbian development. </p>
<p class="note"><b>NOTE</b> If you experience any VM issues, see the <a href="../../hints_tips.htm#VMissues">Tips & Hints</a> page for info on modifying Carbide's default memory setup. </p></td>
</tr>
@@ -65,7 +65,7 @@
</ul>
<ul>
<li>Symbian, S60 platform, and S60 device SDKs <ul><li><a href="http://www.forum.nokia.com/info/sw.nokia.com/id/ec866fab-4b76-49f6-b5a5-af0631419e9c/S60_All_in_One_SDKs.html">Symbian ^3</a></li>
- <li>S60 5th Editio</li>
+ <li>S60 5th Edition</li>
</ul>
</li>
</ul>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Fri Aug 06 08:56:53 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Fri Aug 06 10:58:40 2010 -0500
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<?NLS TYPE="org.eclipse.help.toc"?>
+
<toc label="Introduction" href="html/concepts/Introduction.html" >
<topic label="Carbide.c++ Overview" href="html/tasks/start/carbide_overview.htm" >
<topic href="html/tasks/start/carbide_requirements.htm" label="System Requirements">
@@ -17,8 +18,8 @@
<topic label="Supported Target Types" href="html/concepts/build_targets.htm" />
<topic label="Supported SDKs" href="html/sos_references.htm" />
<topic label="Updating Carbide" href="html/tasks/start/carbide_updating.htm" />
- <topic label="Concepts" href="html/concepts/concepts.htm" />
</topic>
+ <topic label="Concepts" href="html/concepts/concepts.htm" />
<topic label="Carbide tutorials">
<topic label="Emulator Application Projects" href="html/projects/tutorials/new_proj_from_template_00.htm" >
<topic label="Creating new projects from templates" href="html/projects/tutorials/new_proj_from_template_01.htm" />
@@ -107,9 +108,9 @@
<topic label="Build" href="html/reference/pref_carb_build.htm" />
<topic label="Debugger" href="html/reference/pref_carb_debugger.htm" />
<topic label="Diagnostic Logs" href="html/reference/pref_carb_diagnostic_logs.htm" />
- <topic label="Platform Filtering Preferences" href="html/tasks/sdks/sdk_platform_filter.htm" />
+ <topic label="Symbian Filtering Preferences" href="html/tasks/sdks/sdk_platform_filter.htm" />
<topic label="Preprocess" href="html/reference/pref_carb_preprocess.htm" />
- <topic label="SDK Preferences" href="html/reference/pref_carb_sdk_preference.html" />
+ <topic label="SDK Preferences (deprecated)" href="html/reference/pref_carb_sdk_preference.html" />
<topic label="Symbian SDKs" href="html/reference/pref_carb_symbian_sdk.htm" />
<topic label="Code Styles" href="html/reference/pref_cpp_code_style.htm" >
<topic label="Setting the Workspace Code Style" href="html/tasks/code_style_workspace.htm" />
