diff --git a/doc/org.eclipse.cdt.doc.user/images/sprop_make_discovery.png b/doc/org.eclipse.cdt.doc.user/images/sprop_make_discovery.png deleted file mode 100644 index 6fcf2c4c3e4..00000000000 Binary files a/doc/org.eclipse.cdt.doc.user/images/sprop_make_discovery.png and /dev/null differ diff --git a/doc/org.eclipse.cdt.doc.user/images/sprop_make_discovery_file.png b/doc/org.eclipse.cdt.doc.user/images/sprop_make_discovery_file.png new file mode 100644 index 00000000000..0f5498a86d9 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/sprop_make_discovery_file.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/sprop_make_discovery_project.png b/doc/org.eclipse.cdt.doc.user/images/sprop_make_discovery_project.png new file mode 100644 index 00000000000..15d23ee59b6 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/sprop_make_discovery_project.png differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm index dafcc1d7c29..0ac56869f6f 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm @@ -1,64 +1,113 @@ - - - - C/C++ Project Properties, Standard, Discovery Options - + + + C/C++ Project Properties, Standard, Discovery Options + -

C/C++ Project Properties, Standard, Discovery Options

- -

You can define the discovery options on the Discovery Options page of a C/C++ project's properties window.

- -

C/C++ Project Properties, Standard, Discovery Options

- -

+

You can define the discovery options on the Discovery Options page +of a C/C++ project's properties window.
+

-
Automate scanner configuration discovery
-
Select this checkbox to configure the automatic discovery of paths and symbols.
-
Build output parser options
-
Monitors the output of the build to automatically keep the list of include paths and symbols up to date with the makefile.
-
Generate scanner info command options
-
This section allows you to select the scanner info settings.
-
Restore Defaults
Returns any changes back to their default setting.
-
Apply
Applies any changes.
-

- - - -

Related reference
+

Discovery profile
+
Select either per project or per file scanner info discovery +profile.
+ + +

C/C++ Project Properties, Standard, Discovery Options
+

+ +

+

+
+
+
C/C++ Project Properties, Standard, Discovery Options
+
+
+

+
+
Automate scanner configuration discovery
+
Select this checkbox to configure the automatic discovery of +paths and symbols.
+
Build output parser options
+
Monitors the output of the build to automatically keep the list +of include paths and symbols up to date with the makefile.
+
Load buildoutput from file
+
Run discovery of paths and symbols based on build output from a +file.
+
+
Generate scanner info command options
+
This section allows you to select a command to be used for +discovering compiler's internal scanner info.
+

+
+
Restore Defaults
+
Returns any changes back to their default setting.
+
Apply
+
Applies any changes.
+
+

Related reference
C++ Project Properties, Standard, Info
-C++ Project Properties, Standard, Builders
-C++ Project Properties, Standard, File Types
-C++ Project Properties, Standard, Include Paths and Symbols
-C++ Project Properties, Standard, Indexer
-C++ Project Properties, Standard, Make Builder
-C++ Project Properties, Standard, Error Parser
-C++ Project Properties, Standard, Binary Parser
-C++ Project Properties, Standard, Source
-C++ Project Properties, Standard, Output
-C++ Project Properties, Standard, Projects
-C++ Project Properties, Standard, Libraries
-C++ Project Properties, Standard, Path Containers
-C++ Project Properties, Standard, Project References
+C++ Project Properties, Standard, +Builders
+C++ Project Properties, Standard, +File Types
+C++ Project Properties, Standard, +Include Paths and Symbols
+C++ Project Properties, Standard, +Indexer
+C++ Project Properties, Standard, Make +Builder
+C++ Project Properties, Standard, +Error Parser
+C++ Project Properties, Standard, +Binary Parser
+C++ Project Properties, Standard, +Source
+C++ Project Properties, Standard, +Output
+C++ Project Properties, Standard, +Projects
+C++ Project Properties, Standard, +Libraries
+C++ Project Properties, Standard, +Path Containers
+C++ Project Properties, Standard, Project +References
C++ Project Properties, Managed, Info
-C++ Project Properties, Managed, Builders
-C++ Project Properties, Managed, C/C++ Build
-C++ Project Properties, Managed, C/C++ Build, Tool Settings
-C++ Project Properties, Managed, C/C++ Build, Build Settings
-C++ Project Properties, Managed, C/C++ Build, Error Parsers
-C++ Project Properties, Managed, C/C++ Build, Binary Parser
-C++ Project Properties, Managed, File Types
-C++ Project Properties, Managed, Indexer
-C++ Project Properties, Managed, Project References

