diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_build_over.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_build_over.htm index 02c43edffe4..f00555c11d2 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_build_over.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_build_over.htm @@ -89,8 +89,6 @@ build. By default, this feature is disabled.


Defining project properties
Building

-
- 

IBM Copyright Statement

diff --git a/doc/org.eclipse.cdt.doc.user/doc.zip b/doc/org.eclipse.cdt.doc.user/doc.zip index 70ed127f74a..1674f7b3a28 100644 Binary files a/doc/org.eclipse.cdt.doc.user/doc.zip and b/doc/org.eclipse.cdt.doc.user/doc.zip differ diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm index d1c4c6fecd4..a08dade0218 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm @@ -20,6 +20,43 @@ errors.

To See + + Rename a project + Renaming a + project + + + Select referenced projects + Selecting + referenced projects + + + Configure how the CDT handles make errors, + change the default build command and specify a make target + Defining build + settings + + + Control which build errors are displayed + Filtering + errors + + + Select a binary parser + Selecting a + binary parser + + + Include paths and symbols + Including paths + and symbols + + + For Managed Make projects, select a deployment platform for managed + make projects + Selecting a + deployment platform + Set build order Setting a diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run.htm index b87330b8a5a..09bb464f4b6 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run.htm @@ -6,13 +6,13 @@ -Running and debugging +Running and debugging projects -

Running and debugging

+

Running and debugging projects

This section explains how to run a C or C++ application using an existing run configuration and how to create a new run configuration.

diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run_config.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run_config.htm index 8f67594e69d..0ca6dc387db 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run_config.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run_config.htm @@ -13,7 +13,7 @@

Creating or editing a run/debug configuration

- 

You can run an application by right-clicking the file and clicking Open +

You can run an application by right-clicking the file and clicking Open With > System Editor or you can create a run configure a run environment with which to run your application.

This section explains how to create a run or debug configuration.

diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm index 87194c314bd..491d68a073a 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm @@ -28,11 +28,6 @@ perform required tasks.

- - - -
Create projects Creating a project
Define project propertiesDefining project - properties
Work with C or C++ project files Working with diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_build_process.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_build_process.htm new file mode 100644 index 00000000000..34548ebec43 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_build_process.htm @@ -0,0 +1,35 @@ + + + + + + + + +Building manually + + + + + +

Building a CDT project

+ +

Provide roadmap whereby a link is provided to each build setting-related +task.

+ +

Related concepts +
+Build overview

+

Related tasks +
+Defining Build Settings
+Building

+

Related reference +
+Make Builder page, C/C++ Properties window

+ +IBM Copyright Statement + + + + \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm index 1fba99a3932..3a73d707eeb 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm @@ -22,9 +22,9 @@ view. If the file is not found, the icon appears on the project.

You can define the properties on a per project basis in the New Project wizard, in the C/C++ Projects view or in the Navigator view. You can also define -project properties in the Preferences window for future make projects.

+project properties in the Preferences window for future standard make projects.

-

To select error parsers

+

To select error parsers:

  1. Do one of the following:
    2. diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm index f8293472758..b127a4e0e08 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm @@ -23,7 +23,7 @@ and view the contents of the .o file in the C/C++ editor.

    You can define the properties on a per project basis from the New Project wizard, in the C/C++ Projects view or in the Navigator view. You can also define -project properties in the Preferences window for future make projects.

    +project properties in the Preferences window for future standard make projects.

    To select a binary parser:

    diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm index 167a75a161e..a2fea483dfd 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm @@ -21,7 +21,7 @@ used by the builder to locate files that are not in the workspace.

    You can define the properties on a per project basis in the New Project wizard, in the C/C++ Projects view or in the Navigator view. You can also define -project properties in the Preferences window for future make projects.

    +project properties in the Preferences window for future standard make projects.

    To include paths and symbols:

    diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_platf.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_platf.htm index fe03a033ec5..6f6bdb78f09 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_platf.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_platf.htm @@ -14,16 +14,18 @@

    Selecting a deployment platform

    -

    You need to select the platform on which you plan to deploy your program. You -also need to select the configuration(s) for your project.

    +

    For managed make projects, you need to select the platform on which you plan +to deploy your program. You also need to select a release or debug configuration for your project.

    To select a deployment platform:

      +
    1. In the C/C++ Projects view, right-click a project, and select Properties.
    2. Select C/C++ + Build from the list.
    3. To create a configuration with optimization flags enabled and debug - symbols disabled, in the Configurations list, click select the Release check box.
      4. + symbols disabled, in the Configurations list, select Release.
    4. To create a configuration with optimization flags disabled and debug - symbols enabled, in the Configurations list, select the Debug check box.
      5. + symbols enabled, in the Configurations list, select Debug.

    Related concepts
    diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_ref.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_ref.htm index 0a42b195b01..859b4d60a04 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_ref.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_ref.htm @@ -26,8 +26,9 @@ The least used projects are built first.

    1. In the C/C++ Projects view, right-click a project, and select Properties.
      2. -
    2. Select Project References from the list.
      3. -
    3. Select the project references.
      4. +
    4. On the left, select Project References from the list.
      5. +
    5. In the Project references... list, select referenced + projects.
    6. Click OK.

    Related concepts diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm index 37e22a2f941..8d8534b0ae7 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm @@ -21,14 +21,13 @@

    1. In the C/C++ Projects view, right-click a project, and select Rename.
      2. -
    2. Type the new name of your project.
      3. +
    3. Type a new name.
    4. Press Enter.

    Related concepts
    CDT Projects
    - Project file views
    - 

    + Project file views

    Related tasks
    Working with C/C++ project files

    diff --git a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml index c4a214c0c7b..bde9149d608 100644 --- a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml +++ b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml @@ -4,21 +4,13 @@ - - - - - - - - - - - - + + + + @@ -34,6 +26,11 @@ + + + + + @@ -45,9 +42,10 @@ - + +