# HG changeset patch # User Ed Swartz # Date 1283712142 18000 # Node ID 37285903ed510b4f11d36cd970c1053fdf62f8e2 # Parent aac450e0c99e868557ec98062b8ea34f7ebd6950# Parent 5363a66d25da235179d600e98e9015d1593be8a4 Merge commit diff -r aac450e0c99e -r 37285903ed51 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/builder/EpocEngineHelper.java --- 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() { diff -r aac450e0c99e -r 37285903ed51 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/api/builder/ui/ManageConfigurationsDialog.java --- 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 bldConfigs = cpi.getBuildConfigurations(); HashMap> missingConfigMap = new HashMap>(); diff -r aac450e0c99e -r 37285903ed51 builder/com.nokia.carbide.cdt.builder/src/com/nokia/carbide/cdt/internal/builder/CarbideProjectInfo.java --- 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); } diff -r aac450e0c99e -r 37285903ed51 core/carbide_releases/readme/readme_sdks.html --- 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 @@ SDK Support in Carbide.c++ diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/reference/MenusToc.htm --- 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 @@ diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_conn_install_tab.htm --- 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 @@ diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_new_connection_wizard.htm --- 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 @@
Related references
diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_check_tab.htm --- 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 @@ diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/reference/trk/wnd_on_device_setup.htm --- 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 @@

Figure 1 - New Connection dialog

Related references
diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm --- 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 @@

Debug dialog

-

Use the Debug dialog to create, edit, and manage a project's launch configurations. A launch configuration 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 New Launch Configuration Wizard when either the Run or Debug command is selected.

+

Use the Debug dialog to create, edit, and manage a project's launch configurations. A launch configuration 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 New Launch Configuration Wizard when either the Run or Debug command is selected.

Select the Run > Debug Configuration... menu option to open the Debug dialog.

-

The tabs shown in the Debug dialog vary depending upon the type of launch configuration highlighted in the configurations list. See Launch Configuration Overview for more information on the various launch configuration types.

+

The tabs shown in the Debug dialog vary depending upon the type of launch configuration highlighted in the configurations list. See Launch Configuration Overview for more information on the various launch configuration types.

Click Debug to start a new debug session using the selected launch configuration.

Debug window

Figure 1 - Debug dialog (Symbian OS Emulation configuration shown)

@@ -52,14 +52,14 @@
  • Filter Deleted/Unavailable Projects
  • Filter Configuration Types
  • Apply Window Working Set(s)
    • -
  • Filtering Preferences...
    • +
  • Filtering Preferences...

    • Other references

    diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm --- 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 @@ - +

    Carbide.c++ Release Notes 3.0.0

    @@ -32,7 +32,7 @@

    The following features for Symbian development are provided within Carbide.c++:

    Milestone 2

      -
    • A new Carbide Portal view provides easier access to Carbide information, an extensions marketplace, and support.
      • +
    • A new Carbide.c++ Portal view provides easier access to Carbide information, an extensions marketplace, and support.
    • The Variables view and debug hover now supports the following Qt data types: QString, QByteArray, QSet, QHash, QMap, QVector, QList, QLinkedList and Qvariant.

    Milestone 1

    @@ -67,8 +67,8 @@

    2.5.0

      -
    • Plug-and-Play (PnP) On-device Debugging 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 Known PnP Issues for details if you experience problems.
      • -
    • PnP Phone Launch Wizard - If the project does not already have a launch configuration, the PnP Launch Wizard makes it easy to create one for phones. In addition the new Configure Launch Configuration dialog provides a quick summary of the remote connection for easy review and modification.
      • +
    • Plug-and-Play (PnP) On-device Debugging 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.
      • +
    • PnP Phone Launch Wizard - If the project does not already have a launch configuration, the PnP Launch Wizard makes it easy to create one for phones. In addition the new Configure Launch Configuration dialog provides a quick summary of the remote connection for easy review and modification.
    • Carbide automatically detects TRK on target phones and devices - 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.
    • TRK improvements - TRK continues to evolve and now includes these improvements:
        diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/tasks/ImportingProjects.html --- 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 @@ -
        Related references
        +
      +
      Related references
      • Platform Filtering Preferences
      • Project Directories
        • diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/tasks/custom/carb_custom_keys.htm --- 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 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.

        The options include:

        In addition, you can modify any of the assigned key bindings to use different keys to better suit your work style. See the Workbench User Guide > Reference > Preferences > Keys preference panel page for more information.

        Other references

        diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_build_multi_projects.htm --- 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 @@
        diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_console.htm --- 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 @@
        Related tasks
        -
        Related references
        +
        Related references
        diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/html/tasks/projects/prj_debug_multiple_projects.htm --- 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 @@

        Configuring to Debug Multiple Projects

          -
        1. Import one or more project executables into the current project
          2. +
        2. Import one or more project executables into the current project

          3. The debugger loads the executable into the project.

        3. Debug the project using the same debug launch configuration

          4. The debugger loads the project and all embedded executables for debugging.

          diff -r aac450e0c99e -r 37285903ed51 core/com.nokia.carbide.cpp.doc.user/plugin.xml --- 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 @@ -