- - -IBM Copyright Statement - - +C++ Project Properties, Managed, +Builders
+C++ Project Properties, Managed, C/C++ +Build
+C++ Project Properties, +Managed, C/C++ Build, Tool Settings
+C++ Project Properties, +Managed, C/C++ Build, Build Settings
+C++ Project Properties, Managed, C/C++ +Build, Error Parsers
+C++ Project Properties, Managed, +C/C++ Build, Binary Parser
+C++ Project Properties, Managed, +File Types
+C++ Project Properties, Managed, +Indexer
+C++ Project Properties, Managed, Project +References

+IBM Copyright Statement - - \ No newline at end of file + diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm index ebc47ca3482..c16795d95df 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm @@ -1,30 +1,59 @@ - - - - Set Discovery Options - + + + Set Discovery Options + -

Set Discovery Options

- -

For most standard make projects you will want to parse the output of the build to populate your paths and symbols tables.

-

To do so right click on your project and select Properties > C/C++ Make Project > Discovery Options -and select the Automate discovery of paths and symbols checkbox.

- -

C/C++ Project Properties, Standard, Discovery Options

- - -

Related reference
+

For most standard make projects you will want to parse the output of +the build to populate your paths and symbols tables.

+

To do so right click on your project and select Properties > +C/C++ Make Project > Discovery Options +and select the Automate discovery of paths and symbols checkbox.
+

+

There are two discovery profiles available:
+

+ +

C/C++ Project Properties, Standard, Discovery Options
+

+ +

+
C/C++ Project Properties, Standard, Discovery Options
+
+

For both profiles there is an option to discover paths and symbols +based on a previous build output. To activate the discovery select a +build log file and then the Load +button.
+

+

Related reference
Converting CDT 1.x Projects
-C/C++ Project Properties, Standard, Discovery Options

- -IBM Copyright Statement - - +C/C++ Project +Properties, Standard, Discovery Options

+IBM Copyright Statement - - \ No newline at end of file + 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 067a62488d6..20a48a3cab8 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 @@ -1,50 +1,60 @@ - - - -Adding Include paths and symbols - + + + Adding Include paths and symbols + - -

Adding Include paths and symbols

- -

For Standard Make projects you can define include paths and preprocessor symbols for the parser. -This enables the parser to understand the contents of the C/C++ source -code so that you may more effectively use the search and code completion -features.

- -

If Autodiscovery is enabled once a build has completed any discovered paths and symbols will be displayed in the Discoverd Paths section. You can also define the properties on a per project basis in the C/C++ Projects or Navigator views.

- +

For Standard Make projects you can define include paths and +preprocessor symbols for the parser. This enables the parser to +understand the contents of the C/C++ source code so that you may more +effectively use the search and code completion features.

+

If Autodiscovery is enabled once a build has completed any +discovered paths and symbols will be displayed in the Discoverd Paths +section. You can also define the properties on a per project basis in +the C/C++ Projects or Navigator views.

To add include paths and symbols:

    -
  1. To set properties for your project right click your standard make project and select Properties. +
  2. To set properties for your project right click your standard make +project and select Properties. Alternatively, to set properties +for a specific source file in your project right click a source file +within your standard make project and select Properties.
  3. Click C/C++ Include Paths and Symbols.
    - Paths and Symbols Prefereces Window
     
    4. + Paths and Symbols Prefereces Window
    + 
  4. Select Add Preprocessor Symbol...
    - Add Preprocessor Symbols Window
    - and enter your symbol.
     
    5. + Add Preprocessor Symbols Window
    +and enter your symbol.
    + 
  5. Select Add External Include Path...
    - Add External Include Path Window
    - and enter your path.
     
    6. - -
  6. Select the container and click Edit to change the order in which your new path or symbol is used.
    - Edit Paths and Symbols Container Window
     
    7. -
  7. Select the new object and click Up or Down to move it higher or lower in the order, or you can disable it by clicking Disable.
    8. + Add External Include Path Window
    +and enter your path.
    +  +
  8. Select the container and click Edit to change the order +in which your new path or symbol is used.
    + Edit Paths and Symbols Container Window
    + 
    9. +
  9. Select the new object and click Up or Down to +move it higher or lower in the order, or you can disable it by clicking + Disable.
  10. Click Finish to close the Edit Container window.
  11. Click OK to close the Preferences window.
-

Related concepts
+

Related concepts
CDT Projects
Project file views

-

Related tasks
+

Related tasks
Working with C/C++ project files

- -IBM Copyright Statement - +IBM Copyright Statement - - \ No newline at end of file +