# HG changeset patch # User Ed Swartz # Date 1283451572 18000 # Node ID aac450e0c99e868557ec98062b8ea34f7ebd6950 # Parent c7e4f77e6b70364f5c619659e0c3290628b78862# Parent 8193259c7a9551083c68941d8dcc91361fa9fb23 Merge commit diff -r c7e4f77e6b70 -r aac450e0c99e 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 Tue Aug 31 07:53:48 2010 -0500 +++ b/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 @@ -21,6 +21,9 @@ import java.util.Iterator; import java.util.List; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TrayDialog; import org.eclipse.jface.viewers.CheckStateChangedEvent; @@ -46,6 +49,7 @@ import org.eclipse.swt.widgets.Link; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.TreeItem; +import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.ContainerCheckedTreeViewer; import org.eclipse.ui.dialogs.PreferencesUtil; @@ -226,7 +230,11 @@ filteringContentProviderWrapper.setConfigFilter(new QtConfigFilter()); } - drawSDKConfigTree(); + try { + drawSDKConfigTree(); + } catch (CoreException e1) { + e1.printStackTrace(); + } BrokenConfigurationInProjectTreeNode[] brokenTreeInput = BrokenConfigurationInProjectTreeNode.getTreeViewerInput(cpi); if (brokenTreeInput.length > 0) { @@ -247,7 +255,11 @@ public void widgetSelected(SelectionEvent e) { // I don't see a way to open it to a specific tab, only the page if (Window.OK == PreferencesUtil.createPreferenceDialogOn(getShell(), "com.nokia.carbide.cpp.sdk.ui.preferences.BuildPlatformFilterPage", null, null, 0).open()){ //$NON-NLS-1$ - drawSDKConfigTree(); + try { + drawSDKConfigTree(); + } catch (CoreException e1) { + e1.printStackTrace(); + } } } }); @@ -260,7 +272,11 @@ public void widgetSelected(SelectionEvent e) { // I don't see a way to open it to a specific tab, only the page if (Window.OK == PreferencesUtil.createPreferenceDialogOn(getShell(), "com.nokia.carbide.cpp.sdk.ui.preferences.SDKPreferencePage", null, null, 0).open()){ //$NON-NLS-1$ - drawSDKConfigTree(); + try { + drawSDKConfigTree(); + } catch (CoreException e1) { + e1.printStackTrace(); + } } } }); @@ -270,11 +286,18 @@ return container; } - private void drawSDKConfigTree() { + private void drawSDKConfigTree() throws CoreException { boolean sbsv2Project = CarbideBuilderPlugin.getBuildManager().isCarbideSBSv2Project(cpi.getProject()); properSdkViewer.setContentProvider(filteringContentProviderWrapper); - BuildTargetTreeNode[] sdkConfigTreeNodes = BuildTargetTreeNode.getTreeViewerInput(sbsv2Project); + IWorkbenchWindow wbw = PlatformUI.getWorkbench().getActiveWorkbenchWindow(); + BuildTargetTreeNode[] sdkConfigTreeNodes = null; + if (wbw != null){ + sdkConfigTreeNodes = BuildTargetTreeNode.getTreeViewerInput(sbsv2Project, wbw); + } else { + 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){ replaceFilteredConfigsFromProject(sdkConfigTreeNodes); } diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/book.css --- a/core/com.nokia.carbide.cpp.doc.user/book.css Tue Aug 31 07:53:48 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/book.css Thu Sep 02 13:19:32 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: 1.0em; + font-size: 0.9em; font-weight: normal; } diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_find_n_add_extentions.xml --- a/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/how_to_find_n_add_extentions.xml Tue Aug 31 07:53:48 2010 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ - - - -` - - You can add functionality to Carbide by installing additional extensions. - - - - - Use the Carbide.c++ Portal > Customize tab to find, download, and install extensions. - - - - diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/trk_appTrk_debugapps_cs.xml --- a/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/trk_appTrk_debugapps_cs.xml Tue Aug 31 07:53:48 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/cheatsheets/trk_appTrk_debugapps_cs.xml Thu Sep 02 13:19:32 2010 -0500 @@ -1,40 +1,40 @@ - - - - - - Read the following information to Debug DLLs, Applications, and Executables. - - - - - - Click question mark on right side for instructions to debug DLLs. - - - - - - Click question mark on right side for instructions to debug applications. - - - - - - Click question mark on right side for instructions to import and debug a Symbian executable. - - - - - - Click question mark on right side for instructions to attach to a Symbian OS Process. - - - - - - Click question mark on right side for instructions to debug a compiled Symbian OS program. - - - + + + + + + Read the following information to Debug DLLs, Applications, and Executables. + + + + + + Click question mark on right side for instructions to debug DLLs. + + + + + + Click question mark on right side for instructions to debug applications. + + + + + + Click question mark on right side for instructions to import and debug a Symbian executable. + + + + + + Click question mark on right side for instructions to attach to a Symbian OS Process. + + + + + + Click question mark on right side for instructions to debug a compiled Symbian OS program. + + + \ No newline at end of file diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm Tue Aug 31 07:53:48 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/autotargeting.htm Thu Sep 02 13:19:32 2010 -0500 @@ -9,14 +9,17 @@

Auto-Targeting of Executables

-

In run-mode the Carbide debugger now supports the auto-targeting of processes that are already running or are created during the execution of the debug session. Previously, the debugger forced users to explicitly attach to a running process. Now, the debugger attempts to target all the EXEs specified in the Executables tab of the launch configuration.

+

In run-mode the Carbide debugger now supports the auto-targeting of processes that are already running or are created during the execution of the debug session. Previously, the debugger forced users to explicitly attach to a running process. Now, the debugger attempts to target all the EXEs and binaries like DLLs specified in the Executables tab of the launch configuration.

