diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_buildenv_newenvvar.png b/doc/org.eclipse.cdt.doc.user/images/cdt_buildenv_newenvvar.png index 725b357012f..0bec0a2f6af 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_buildenv_newenvvar.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_buildenv_newenvvar.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/mpref_discovopts.png b/doc/org.eclipse.cdt.doc.user/images/mpref_discovopts.png index fe0c566f191..caf74ec2129 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/mpref_discovopts.png and b/doc/org.eclipse.cdt.doc.user/images/mpref_discovopts.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/prop_environment.png b/doc/org.eclipse.cdt.doc.user/images/prop_environment.png index e303316ae29..86d4672794e 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/prop_environment.png and b/doc/org.eclipse.cdt.doc.user/images/prop_environment.png differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_discovery.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_discovery.htm index b5a0040ace9..a4e6b10e40d 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_discovery.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_discovery.htm @@ -8,30 +8,31 @@ -

Discovery options preferences

-
-

Controls how to discover information required to build your project, enhance search and Content Assist functionality, and automatically enhance your makefile, such as include paths and symbol definitions.

-

Discovery options preference page

+

Discovery Options properties

+

Use the Discovery Options properties panel to control how information required to build your project is discovered, enhance search and Content Assist functionality, and automatically enhance your makefile, such as include paths and symbol definitions.

+

Discovery options preference page

- -
- -
+
Discovery options preferences
+ - - + + + + + + - - + + - - + + - - + + - + + + + - + - + - + + + + - + + + + + - - - - - - + + - - + + - + - + + - - + + + + + +
Discovery Options preferences
Configuration
GroupDescription
Configuration Click here for a description.
Manage configurations
Manage Configurations... Click here for a description.
Discovery Profiles Scope
Discovery Profiles Scope Specifies the type of profile to set for discovery:
  • Per Language - Enables the association of different profiles with different resource types (different tools and input types), to have different settings discovered, e.g. for C and C++ source files and for different tools used by the project. @@ -44,51 +45,57 @@ the entire project (configuration). This means that both the project and per-fil
Left pane list (language specific)
Tools (language specific list) Shows a list of language specific compilers. Select a language from the list.
Automated discovery of paths and symbols
Automate discovery of paths and symbols Scans the build output to populate the path and symbol tables, such as symbol definitions, system include directories, local include directories, macros, and include files.
Report path detection problems Sets the notification of diagnostic errors for include paths that the Eclipse CDT is unable to resolve as it parses the build output.
Discovery profile Indicates the discovery profile to use for paths and symbol detection. The type of Configuration and Discovery Profile Scope you specify determine what which Discovery Profile options display on this tab.
Discovery profile options
Enable build output scanner info discovery Configures the scanner to parse the output from a build for compiler commands with options that specify the definition of preprocessor symbols, and include search paths (for GCC compiler, -D and -I respectively). This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
Load build output from fileSpecifies the name of the file you selected to load the build output from.
Load Lets you load a file to discover paths and symbols based on a previous builds' output. To activate the discovery select a build log file and then the Load button. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.

Note: Click Variables to open the Select Variables window to define a build output file.

Load build output from fileSpecifies the name of the file you selected to load the build output from. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
Browse
Browse... Click to locate a previously built output file to load the build output from. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
Variables
Variables... Click to specify an argument for, or create and configure simple launch variables which you can reference in launch configurations that support variables. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
Enable generate scanner info command Enables the retrieval of information from the scanner. If it is not selected, the includes will be populated with default gcc system includes; Eclipse gathers the compiler settings based on the specified toolchain. This means that the Eclipse CDT can obtain the default gcc system includes to associate with the project.

When selected, you can specify any required compiler specific commands in the Compiler invocation command field.

Compiler invocation command Indicates the compiler specific command used to invoke the compiler (such as gcc, or more complicated commands used to perform all necessary steps for compiling C/C++ source files into .o files, and linking the object files and libraries into an executable program. For example, the command gcc -E -P -v hello.c | hello.cpp reads a compiler's configuration file and prints out information that includes the compiler's internally defined preprocessor symbols and include search paths. The information is complementary to the scanner configuration discovered when the output is parsed (if you've enabled the Enable build output scanner info discovery option), and is added to the project's scanner configuration. You can click Browse to locate this command, if required. @@ -108,12 +115,16 @@ the entire project (configuration). This means that both the project and per-fil
  • -iwithprefix dir
  • -iwithprefixbefore dir
  • -
    Browse
    Browse... Click to browse for a file to include in the compiler invocation command. This button is only visible when Configuration is set to Release and the Discovery Profiles Scope is set to Configuration-wide.
    Compiler invocation argumentsEnter additional arguments to send to the chosen compiler.
    @@ -159,7 +170,7 @@ the entire project (configuration). This means that both the project and per-fil
  • C/C++ Project Properties, Run/Debug Settings page

    - +

    QNX Copyright Statement

    diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_environment.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_environment.htm index 30d31fad0eb..216ab4669a1 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_environment.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_prop_build_environment.htm @@ -9,26 +9,28 @@

    C/C++ Project Properties, Environment

    -Customizes the build environment for all projects in the workspace; it lets you control the environment variables used by the build. +Use the Environment property page to customize the build environment for all projects in the workspace; it lets you control the environment variables used by the build.

    C/C++ Project Properties, Environment

    - -
    - -
    +
    Environment preference options
    + + + + + - + @@ -52,20 +54,20 @@ Customizes the build environment for all projects in the workspace; it lets you - - + - - + - + @@ -138,8 +140,8 @@ Customizes the build environment for all projects in the workspace; it lets you
  • C/C++ Project Properties, Run/Debug Settings page

    +

    Intel Copyright Statement

    -
  • Environment preference options
    GroupDescription
    Configuration Click here for a description.
    Manage configurationsManage Configurations... Click here for a description.
    Replaces the native environment with the specified variables, and then restores the native environment upon its completion.
    NewOpens a dialog to create a new environment variable and value. Custom environment variables that you create appear in bold within the list. -

    C/C++ Project Properties, Environment, New environment variable


    +
    Add...Opens the New variable dialog to create a new environment variable and value. Custom environment variables that you create appear in bold within the list. +

    C/C++ Project Properties, Environment, New environment variable

    Click Variables to Select variables by name to include in the value. Select Add to all configurations to make this new environment variable available to all configurations for the selected project; otherwise, the variable is only available for the currently selected configuration.

    SelectOpens the Select variables dialog where you can choose from a list of system variables. + Select...Opens the Select variables dialog where you can choose from a list of system variables.

    C/C++ Project Properties, Environment, New environment variable

    EditEdit... Modifies the name and value of the selected environment variable.