--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Thu Sep 02 13:19:32 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java Sun Sep 05 13:42:22 2010 -0500
@@ -1914,15 +1914,8 @@
public Object run(IBldInfData infView) {
for (final IMMPReference mmp : infView.getAllMMPReferences()) {
-
- IPath workspaceRelativeMMPPath1 = null;
- if (info.getProjectRelativeBldInfPath().isAbsolute()){
- workspaceRelativeMMPPath1 = mmp.getPath();
- } else {
- workspaceRelativeMMPPath1 = new Path(info.getProject().getName()).append(mmp.getPath());
- }
+ final IPath workspaceRelativeMMPPath = new Path(info.getProject().getName()).append(mmp.getPath());
- final IPath workspaceRelativeMMPPath = workspaceRelativeMMPPath1;
EpocEnginePlugin.runWithMMPData(workspaceRelativeMMPPath,
new DefaultMMPViewConfiguration(info.getProject(), buildConfig.getBuildContext(), new AcceptedNodesViewFilter()),
new MMPDataRunnableAdapter() {
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java Thu Sep 02 13:19:32 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java Sun Sep 05 13:42:22 2010 -0500
@@ -298,7 +298,7 @@
IStatus s = new Status(IStatus.ERROR, CarbideBuilderPlugin.PLUGIN_ID, 0, "Error retrieving workbench window. Cannot display configuration tree.", null);
throw new CoreException(s);
}
- if (sbsv2Project){
+ if (sbsv2Project && sdkConfigTreeNodes != null){
replaceFilteredConfigsFromProject(sdkConfigTreeNodes);
}
@@ -324,6 +324,11 @@
* @param sdkConfigTreeNodes
*/
private void replaceFilteredConfigsFromProject(BuildTargetTreeNode[] sdkConfigTreeNodes) {
+
+ if (sdkConfigTreeNodes == null){
+ return;
+ }
+
List<ICarbideBuildConfiguration> bldConfigs = cpi.getBuildConfigurations();
HashMap<BuildTargetTreeNode, List<ISymbianBuildContext>> missingConfigMap = new HashMap<BuildTargetTreeNode, List<ISymbianBuildContext>>();
--- a/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectInfo.java Thu Sep 02 13:19:32 2010 -0500
+++ b/builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectInfo.java Sun Sep 05 13:42:22 2010 -0500
@@ -327,9 +327,6 @@
}
public IPath getAbsoluteBldInfPath(){
- if (projectRelativeBldInfPath.isAbsolute()){
- return projectRelativeBldInfPath;
- }
return CarbideBuilderPlugin.getProjectRoot(projectTracker.getProject()).append(projectRelativeBldInfPath);
}
@@ -338,9 +335,6 @@
}
public IPath getWorkspaceRelativeBldInfPath(){
- if (projectRelativeBldInfPath.isAbsolute()){
- return projectRelativeBldInfPath;
- }
return new Path(projectTracker.getProject().getName()).append(projectRelativeBldInfPath);
}
--- a/core/carbide_releases/readme/readme_sdks.html Thu Sep 02 13:19:32 2010 -0500
+++ b/core/carbide_releases/readme/readme_sdks.html Sun Sep 05 13:42:22 2010 -0500
@@ -6,7 +6,6 @@
<title>SDK Support in Carbide.c++</title>
<style type="text/css">
<!--
-body { background-image: url(background_carbide.jpg);}
.style1 {font-size: x-small}
.style2 {font-family: "Courier New", Courier, mono}
.style3 {color: #FF0000; font-weight: bold}
@@ -19,8 +18,8 @@
<body >
<h2>You're not done installing just yet... </h2>
-<p>Release: 3.0<br>
- Revised: Jan 2010</p>
+<p>Release: 3.0.0<br>
+ Revised: Sept 2010</p>
<p>Read the <b>Release Notes</b> and <b>What's New</b> for the latest infomation about this product. In Carbide.c++ simply click <b>Help > Help Contents > Carbide Help</b>.</p>
<p>To complete your installation and start Symbian C++ application development, you <span class="style3">must</span> install the following: </p>
<table width="80%" border="0">
@@ -29,10 +28,13 @@
</tr>
<tr>
<td height="71" bgcolor="#ffffff">
- <p>The Carbide.c++ tools require a copy of Perl to run build scripts:</p>
+ <p>The Carbide.c++ tools require a copy of Perl to run build scripts. You can download ActivePerl 5.6.1.625 from the Forum Nokia site until Dec 31, 2010. Starting in 2011, ActivePerl will be part of the SDK package and users will not need to download separately.</p>
<b>Perl</b> (<a href="http://www.activestate.com">www.activestate.com</a>)
- <ul>
- <li><A href="ftp://ftp.activestate.com/ActivePerl/Windows/5.6/ActivePerl-5.6.1.635-MSWin32-x86.msi">ActivePerl-5.6.1.635</a> (5.6.1 is required by Symbian tools, later versions will not work) </li>
+ <ul>
+ <li><b>BEFORE 31-DEC-2010:</b> <A href="http://www.forum.nokia.com/info/sw.nokia.com/id/08714ccb-f405-4ec6-b8ec-80ad83942d50/ActiveState_ActivePerl.html">ActivePerl-5.6.1.635</a> from Forum Nokia <br>
+ (5.6.1 is required by Symbian tools, later versions will not work) </li>
+ <li><b>AFTER 31-DEC-2010: </b> All SDKs will include Perl as part of the installer. <br>
+ Consult the <a href="http://www.forum.nokia.com/Library/Tools_and_downloads/Other/Symbian_SDKs/">Forum Nokia</a> or the <a href="https://developer-secure.symbian.org/main/tools_and_kits/index.php">Symbian Foundation</a> sites for details. </li>
</ul></td>
</tr>
</table>
--- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Sun Sep 05 13:42:22 2010 -0500
@@ -7,7 +7,6 @@
<link href="../book.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link href="../book.css" rel="stylesheet" type="text/css" />
- <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
<style type="text/css">
ul > li {font-weight: normal }
</style>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm Sun Sep 05 13:42:22 2010 -0500
@@ -8,11 +8,10 @@
<ul><li><a href="../concepts/contextual_menus.htm">Context Menus</a></li>
<li><a href="menus/menus.htm">Menus</a></li>
<li><a href="menus/open_cmd_window.htm">Open Command Window</a></li>
- <li><a href="menus/s60_ui_designer.htm">S60 UI Designer</a></li>
<li><a href="menus/open_explorer_window.htm">Show in Explorer</a></li>
<li><a href="../concepts/cvs.htm">Software Configuration Management</a></li>
- <li><a href="menus/new_symbian_class.htm">Symbian OS Class</a></li>
- <li><a href="menus/new_symbian_project.htm">Symbian OS C++ Project</a></li>
+ <li><a href="../tasks/projects/prj_adding_symbian_class.htm">Symbian OS Class</a></li>
+ <li><a href="../tasks/CreatingNewProjects.html">Symbian OS C++ Project</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/trk/wnd_new_conn_install_tab.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm Sun Sep 05 13:42:22 2010 -0500
@@ -41,7 +41,7 @@
<ul>
<li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
<li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
- <li><a href="#CONN_SET">Test Connection</a></li>
+ <li><a href="wnd_on_device_check_tab.htm">Test Connection</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/trk/wnd_new_connection_wizard.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm Sun Sep 05 13:42:22 2010 -0500
@@ -52,8 +52,8 @@
<h5>Related references</h5>
<ul>
<li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
- <li><a href="#CONN_SET">Test Connection</a></li>
- <li><a href="#INSTALL">Install Remote Agents</a></li>
+ <li><a href="wnd_on_device_check_tab.htm">Test Connection</a></li>
+ <li><a href="wnd_new_conn_install_tab.htm">Install Remote Agents</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/trk/wnd_on_device_check_tab.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm Sun Sep 05 13:42:22 2010 -0500
@@ -50,7 +50,7 @@
<ul>
<li><a href="wnd_on_device_setup.htm">On-Device Connections</a></li>
<li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
- <li><a href="#INSTALL">Install Remote Agents</a></li>
+ <li><a href="wnd_on_device_check_tab.htm">Install Remote Agents</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/trk/wnd_on_device_setup.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm Sun Sep 05 13:42:22 2010 -0500
@@ -15,15 +15,15 @@
<ul>
<li><a href="wnd_new_connection_wizard.htm">Setup Connection</a> - define connection type, name and settings</li>
<li><a href="#CONN_SET">Test Connection</a> - verify connection operates as intended</li>
- <li><a href="#INSTALL">Install Remote Agents</a> - download and install remote agents</li>
+ <li><a href="wnd_new_conn_install_tab.htm">Install Remote Agents</a> - download and install remote agents</li>
</ul>
<p align="center"><img src="../images/tab_new_conn_setup_conn.png" width="464" height="554"></p>
<p class="figure">Figure 1 - New Connection dialog</p>
<h5>Related references</h5>
<ul>
<li><a href="wnd_new_connection_wizard.htm">Setup Connection</a></li>
- <li><a href="#CONN_SET">Test Connection</a></li>
- <li><a href="#INSTALL">Install Remote Agents</a></li>
+ <li><a href="wnd_on_device_check_tab.htm">Test Connection</a></li>
+ <li><a href="wnd_new_conn_install_tab.htm">Install Remote Agents</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/wnd_debug_configuration.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm Sun Sep 05 13:42:22 2010 -0500
@@ -9,9 +9,9 @@
</head>
<body >
<h2>Debug dialog </h2>
-<p>Use the <b>Debug</b> dialog to create, edit, and manage a project's <a href="launch_configs_overview.htm">launch configurations</a>. A <b>launch configuration</b> defines the settings used by the Carbide debugger to launch (Run) or debug programs. A project must have at least one launch configuration in order to debug a project and can have many more. Projects that have no launch configuration invoke the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> when either the <b>Run</b> or <b>Debug</b> command is selected. </p>
+<p>Use the <b>Debug</b> dialog to create, edit, and manage a project's <a href="../projects/launch/launch_configs_overview.htm">launch configurations</a>. A <b>launch configuration</b> defines the settings used by the Carbide debugger to launch (Run) or debug programs. A project must have at least one launch configuration in order to debug a project and can have many more. Projects that have no launch configuration invoke the <a href="wiz_new_launch_config.htm">New Launch Configuration Wizard</a> when either the <b>Run</b> or <b>Debug</b> command is selected. </p>
<p>Select the <b>Run > Debug Configuration...</b> menu option to open the <b>Debug</b> dialog.</p>
-<p>The tabs shown in the <b>Debug</b> dialog vary depending upon the type of launch configuration highlighted in the configurations list. See <a href="launch_configs_overview.htm">Launch Configuration Overview</a> for more information on the various launch configuration types. </p>
+<p>The tabs shown in the <b>Debug</b> dialog vary depending upon the type of launch configuration highlighted in the configurations list. See <a href="../projects/launch/launch_configs_overview.htm">Launch Configuration Overview</a> for more information on the various launch configuration types. </p>
<p>Click <b>Debug</b> to start a new debug session using the selected launch configuration. </p>
<p align="center" class="figure"><img src="images/wnd_debug_overview.png" alt="Debug window" width="864" height="471"></p>
<p align="center" class="figure"> Figure 1 - Debug dialog (Symbian OS Emulation configuration shown)</p>
@@ -52,14 +52,14 @@
<li>Filter Deleted/Unavailable Projects</li>
<li>Filter Configuration Types</li>
<li>Apply Window Working Set(s)</li>
- <li><a href="../../reference/trk/panel_filter.htm">Filtering Preferences...</a></li>
+ <li><a href="trk/panel_filter.htm">Filtering Preferences...</a></li>
</ul></td>
</tr>
</table>
<h4>Other references</h4>
<ul>
- <li><a href="launch_configs_overview.htm">Launch Configuration Overview</a></li>
- <li><a href="pages_overview.htm">Configuration Pages</a> </li>
+ <li><a href="../projects/launch/launch_configs_overview.htm">Launch Configuration Overview</a></li>
+ <li><a href="../projects/launch/pages_overview.htm">Configuration Pages</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/release_notes.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Sun Sep 05 13:42:22 2010 -0500
@@ -7,7 +7,7 @@
<link href="../book.css" rel="stylesheet" type="text/css" />
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link href="../book.css" rel="stylesheet" type="text/css" />
- <script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+ <script language="JavaScript" src="../projects/launch/launch_configs_overview.htm"></script>
</head>
<body >
<h2>Carbide.c++ Release Notes 3.0.0</h2>
@@ -32,7 +32,7 @@
<p>The following features for Symbian development are provided within Carbide.c++:</p>
<h4>Milestone 2</h4>
<ul>
- <li>A new <a href="reference/view_carbide_portal.htm">Carbide Portal</a> view provides easier access to Carbide information, an extensions marketplace, and support.</li>
+ <li>A new <a href="reference/view_carbide_portal.htm">Carbide.c++ Portal</a> view provides easier access to Carbide information, an extensions marketplace, and support.</li>
<li>The <a href="reference/view_variables.htm">Variables</a> view and debug hover now supports the following Qt data types: <span class="code">QString</span>, <span class="code">QByteArray</span>, <span class="code">QSet</span>, <span class="code">QHash</span>, <span class="code">QMap</span>, <span class="code">QVector</span>, <span class="code">QList</span>, <span class="code">QLinkedList</span> and <span class="code">Qvariant</span>.</li>
</ul>
<h4>Milestone 1</h4>
@@ -67,8 +67,8 @@
</ul>
<h4><a name="new250" id="new"></a>2.5.0</h4>
<ul>
- <li><b>Plug-and-Play (PnP) On-device Debugging </b> supported — debugging a target device just got easier. Using a USB cable, connect the PC to the target device, then launch Carbide.c++. Carbide locates the connected device and creates a remote connection setup to communicate with it. Build the program and launch it on the device to start the debugging session. Refer to <a href="#pnpIssues">Known PnP Issues</a> for details if you experience problems.</li>
- <li><b>PnP Phone Launch Wizard</b> - If the project does not already have a launch configuration, the PnP Launch Wizard makes it easy to create one for <a href="projects/launch/launch_phone.htm">phones</a>. In addition the new <a href="projects/launch/wnd_config_launch_config.htm">Configure Launch Configuration</a> dialog provides a quick summary of the remote connection for easy review and modification.</li>
+ <li><b>Plug-and-Play (PnP) On-device Debugging </b> supported — debugging a target device just got easier. Using a USB cable, connect the PC to the target device, then launch Carbide.c++. Carbide locates the connected device and creates a remote connection setup to communicate with it. Build the program and launch it on the device to start the debugging session. </li>
+ <li><b>PnP Phone Launch Wizard</b> - If the project does not already have a launch configuration, the PnP Launch Wizard makes it easy to create one for <a href="projects/launch/launch_phone.htm">phones</a>. In addition the new <a href="projects/launch/launch_configs_overview.htm">Configure Launch Configuration</a> dialog provides a quick summary of the remote connection for easy review and modification.</li>
<li><b>Carbide automatically detects TRK on target phones and devices</b> - Carbide now detects the presence of either Application or System TRK on a connected device when TRK 3.2.6 or later are installed. Earlier TRK versions do not support this recognition feature.</li>
<li><b>TRK improvements</b> - TRK continues to evolve and now includes these improvements:
<ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html Sun Sep 05 13:42:22 2010 -0500
@@ -115,9 +115,8 @@
<ul>
<li><a href="CreatingNewProjects.html">Creating Projects </a></li>
<li><a href="projects/prj_build.htm">Building Projects</a></li>
- <li><a href="projects/prj_import_exe.htm">Importing a Symbian Executable</a></li>
- </ul>
- <h5>Related references</h5>
+ </ul>
+ <h5>Related references</h5>
<ul>
<li><a href="sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
<li><a href="../reference/ProjectDirectories.html">Project Directories</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_custom_keys.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_custom_keys.htm Sun Sep 05 13:42:22 2010 -0500
@@ -14,11 +14,11 @@
org.eclipse.ui.preferencePages.Keys)")'>Keys</a> preference panel to select a shortcut set or modify the current set for your convenience. The Default set is extended by the other key bindings for commands not covered in the Default set or where the new set uses different key bindings for a command. </p>
<p>The options include:</p>
<ul>
- <li><a href="com.nokia.carbide.cpp/html/help_keys_carbide.htm">Carbide.c++</a> (default) – Carbide + Default standard set</li>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp/html/help_keys_carbide.htm">Carbide.c++</a> (default) – Carbide + Default standard set</li>
<li><strong>Default </strong>– Eclipse standard set of key bindings</li>
<li><strong>Emacs</strong> - Emacs + Default key bindings</li>
- <li><a href="com.nokia.carbide.cpp/html/help_keys_vs.htm">Microsoft Visual Studio</a> – Visual Studio + Default standard set</li>
- <li><a href="com.nokia.carbide.cpp/html/help_keys_cw.htm">Nokia Codewarrior</a> – CodeWarrior + Default standard set</li>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp/html/help_keys_vs.htm">Microsoft Visual Studio</a> – Visual Studio + Default standard set</li>
+ <li><a href="PLUGINS_ROOT/com.nokia.carbide.cpp/html/help_keys_cw.htm">Nokia Codewarrior</a> – CodeWarrior + Default standard set</li>
</ul>
<p>In addition, you can modify any of the assigned key bindings to use different keys to better suit your work style. See the <strong>Workbench User Guide > Reference > Preferences ></strong> <a href="PLUGINS_ROOT/org.eclipse.platform.doc.user/concepts/accessibility/keyboardshortcuts.htm">Keys</a> preference panel page for more information.</p>
<h4>Other references</h4>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_multi_projects.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_multi_projects.htm Sun Sep 05 13:42:22 2010 -0500
@@ -29,7 +29,6 @@
<ul>
<li><a href="../CreatingNewProjects.html">Creating
Projects</a></li>
- <li><a href="prj_import_exe.htm">Importing Symbian Executables </a> </li>
</ul>
<div class="step"></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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm Sun Sep 05 13:42:22 2010 -0500
@@ -35,10 +35,9 @@
<h5>Related tasks</h5>
<ul>
<li><a href="prj_debug_dlls.htm">Debugging DLLs </a></li>
- <li><a href="prj_import_exe.htm">Importing Symbian Executables </a></li>
<li><a href="prj_debug_config.htm">Creating a Launch Configuration</a></li>
</ul>
- <h5>Related references</h5>
+<h5>Related references</h5>
<ul>
<li><a href="../../reference/ProjectDirectories.html">Project Directories</a></li>
</ul>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_multiple_projects.htm Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_multiple_projects.htm Sun Sep 05 13:42:22 2010 -0500
@@ -14,7 +14,7 @@
<div class="step">
<h4>Configuring to Debug Multiple Projects </h4>
<ol>
- <li><a href="prj_import_exe.htm">Import</a> one or more project executables into the current project</li>
+ <li><a href="../ImportingProjects.html">Import</a> one or more project executables into the current project</li>
<p>The debugger loads the executable into the project.</p>
<li> Debug the project using the same debug launch configuration </li>
<p>The debugger loads the project and all embedded executables for debugging.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/plugin.xml Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/plugin.xml Sun Sep 05 13:42:22 2010 -0500
@@ -125,12 +125,12 @@
<extension
point="org.eclipse.ui.cheatsheets.cheatSheetContent">
- <!-- CREATE A PLATSIM CATEGORY
+ CREATE A PLATSIM CATEGORY
<category
id="com.nokia.platsim.cheatsheets"
name="PlatSim" />
-
- <!-- ADD PLATSIM TOPICS TO CATEGORY
+
+ ADD PLATSIM TOPICS TO CATEGORY
<cheatsheet
category="com.nokia.platsim.cheatsheets"
--- a/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java Thu Sep 02 13:19:32 2010 -0500
+++ b/core/com.nokia.carbide.cpp.sdk.core/src/com/nokia/carbide/cpp/internal/sdk/core/model/AbstractSDKManager.java Sun Sep 05 13:42:22 2010 -0500
@@ -113,11 +113,14 @@
public void aboutToRun(IJobChangeEvent event) {}
public void done(IJobChangeEvent event) {
fireInstalledSdkChanged(SDKChangeEventType.eSDKScanned);
+ // Notify any plugins that want to know if the SDKManager has scanned plugins.
+ if (!sdkHookExtenstionsNotified) {
+ notifySDKManagerLoaded();
+ sdkHookExtenstionsNotified = true;
+ }
}
};
-
-
public AbstractSDKManager() {
macroStore = SymbianMacroStore.getInstance();
scanJob = new Job ("Scan for installed SDKs") {
@@ -186,11 +189,6 @@
updateCarbideSDKCache();
- // Notify any plugins that want to know if the SDKManager has scanned plugins.
- if (!sdkHookExtenstionsNotified) {
- notifySDKManagerLoaded();
- sdkHookExtenstionsNotified = true;
- }
if (monitor.isCanceled()) {
return Status.CANCEL_STATUS;
}
@@ -231,6 +229,7 @@
if (sdkList.size() < 1) {
ensureScannedSDKs();
}
+
List<ISymbianSDK> listCopy = new ArrayList<ISymbianSDK>(sdkList);
return listCopy;
}
Binary file core/com.nokia.carbide.cpp/splash.bmp has changed
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/ProjectUIPlugin.java Thu Sep 02 13:19:32 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/ProjectUIPlugin.java Sun Sep 05 13:42:22 2010 -0500
@@ -276,16 +276,6 @@
store.setValue(PreferenceConstants.PREF_KEEP_PROJECTS_IN_SYNC, keepInSync);
}
- public static boolean supportLinkedResources() {
- IPreferenceStore store = ProjectUIPlugin.getDefault().getPreferenceStore();
- return store.getBoolean(PreferenceConstants.PREF_SUPPORT_LINKED_RESOURCES);
- }
-
- public static void setSupportLinkedResources(boolean supported) {
- IPreferenceStore store = ProjectUIPlugin.getDefault().getPreferenceStore();
- store.setValue(PreferenceConstants.PREF_SUPPORT_LINKED_RESOURCES, supported);
- }
-
public static int getAddFilesToProjectOption() {
IPreferenceStore store = ProjectUIPlugin.getDefault().getPreferenceStore();
return store.getInt(PreferenceConstants.PREF_ADDED_FILES_OPTION);
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java Thu Sep 02 13:19:32 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/BldInfImportWizard.java Sun Sep 05 13:42:22 2010 -0500
@@ -89,7 +89,6 @@
final String projectName = projectPropertiesPage.getProjectName();
final IPath rootDirectory = projectPropertiesPage.getRootDirectory();
- final boolean isLinkedProject = projectPropertiesPage.linkedResourcesEnabled();
// calculate the project relative path to the bld.inf file.
IPath absoluteBldInfPath = new Path(getBldInfFile());
@@ -110,21 +109,13 @@
monitor.beginTask(Messages.BldInfImportWizard_CreatingProjectJobName, IProgressMonitor.UNKNOWN);
IProject newProject = null;
- if (isLinkedProject){
- newProject = ProjectCorePlugin.createProject(projectName, null);
- newProject.getFolder(rootDirectory.lastSegment()).createLink(rootDirectory.toFile().toURI(), IResource.BACKGROUND_REFRESH, new NullProgressMonitor());
- } else {
- newProject = ProjectCorePlugin.createProject(projectName, rootDirectory.toOSString());
- }
+ newProject = ProjectCorePlugin.createProject(projectName, rootDirectory.toOSString());
+
monitor.worked(1);
newProject.setSessionProperty(CarbideBuilderPlugin.SBSV2_PROJECT, Boolean.valueOf(useSBSv2Builder()));
- if (isLinkedProject){
- ProjectCorePlugin.postProjectCreatedActions(newProject, absoluteInfPath, selectedConfigs, components, null, null, monitor);
- } else {
- ProjectCorePlugin.postProjectCreatedActions(newProject, projectRelativePath, selectedConfigs, components, null, null, monitor);
- }
+ ProjectCorePlugin.postProjectCreatedActions(newProject, projectRelativePath, selectedConfigs, components, null, null, monitor);
if (monitor.isCanceled()) {
// the user canceled the import so delete the project
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/Messages.java Thu Sep 02 13:19:32 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/Messages.java Sun Sep 05 13:42:22 2010 -0500
@@ -112,10 +112,6 @@
public static String ProjectPropertiesPage_directoryTooLong;
public static String ProjectPropertiesPage_directoryIsRoot;
-
- public static String ProjectPropertiesPage_linkedProject;
-
- public static String ProjectPropertiesPage_linkedProjectTooltip;
static {
// initialize resource bundle
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/ProjectPropertiesPage.java Thu Sep 02 13:19:32 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/ProjectPropertiesPage.java Sun Sep 05 13:42:22 2010 -0500
@@ -44,7 +44,6 @@
import com.nokia.carbide.cdt.builder.EpocEngineHelper;
import com.nokia.carbide.cpp.internal.project.ui.ProjectUIHelpIds;
-import com.nokia.carbide.cpp.internal.project.ui.ProjectUIPlugin;
import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
import com.nokia.cpp.internal.api.utils.ui.BrowseDialogUtils;
@@ -53,7 +52,6 @@
private Text projectName;
private Text rootDirectory;
private Button browseButton;
- private Button linkedResourcesCheck;
String projectNameText = ""; //$NON-NLS-1$
IPath rootDirectoryPath = null;
@@ -143,14 +141,6 @@
gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
gd.horizontalSpan = 3;
helpText.setLayoutData(gd);
-
- if (ProjectUIPlugin.supportLinkedResources()){
- linkedResourcesCheck = new Button(parent, SWT.CHECK);
- linkedResourcesCheck.setFont(font);
- linkedResourcesCheck.setText(Messages.ProjectPropertiesPage_linkedProject);
- linkedResourcesCheck.setToolTipText(Messages.ProjectPropertiesPage_linkedProjectTooltip);
- linkedResourcesCheck.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- }
setButtonLayoutData(browseButton);
}
@@ -288,15 +278,7 @@
public IPath getRootDirectory() {
return rootDirectoryPath;
}
-
- public boolean linkedResourcesEnabled(){
- if (linkedResourcesCheck == null){
- return false;
- }
-
- return linkedResourcesCheck.getSelection();
- }
-
+
@Override
public void setVisible(boolean visible) {
// this gets called just before the page goes in or out of view. if it's
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/messages.properties Thu Sep 02 13:19:32 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/importWizards/messages.properties Sun Sep 05 13:42:22 2010 -0500
@@ -18,8 +18,6 @@
ProjectPropertiesPage_directoryDoesNotContainSourceFiles=The root directory specified does not contain all the source and resource files referenced in the project. This may make navigation and editing more difficult.
ProjectPropertiesPage_directoryTooLong=The root directory specified is too long. It cannot exceed 215 characters so that project settings files do not exceed the 256 character path limit.
ProjectPropertiesPage_directoryIsRoot=A project path near the root SDK directory can lead to slow import times. Please select another project path or import a subset of included bld.inf files (if possible).
-ProjectPropertiesPage_linkedProject=Create project with linked resources
-ProjectPropertiesPage_linkedProjectToolTip=When enabled, the eclipse project files are created in the workspace and all project content is formed with linked resources.
MMPSelectionPage_title=MMP Selection
MMPSelectionPage_description=Select the mmp and extension make files to work with. You will be able to edit this after the project has been created.
MMPSelectionPage_selectAllAButtonLabel=Select All
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/preferences/PreferenceConstants.java Thu Sep 02 13:19:32 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/preferences/PreferenceConstants.java Sun Sep 05 13:42:22 2010 -0500
@@ -28,6 +28,4 @@
public final static String PREF_CHANGED_FILES_OPTION = "changedFilesOption"; //$NON-NLS-1$
public static final String PREF_INDEX_ALL = "indexAll"; //$NON-NLS-1$
-
- public static final String PREF_SUPPORT_LINKED_RESOURCES = "supportsLinkedRsrcs"; //$NON-NLS-1$
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/preferences/PreferenceInitializer.java Thu Sep 02 13:19:32 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/preferences/PreferenceInitializer.java Sun Sep 05 13:42:22 2010 -0500
@@ -16,7 +16,6 @@
*/
package com.nokia.carbide.cpp.internal.project.ui.preferences;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
@@ -36,21 +35,6 @@
IPreferenceStore store = ProjectUIPlugin.getDefault().getPreferenceStore();
store.setDefault(PreferenceConstants.PREF_KEEP_PROJECTS_IN_SYNC, true);
store.setDefault(PreferenceConstants.PREF_INDEX_ALL, false);
-
- if (cmdLineArgsSupportsLinkedResources()){
- store.setDefault(PreferenceConstants.PREF_SUPPORT_LINKED_RESOURCES, true);
- } else {
- store.setDefault(PreferenceConstants.PREF_SUPPORT_LINKED_RESOURCES, false);
- }
- }
-
- private boolean cmdLineArgsSupportsLinkedResources(){
- String[] args = Platform.getCommandLineArgs();
- for (String arg : args){
- if (arg.equals("supportsLinkedRsrcs=true"))
- return true;
- }
- return false;
}
}
--- a/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/views/SPNViewContentProvider.java Thu Sep 02 13:19:32 2010 -0500
+++ b/project/com.nokia.carbide.cpp.project.ui/src/com/nokia/carbide/cpp/internal/project/ui/views/SPNViewContentProvider.java Sun Sep 05 13:42:22 2010 -0500
@@ -43,7 +43,6 @@
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -71,7 +70,6 @@
import org.eclipse.ui.PlatformUI;
import org.eclipse.ui.model.BaseWorkbenchContentProvider;
import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.ui.model.WorkbenchAdapter;
import com.nokia.carbide.cdt.builder.BldInfViewPathHelper;
import com.nokia.carbide.cdt.builder.CarbideBuilderPlugin;
@@ -108,13 +106,15 @@
import com.nokia.carbide.cpp.epoc.engine.preprocessor.DefaultModelDocumentProvider;
import com.nokia.carbide.cpp.epoc.engine.preprocessor.DefaultTranslationUnitProvider;
import com.nokia.carbide.cpp.epoc.engine.preprocessor.IIncludeFileLocator;
+import com.nokia.carbide.cpp.internal.api.sdk.ISBSv1BuildInfo;
+import com.nokia.carbide.cpp.internal.api.sdk.ISBSv2BuildInfo;
import com.nokia.carbide.cpp.internal.project.ui.ProjectUIPlugin;
import com.nokia.carbide.cpp.sdk.core.ISymbianBuildContext;
+import com.nokia.carbide.cpp.sdk.core.ISymbianBuilderID;
import com.nokia.carbide.cpp.sdk.core.ISymbianSDK;
import com.nokia.carbide.cpp.ui.CarbideUIPlugin;
import com.nokia.carbide.cpp.ui.ICarbideSharedImages;
import com.nokia.carbide.internal.api.cpp.epoc.engine.preprocessor.DependencyScanner;
-import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
/**
* Content provider for the SymbianProjectNavigatorView
@@ -2329,20 +2329,7 @@
if (info != null) {
IPath infPath = info.getProjectRelativeBldInfPath();
if (infPath != null) {
- IFile file = null;
- if (infPath.isAbsolute()){
- // Make sure to get the project relative location if the inf path is absolute.
- // This means the project has linked resources
- // TODO: Just using for prototyping with using linked resources....
- // XXX: This is still not working, as the path is relative to the workspace and
- // hence it's wrong. Seems we need to change the container for the SPN to take
- // a bld.inf as an absolute path???
- IFile infFile = ResourcesPlugin.getWorkspace().getRoot().getFile(infPath);
- children.add(infFile);
- return children.toArray();
- } else {
- file = getIFileFromBldInfViewPath(project, infPath);
- }
+ IFile file = getIFileFromBldInfViewPath(project, infPath);
if (file != null) {
children.add(containerFactory.getBldInfContainer(file, true));
@@ -2529,11 +2516,6 @@
}
protected IFile getIFileFromBldInfViewPath(IProject project, IPath pathFromBldInfView) {
-
- if (pathFromBldInfView.isAbsolute()){
- IWorkspace workspace= ResourcesPlugin.getWorkspace();
- return workspace.getRoot().getFile(pathFromBldInfView);
- }
EpocEnginePathHelper helper = new EpocEnginePathHelper(project);
IPath resolvedProjectRelativePath = helper.convertToProject(pathFromBldInfView);
if (resolvedProjectRelativePath != null)
--- a/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF Thu Sep 02 13:19:32 2010 -0500
+++ b/qt/com.nokia.carbide.cpp.qt.core/META-INF/MANIFEST.MF Sun Sep 05 13:42:22 2010 -0500
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Carbide Qt Core Plug-in
+Bundle-Name: Carbide Qt Core
Bundle-SymbolicName: com.nokia.carbide.cpp.qt.core;singleton:=true
Bundle-Version: 1.4.0.qualifier
Bundle-Activator: com.nokia.carbide.cpp.internal.qt.core.QtCorePlugin
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/Basename.pro Thu Sep 02 13:19:32 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-Console/Basename.pro Sun Sep 05 13:42:22 2010 -0500
@@ -9,4 +9,7 @@
FORMS +=
RESOURCES +=
-symbian:TARGET.UID3 = $(uid3)
+symbian: {
+ TARGET.UID3 = $(uid3)
+ MMP_RULES += DEBUGGABLE_UDEBONLY
+}
--- a/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.pro Thu Sep 02 13:19:32 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.qt.templates/templates/Qt-GUI-Common/Basename.pro Sun Sep 05 13:42:22 2010 -0500
@@ -10,4 +10,9 @@
FORMS += $(baseName).ui
RESOURCES +=
-symbian:TARGET.UID3 = $(uid3)
+symbian: {
+ TARGET.UID3 = $(uid3)
+ MMP_RULES += DEBUGGABLE_UDEBONLY
+}
+
+
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/group/Basename.mmp Thu Sep 02 13:19:32 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/OpenC-HelloWorld/group/Basename.mmp Sun Sep 05 13:42:22 2010 -0500
@@ -39,6 +39,5 @@
// No capabilities needed by this application
CAPABILITY None
-#ifdef ENABLE_ABIV2_MODE
- DEBUGGABLE_UDEBONLY
-#endif
+DEBUGGABLE_UDEBONLY
+
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/group/baseName.mmp Thu Sep 02 13:19:32 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-PlatsecApp/group/baseName.mmp Sun Sep 05 13:42:22 2010 -0500
@@ -56,7 +56,5 @@
SECUREID $(uid3)
CAPABILITY ReadUserData
-#ifdef ENABLE_ABIV2_MODE
- DEBUGGABLE_UDEBONLY
-#endif
+DEBUGGABLE_UDEBONLY
// End of File
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/group/baseName.mmp Thu Sep 02 13:19:32 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/S60-TouchUIApplication/group/baseName.mmp Sun Sep 05 13:42:22 2010 -0500
@@ -56,7 +56,5 @@
SECUREID $(uid3)
CAPABILITY ReadUserData
-#ifdef ENABLE_ABIV2_MODE
- DEBUGGABLE_UDEBONLY
-#endif
+DEBUGGABLE_UDEBONLY
// End of File
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-DLL/group/Basename.mmp Thu Sep 02 13:19:32 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-DLL/group/Basename.mmp Sun Sep 05 13:42:22 2010 -0500
@@ -43,7 +43,5 @@
LIBRARY euser.lib
-#ifdef ENABLE_ABIV2_MODE
- DEBUGGABLE_UDEBONLY
-#endif
+DEBUGGABLE_UDEBONLY
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/group/Basename.mmp Thu Sep 02 13:19:32 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-EXE/group/Basename.mmp Sun Sep 05 13:42:22 2010 -0500
@@ -19,6 +19,4 @@
LIBRARY euser.lib
-#ifdef ENABLE_ABIV2_MODE
- DEBUGGABLE_UDEBONLY
-#endif
+DEBUGGABLE_UDEBONLY
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-Empty/group/Basename.mmp Thu Sep 02 13:19:32 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-Empty/group/Basename.mmp Sun Sep 05 13:42:22 2010 -0500
@@ -13,6 +13,4 @@
SYSTEMINCLUDE \epoc32\include
-#ifdef ENABLE_ABIV2_MODE
- DEBUGGABLE_UDEBONLY
-#endif
+DEBUGGABLE_UDEBONLY
--- a/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-LIB/group/Basename.mmp Thu Sep 02 13:19:32 2010 -0500
+++ b/templates/com.nokia.carbide.cpp.templates/templates/projecttemplates/Symbian-LIB/group/Basename.mmp Sun Sep 05 13:42:22 2010 -0500
@@ -17,6 +17,4 @@
SOURCEPATH ..\$(sourceDir)
SOURCE $(baseName).cpp
-#ifdef ENABLE_ABIV2_MODE
- DEBUGGABLE_UDEBONLY
-#endif
+DEBUGGABLE_UDEBONLY