+

Debugging DLLs

+

One common debugging DLL use case is when the developer doesn't know which process calls the DLL. This makes it difficult to debug the DLL because you doesn't know which process to attach to nor start. Carbide enables DLL debugging by simply attaching the DLL to any running process as long as the DLL is included in the Executables view. See Attaching to a Process for more details.

Other References
diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm Tue Aug 31 07:53:48 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_configurations.htm Thu Sep 02 13:19:32 2010 -0500 @@ -16,7 +16,7 @@

Build configurations are defined when the project is created. A project can have any number of build configurations and more can be added as necessary. Each build configuration can have its own combination of tool settings to precisely control how it is defined and built. Build configurations are maintained in the project Properties window in the Carbide Build Configurations panel. To open the panel, select a project in the Project Explorer or Symbian Project Navigator view and select Project > Properties or right-click and select Properties.

-

You can select a build configuration in the Active Configuration group or use the Project > Active Configuration menu option to set which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the Run () or Debug () control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.

+

You can select a build configuration in the Active Configuration group or use the Project > Active Configuration menu option to set which build configuration to launch when running or debugging a program. The currently selected project can be launched by clicking the Run () or Debug () control on the tool bar to launch the project with the currently active build configuration. When no project is selected the last project debugged will be launched.

If no launch configuration is present in the project, one is created on initial launch. Subsequent launches of the project will use either the last launch configuration or if more than one launch configuration exists, it uses the most correct one.

NOTE The Carbide Run and Debug buttons are shaded in blue to indicate their behavior differs from the standard Eclipse behavior.

Table 1 Build Configuration items
diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm Tue Aug 31 07:53:48 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/build_targets.htm Thu Sep 02 13:19:32 2010 -0500 @@ -15,13 +15,13 @@

Supported Target Types

Carbide.c++ supports a variety of build targets based upon the SDKs and which version of the Carbide tools used by the project. The table below identifies which build targets are possible for a specific SDK.

-

NOTE Check the SDK Preferences page to see if an SDK you have installed and whether its build configurations are supported.

+

NOTE Check the SDK Preferences page to see if an SDK you have installed and whether its build configurations are supported.

Table 1. Supported target types for all versions of Carbide.c++
+(S60 5.0, Symbian ^3, Symbian ^4) @@ -61,7 +61,6 @@
Target Types Platform Security
-(S60 5.0, Symbian ^3)
RAPTOR, GCCE, ARMV5, ARMV5_ABIV2
Related tasks
diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm Tue Aug 31 07:53:48 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/registers.htm Thu Sep 02 13:19:32 2010 -0500 @@ -43,8 +43,7 @@ diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html Tue Aug 31 07:53:48 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/tour.html Thu Sep 02 13:19:32 2010 -0500 @@ -52,32 +52,19 @@

  • - Add scalable graphics (MIF) and Symbian OS bitmaps (MBM) to projects, and edit these resources. You can add these using the New command, which is available on the File menu, and on the pop-up menus of the Project Explorer and Symbian Project Navigator views. MBM and MIF editors are provided to modify + Add scalable graphics (MIF) and Symbian OS bitmaps (MBM) to projects, and edit these resources. You can add these using the New command, which is available on the File menu, and on the pop-up menus of the Project Explorer and Symbian Project Navigator views. MBM and MIF editors are provided to modify the resources.

    For more information, see Creating an MBM File.

    • -
  • -

    - Build programs for multiple SDKs and targets. The standard CDT build - commands such as Build Project and Build All Configurations, - which are available in the Project menu, are used.

    -

    +

  • +

    + Build programs for multiple SDKs and targets. The standard CDT build commands such as Build Project and Build All Configurations, + which are available in the Project menu, are used.

    +

    For more information, see Building Projects.

    • - - - - - - diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm Tue Aug 31 07:53:48 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_debugger.htm Thu Sep 02 13:19:32 2010 -0500 @@ -21,8 +21,8 @@
  • Restarting the debugger
    • -
  • Variable information in the Variables view—see the variables in the executing code, their values, and their types
    • -
  • Breakpoint information in the Breakpoints view—see the breakpoints, conditional breakpoints, and breakpoint actions
    • +
  • Variable information in the Variables view—see the variables in the executing code, their values, and their types
    • +
  • Breakpoint information in the Breakpoints view—see the breakpoints, conditional breakpoints, and breakpoint actions
  • Source code—see the source code under debugger control
    • Related concepts
    diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm Tue Aug 31 07:53:48 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/working_with_programs.htm Thu Sep 02 13:19:32 2010 -0500 @@ -12,7 +12,7 @@

    This section explains how to use breakpoints, breakpoint actions, and watchpoints to manipulate execution of your program in the Carbide™ IDE:

    Starting a session

    -

    Use the Debug command () to execute a program under debugger control using the current launch configuration settings.

    +

    Use the Debug command () to execute a program under debugger control using the current launch configuration settings.

    If the project does not already have a launch configuration, the New Launch Configuration Wizard will automatically create one for emulator targets or ask for additional information to create phone or hardware device configurations. It will generate a default name for the launch configuration and add it to the list of available launch configurations for the project. Once complete and saved the debug session is launched. If a launch configuration is already available, the Debug command launches the last launch configuration used by the project.

    To create new launch configurations where none previously existed or launch the last one created:

    To launch a specific launch configuration:

    diff -r c7e4f77e6b70 -r aac450e0c99e core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm Tue Aug 31 07:53:48 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm Thu Sep 02 13:19:32 2010 -0500 @@ -105,7 +105,6 @@
  • Setting Watchpoints
  • Enabling Watchpoints
  • Disabling Watchpoints
    • -
  • Clearing Watchpoints
    • Related references