# HG changeset patch # User dadubrow # Date 1249678206 18000 # Node ID 2ee12718a766c5f626112b63b5080e8f00805ae2 # Parent 56887eb7b034a30e5110ada75a30ec5787c02be8# Parent 6b88a951e72a171672421868ef10621dfd35364f merge commit diff -r 56887eb7b034 -r 2ee12718a766 connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp --- a/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp Fri Aug 07 15:49:22 2009 -0500 +++ b/connectivity/com.nokia.tcf/native/TCFNative/TCFCommTCP/TcpComm.cpp Fri Aug 07 15:50:06 2009 -0500 @@ -152,7 +152,7 @@ { int i = SO_MAX_MSG_SIZE; // set socket options - BOOL keepAlive = FALSE; + BOOL keepAlive = TRUE; setsockopt(m_socket, SOL_SOCKET, SO_KEEPALIVE, (const char*)&keepAlive, sizeof(BOOL)); struct linger l; diff -r 56887eb7b034 -r 2ee12718a766 core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_proj_settings_sbsv1.png Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/carbide_proj_settings_sbsv1.png has changed diff -r 56887eb7b034 -r 2ee12718a766 core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm Fri Aug 07 15:49:22 2009 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm Fri Aug 07 15:50:06 2009 -0500 @@ -1,135 +1,135 @@ - - - - - - -Build preferences - - - - - -

Build preferences

-

The Carbide.c++ > Build - page in the Preferences window provides global preferences to control general build options like clean, test components, dependency tracking, concurrent build jobs, build behavior, and emulator options.

-

-

Figure 1 - Build workspace preferences page

-

The following options are available in both the global Build preference panel and the project Properties > Carbide.c++ > Carbide Project Settings panel.

-
Table 1 Build Preferences —items
- - - - - - - - - - - - - - - - - - - - - -
ItemExplanation
Use built-in Nokia x86 environment variables for WINSCW builds

If enabled, Carbide adds the built-in x86 compiler environment variables to the build environment.

-

If the option is not - checked, the build process will build with whatever tools are defined in your environment.

-

A directory named x86Build at the root of the product installation contains the build tools, libraries, and env_update.exe.

Build test components when building from bld.inf

Enable to build all the projects defined by .MMP files listed under the PRJ_TESTMMPFILES section of the component description file.

-

If not enabled, only those projects defined by .MMP files listed under the PRJ_MMPFILES section of the component description file are built.

Run builds concurrently (improves compile time)

Enable to tell Carbide to generate concurrent builds up to the amount specified in the Build jobs field. This option can significantly reduce build times as it takes advantage of multi-core processors and hyperthreading to run multiple threads at once.

-

If not enabled, only a single build is run. Note that this may be required if your project contains circular dependencies or other issues that prevent concurrent builds from executing correctly.

Use default incremental builder Enable to have Carbide determine if a build is required by checking the state of any file in the workspace.
-

 

-

sbsv1 tab

-

Figure 2 - SBSv1 Tab

-
Table 2 Symbian Build System v1 tab
- - - - - - - - - - - - - - - - - - - - - - - - - -
ItemExplanation
Clean level

Specifies the level of clean to perform on project files. The levels include:

-
    -
  • Level 0 (abld clean) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker
  • -
  • Level 1 (abld reallyclean) - performs a clean operation, but also removes all exported files and makefiles
  • -
  • Level 2 (abld reallyclean, bldmake clean) - performs a reallyclean operation and then removes all files created by bldmake
  • -
-
Manage dependency tracking (improves build speed)

Enable to have Carbide manage the dependency tracking for source and resource files. Carbide does this by separating out the generation of dependency information from the makefile and managing the entire process. All builds now can quickly compare whether new dependency information is required due to changes in a source file and only build those that need updating.

-

If not enabled, the Symbian OS command line build system handles all dependency tracking by generating the dependency information in the makefiles. Because it does this for all project files, regardless of the number of changes, it can result in a performance penalty. A single edit in a MMP file forces a complete regeneration of the makefile dependency information for all project files.

-
Show a dialog to modify build actions when modified MMPs are detected

Enable to have Carbide ask before starting a build what action to take when modified files are detected. When disabled, do not show a dialog but use the default action listed below.

-
Default action to take when mmp files are modified

Defines the default action Carbide should execute when it detects modified MMP files and the option above is disabled:

