# HG changeset patch # User timkelly # Date 1271788426 18000 # Node ID 5995486b4beddc26025b553b221ffa8b0d53a9be # Parent 8eb0d2bd6e73009899b2611541e37333ba4819e5# Parent d4fee22b8cbbea431b09694e6f1fff066ccfb3e7 merge commit diff -r 8eb0d2bd6e73 -r 5995486b4bed carbidesdk/com.nokia.carbide.cpp.src-feature/.project --- a/carbidesdk/com.nokia.carbide.cpp.src-feature/.project Tue Apr 20 13:33:06 2010 -0500 +++ b/carbidesdk/com.nokia.carbide.cpp.src-feature/.project Tue Apr 20 13:33:46 2010 -0500 @@ -1,6 +1,6 @@ - com.nokia.carbide.cpp.sdk-feature + com.nokia.carbide.cpp.src-feature diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/book.css --- a/core/com.nokia.carbide.cpp.doc.user/book.css Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/book.css Tue Apr 20 13:33:46 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; } diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/bugs_fixed.htm Tue Apr 20 13:33:46 2010 -0500 @@ -25,11 +25,18 @@
  • 10525 - Raptor builds correctly report an error of a missing header file and not the input source file itself.
  • 10591 - Carbide now recognizes the Symbian ^3 SDK and supplies the proper templates and build configurations.
  • 10659 - Updated x86 WINSCW tools to build 489.
    • +
  • 10674 - Resolved an issue where SBSv2 variant names where not parsed and located correctly.
    • +
  • 10681 - Carbide is now more robust in automatically detecting Qt installations.
    • +
  • 10742 - SBSv2 now always appears as a build option and now displays appropriate errors if the SBS_HOME environment variable is missing.
  • 10743 - Corrected an issue that prevented compiling of files with different case handling of file names across different OS systems.
  • 10759 - Corrected an issue where a remote connection was not removed from the Remote Connections view when the device was no longer connected.
  • 10795 - Carbide detection of Symbian^3 SDKs is now more robust.
  • 10805 - Improved device connection behavior when devices are plugged and unplugged or when devices are swapped making notification message more reliable.
  • 10861 - Launch wizard can no longer automatically select DLLs as the executable.
    • +
  • 10967 - Resolved an issue where use of the hyphen character (-) in a file name was not recognized as a valid character.
    • +
  • 11022 - Carbide no longer relies on the SBS_HOME environment variable being present to work with Raptor builds.
    • +
  • 11072 - Fixed an indentation issue that added additional tabs after typing <enter>.
    • +
  • 11096 - Resolved a crasher where the number of binaries being debugged exceeded the stop-mode limit allowed.

    • Bugs Fixed in v2.5.0

    - + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/concepts/arm_registers.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/arm_registers.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/arm_registers.htm Tue Apr 20 13:33:46 2010 -0500 @@ -33,7 +33,7 @@ - + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm Tue Apr 20 13:33:46 2010 -0500 @@ -60,7 +60,7 @@
  • Disabling Breakpoints
  • Clearing Breakpoints
    • - + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml --- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/carbide_ide_dialogs_help.xml Tue Apr 20 13:33:46 2010 -0500 @@ -27,14 +27,20 @@ Use the Carbide Project Settings window to specify project build options. + + - The Carbide Build Configurations page allows you to specify SIS file options and environment variable settings for the selected build configuration + + + + + @@ -130,11 +136,13 @@ + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml --- a/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml Tue Apr 20 13:33:46 2010 -0500 @@ -310,6 +310,16 @@ + + + + + Carbide specific project settings. + + + + + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm Tue Apr 20 13:33:46 2010 -0500 @@ -19,6 +19,6 @@ - + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/applications.htm Tue Apr 20 13:33:46 2010 -0500 @@ -14,6 +14,6 @@ - + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/attach_process.htm Tue Apr 20 13:33:46 2010 -0500 @@ -21,7 +21,7 @@
  • The Debugger tab defines debug configurations, such as entry point to begin debugging, target options, and instruction set.
  • The ROM Log tab allows you to specify where the ROM log file is stored and the Epoc32 directory.
  • The Executables tab allows you to specify which executables that you want to debug that are part of the project.
    • -
  • The Source tab (standard CDT page) 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.
    • +
  • The Source tab (standard CDT page) 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.
  • The Common tab (standard CDT page) defines general information about the launch configuration. You may choose to store the launch configuration in a specific file.

    • Other references

    diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/launch_configuration_filter.htm Tue Apr 20 13:33:46 2010 -0500 @@ -4,27 +4,26 @@ -Launch Configuration Filters - +Launch Configuration Filtering + -

    Launch Configuration Filters

    -

    Use the Launch Configurations panel to filter out which launch configurations appear in the Run or Debug window used to define launch configurations. For example, select the Delete configurations when associated resource is deleted option and check the configuration types that you do not want to appear in the Run > Run... or Run > Debug... window, as shown in Figure 1.

    -

    -

    Figure 1 - Launch Configurations preference panel

    +

    Launch Configuration Filtering

    +

    Use the Launch Configuration preference panel to filter the launch configurations that appear in the configurations list in the Run or Debug dialog. This allows you to manage which configuration types are shown. For example, enable the Filter checked launch configuration types option and check the configuration types that you do not want to appear in the Run and Debug dialogs. As shown in Figure 1, all the configurations related to TRK have been enabled and won't appear in the configurations list.

    +

    +

    Figure 1 - Launch Configurations preference panel

    Related references
    Related tasks
    -
    diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/launch/pages_overview.htm Tue Apr 20 13:33:46 2010 -0500 @@ -20,9 +20,9 @@
  • ROM Image
  • ROM Log
  • x86 Exceptions
    • -
  • Source (standard CDT page)
    • +
  • Source (standard CDT page)
  • Common (standard CDT page)
    • - + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/reference/AIFEditor.html --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/AIFEditor.html Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/AIFEditor.html Tue Apr 20 13:33:46 2010 -0500 @@ -91,7 +91,7 @@ - + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config.htm Tue Apr 20 13:33:46 2010 -0500 @@ -11,7 +11,7 @@

    Carbide Build Configurations

    Use the Carbide Build Configurations panel to specify the project's active build configuration and its related build properties.

    -

    +

    Figure 1 - Carbide Build Configurations panel

    Table 1 Carbide Build Configuration items
    @@ -32,17 +32,12 @@ - - + + - - + + @@ -56,11 +51,12 @@
    Other references
    - + \ No newline at end of file diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_env.htm Tue Apr 20 13:33:46 2010 -0500 @@ -16,7 +16,7 @@
  • PATH — will always place "${EPOCROOT}\epoc32\tools;${EPOCROOT}\epoc32\gcc\bin;" at the front of the PATH regardless of what it is changed to
  • PATH, EPOCROOT, and *MW variables — cannot be undefined as they are required for system builds
    • -

    +

    Figure 1 - Environment Variables

    Table 1 Environment variable items

    The SIS Builder 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.
    Environment

    The Environment tab allows you to view the current User and System environment variables that will be used when any abld command is invoked.

    		SBSv2The SBSv2 pane is used to define which build configuration variant to use.
    Arguments

    The Arguments tab allows you to add additional arguments to common build commands used by Carbide during the build process including:

    -
      -
    • Bldmake Arguments
      • -
    • Abld Arguments
      • -
    -

    See the Symbian OS documentation for a specific command for a complete list of valid arguments.

    		Environment

    The Environment tab allows you to view the current User and System environment variables that will be used when any abld command is invoked.
    Paths and Symbols
    @@ -53,8 +53,9 @@ diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_paths.htm Tue Apr 20 13:33:46 2010 -0500 @@ -17,14 +17,15 @@
  • Using the Macro File defined in the Carbide Macro Settings panel

    • You can also specify a macro file using the Carbide Macro Settings page in the Properties for project dialog.

    -

    +

    Figure 1 - Paths and Symbols pane

    Other references
    diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sbsv2.htm --- /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:33:46 2010 -0500 @@ -0,0 +1,43 @@ + + + + + + + +SBSv2 page + + + +

    SBSv2 page

    +

    The SBSv2 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 variant_configs.xml file.

    +

    WARNING The project's MMP file must include the FEATUREVARIANT settings.

    +

    +

    Figure 1 - SBSv2 pane

    +
    Table 1 SBSv2 items
    +
    + + + + + + + + + + + + +
    ItemExplanation
    Apply variant to build configuration

    Enter build configuration variant name. Names must start with a "." (period) to be identified as a variant.

    Build DetailsShows the command line sent to make and the destination of the output based on the variant name specified.
    +
    Other references
    + + + + + \ No newline at end of file diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/build_properties/pane_build_config_sis.htm Tue Apr 20 13:33:46 2010 -0500 @@ -17,7 +17,7 @@
  • Unsigned SIS file - names of the unsigned SIS files used by the project
  • Signed SIS file - names of the signed SIS files created by the project
    • -

    +

    Figure 1 - SIS Builder pane

    Table 1 SIS Builder items
    @@ -59,9 +59,10 @@
    Other references
    diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_build_config_sbsv2.png Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_build_config_sbsv2.png has changed diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/reference/indexer.html --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/indexer.html Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/indexer.html Tue Apr 20 13:33:46 2010 -0500 @@ -4,9 +4,9 @@

    Indexer

    -

    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.

    -

    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.

    +

    The C/C++ Indexer 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.

    +

    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.

    The indexer runs on a background thread and reacts to resource change events such as:

    -

    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).

    -

    NOTE You can also rebuild a project's index by selecting a project, right-click to display the context menu and select Rebuild Index.

    -

    +

    The global Indexer is accessed by selecting Window > Preferences > C/C++ > Indexer (figure 1). The sections outlined in red appear as part of the project level indexer.

    +

    NOTE You can also rebuild a project's index by selecting a project, then right-click and select the Rebuild Index menu item.

    +

    Figure 1 - Indexer Window in Preferences Panels

    -

     

    -

    -

    Figure 2 - Indexer Window in Project Properties

    -

     

    +

    The project indexer is accessed by selecting a project in the Project Explorer or Symbian Project Navigator view and selecting Project > Properties > C/C++ General > Indexer (figure 2).

    +

    +

    Figure 2 - Indexer Window in Project Properties

    - + @@ -61,7 +60,7 @@
  • Creating Launch Configurations
  • Creating Build Configurations
    • - + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/tasks/processes/attach_debugger_to_process.htm Tue Apr 20 13:33:46 2010 -0500 @@ -40,7 +40,7 @@
  • Debug Window
  • Symbian OS View
    • - + diff -r 8eb0d2bd6e73 -r 5995486b4bed core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml --- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Tue Apr 20 13:33:06 2010 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml Tue Apr 20 13:33:46 2010 -0500 @@ -97,6 +97,7 @@ + @@ -341,6 +342,7 @@ +
    NameFunction
    Available indexers Select indexer

    Dropdown list of available index options.

      -
    • No Indexer - Project source files will not be indexed, therefore search features will not work accurately and code completion will not be available.
    • 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.
    • Full C/C++ Indexer - Performs a complete parse of all source files and takes up the most amount of time to complete.
      • +
    • No Indexer - Project source files are not indexed, therefore search features will not work accurately and code completion will not be available.