-
    -
  • None
  • -
  • Link Only
  • -
  • Compile and Link
  • -
-
Do not offer to track dependencies for projects build on command-line If you build a project from the command-line (with 'abld build') and then import the project into Carbide and attempt to build, Carbide will prompt you if you would like Carbide to manage source dependencies for you. Enabling this option insures Carbide will not ask you to manage dependencies (they will be done as normally done via 'abld build' command).
-

 

-

sbsv2 tab

-

Figure 3 - SBSv2 Tab

-
Table 3 Symbian Build System v2 tab
- - - - - - - - - - - - - - - - - - - - - -
ItemExplanation
Clean level Select the level of clean when cleaning a project. -

abld clean erases all files created by a corresponding abld target command (all intermediate files created during compilation and all executables and import libraries created by the linker)

-

abld reallyclean does what abld clean does, and also removes files exported by abld export and makefiles generated by abld makefile, or the abld test equivalents

Keep going

This build option tells a particular command to keep going even if unrelated build steps report errors or files are missing.

Debug mode

This option generates symbolic debug information for release or debug builds, independent of the compiler optimization level.

-

By default, the build system generates symbolic debug information only for the debug builds. With this option, the generation of symbolic debug information is extended to release builds to support debugging of release binaries on ARM ABI compliant platforms.

Override default make engine Check this box to enable an edit box to specify the make engine to use, for example, eMake from Electric Cloud.
-

 

-
Related references
- - - - - + + + + + + +Build preferences + + + + + +

Build preferences

+

The Carbide.c++ > Build + page in the Preferences window provides global preferences to control general build options like clean, test components, dependency tracking, concurrent build jobs, build behavior, and emulator options.

+

+

Figure 1 - Build workspace preferences page

+

The following options are available in both the global Build preference panel and the project Properties > Carbide.c++ > Carbide Project Settings panel.

+
Table 1 Build Preferences —items
+ + + + + + + + + + + + + + + + + + + + + +
ItemExplanation
Use built-in Nokia x86 environment variables for WINSCW builds

If enabled, Carbide adds the built-in x86 compiler environment variables to the build environment.

+

If the option is not + checked, the build process will build with whatever tools are defined in your environment.

+

A directory named x86Build at the root of the product installation contains the build tools, libraries, and env_update.exe.

Build test components when building from bld.inf

Enable to build all the projects defined by .MMP files listed under the PRJ_TESTMMPFILES section of the component description file.

+

If not enabled, only those projects defined by .MMP files listed under the PRJ_MMPFILES section of the component description file are built.

Run builds concurrently (improves compile time)

Enable to tell Carbide to generate concurrent builds up to the amount specified in the Build jobs field. This option can significantly reduce build times as it takes advantage of multi-core processors and hyperthreading to run multiple threads at once.

+

If not enabled, only a single build is run. Note that this may be required if your project contains circular dependencies or other issues that prevent concurrent builds from executing correctly.

Use default incremental builder Enable to have Carbide determine if a build is required by checking the state of any file in the workspace.
+

 

+

sbsv1 tab

+

Figure 2 - SBSv1 Tab

+
Table 2 Symbian Build System v1 tab
+ + + + + + + + + + + + + + + + + + + + + + + + + +
ItemExplanation
Clean level

Specifies the level of clean to perform on project files. The levels include:

+
    +
  • Level 0 (abld clean) - removes all the intermediate files created during compilation, and all the executables and import libraries created by the linker
  • +
  • Level 1 (abld reallyclean) - performs a clean operation, but also removes all exported files and makefiles
  • +
  • Level 2 (abld reallyclean, bldmake clean) - performs a reallyclean operation and then removes all files created by bldmake
  • +
+
Manage dependency tracking (improves build speed)

Enable to have Carbide manage the dependency tracking for source and resource files. Carbide does this by separating out the generation of dependency information from the makefile and managing the entire process. All builds now can quickly compare whether new dependency information is required due to changes in a source file and only build those that need updating.

+

If not enabled, the Symbian OS command line build system handles all dependency tracking by generating the dependency information in the makefiles. Because it does this for all project files, regardless of the number of changes, it can result in a performance penalty. A single edit in a MMP file forces a complete regeneration of the makefile dependency information for all project files.

+
Show a dialog to modify build actions when modified MMPs are detected

Enable to have Carbide ask before starting a build what action to take when modified files are detected. When disabled, do not show a dialog but use the default action listed below.

+
Default action to take when mmp files are modified

Defines the default action Carbide should execute when it detects modified MMP files and the option above is disabled:

+
    +
  • None
  • +
  • Link Only
  • +
  • Compile and Link
  • +
+
Do not offer to track dependencies for projects build on command-line If you build a project from the command-line (with 'abld build') and then import the project into Carbide and attempt to build, Carbide will ask if you would like Carbide to manage source dependencies for you. Enabling this option insures Carbide will not ask you to manage dependencies (they will be done as normally done via 'abld build' command).
+

 

+

sbsv2 tab

+

Figure 3 - SBSv2 Tab

+
Table 3 Symbian Build System v2 tab
+ + + + + + + + + + + + + + + + + + + + + +
ItemExplanation
Clean level Select the level of clean when cleaning a project. +

abld clean erases all files created by a corresponding abld target command (all intermediate files created during compilation and all executables and import libraries created by the linker)

+

abld reallyclean does what abld clean does, and also removes files exported by abld export and makefiles generated by abld makefile, or the abld test equivalents

Keep going

This build option tells a particular command to keep going even if unrelated build steps report errors or files are missing.

Debug mode

This option generates symbolic debug information for release or debug builds, independent of the compiler optimization level.

+

By default, the build system generates symbolic debug information only for the debug builds. With this option, the generation of symbolic debug information is extended to release builds to support debugging of release binaries on ARM ABI compliant platforms.

Override default make engine Check this box to enable an edit box to specify the make engine to use, for example, eMake from Electric Cloud.
+

 

+
Related references
+ + + + + diff -r 56887eb7b034 -r 2ee12718a766 core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm --- a/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Fri Aug 07 15:49:22 2009 -0500 +++ b/core/com.nokia.carbide.cpp.doc.user/html/release_notes.htm Fri Aug 07 15:50:06 2009 -0500 @@ -41,7 +41,7 @@
  • Eclipse 3.5 — The Eclipse 3.5 project (Galileo) provides the foundation, or integration platform, on which Carbide.c++ is built. See What's New in 3.5 for more information.
  • 2.1.0

    diff -r 56887eb7b034 -r 2ee12718a766 debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml --- a/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml Fri Aug 07 15:49:22 2009 -0500 +++ b/debuggercdi/com.nokia.carbide.cpp.debug.capabilities/plugin.xml Fri Aug 07 15:50:06 2009 -0500 @@ -25,24 +25,65 @@ --> + + + + + isEqualityPattern="true" + pattern="org.eclipse.cdt.dsf.gdb/org.eclipse.cdt.dsf.gdb.launch.localCLaunch"> + + + + + + + isEqualityPattern="true" + pattern="org.eclipse.cdt.debug.core/org.eclipse.cdt.launch.attachLaunchType"> + + + + + + - + - + + + + diff -r 56887eb7b034 -r 2ee12718a766 debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/ui/executables/SymbianSourceFileRemapping.java --- a/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/ui/executables/SymbianSourceFileRemapping.java Fri Aug 07 15:49:22 2009 -0500 +++ b/debuggercdi/com.nokia.cdt.debug.cw.symbian/src/com/nokia/cdt/debug/cw/symbian/ui/executables/SymbianSourceFileRemapping.java Fri Aug 07 15:50:06 2009 -0500 @@ -16,7 +16,6 @@ */ package com.nokia.cdt.debug.cw.symbian.ui.executables; -import org.eclipse.cdt.debug.core.executables.Executable; import org.eclipse.cdt.debug.core.executables.ISourceFileRemapping; import org.eclipse.cdt.debug.core.sourcelookup.ICSourceLocator; import org.eclipse.cdt.debug.internal.core.sourcelookup.CSourceLookupDirector; @@ -34,13 +33,13 @@ public class SymbianSourceFileRemapping implements ISourceFileRemapping { - public String remapSourceFile(Executable executable, String filePath) { + public String remapSourceFile(IPath executable, String filePath) { String epocRoot = ""; - String[] segs = executable.getPath().segments(); + String[] segs = executable.segments(); for (int i = 0; i < segs.length; i++) { if (segs[i].equalsIgnoreCase("epoc32")) - epocRoot = executable.getPath().removeLastSegments(segs.length - i).toOSString(); + epocRoot = executable.removeLastSegments(segs.length - i).toOSString(); } if (epocRoot.length() > 0) {