diff --git a/doc/org.eclipse.cdt.doc.user/images/make_settings_prefs.png b/doc/org.eclipse.cdt.doc.user/images/make_settings_prefs.png new file mode 100644 index 00000000000..21392b17889 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/make_settings_prefs.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/make_targets.png b/doc/org.eclipse.cdt.doc.user/images/make_targets.png index 6ca21e42c86..d39f8d49de1 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/make_targets.png and b/doc/org.eclipse.cdt.doc.user/images/make_targets.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/makefile_editor_folding_prefs.png b/doc/org.eclipse.cdt.doc.user/images/makefile_editor_folding_prefs.png new file mode 100644 index 00000000000..673bb5400ce Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/makefile_editor_folding_prefs.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/makefile_editor_prefs.png b/doc/org.eclipse.cdt.doc.user/images/makefile_editor_prefs.png new file mode 100644 index 00000000000..b7815199bc6 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/makefile_editor_prefs.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/new_make-behavior.png b/doc/org.eclipse.cdt.doc.user/images/new_make-behavior.png new file mode 100644 index 00000000000..a88c7719ee2 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/new_make-behavior.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/new_make-binary_parser.png b/doc/org.eclipse.cdt.doc.user/images/new_make-binary_parser.png new file mode 100644 index 00000000000..4ac3fd615a7 Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/new_make-binary_parser.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/new_make-builder.png b/doc/org.eclipse.cdt.doc.user/images/new_make-builder.png new file mode 100644 index 00000000000..f00244c9bec Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/new_make-builder.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/new_make-error_parser.png b/doc/org.eclipse.cdt.doc.user/images/new_make-error_parser.png index 845b44f0c60..55c487cdb9d 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/new_make-error_parser.png and b/doc/org.eclipse.cdt.doc.user/images/new_make-error_parser.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/new_make_disc_options.png b/doc/org.eclipse.cdt.doc.user/images/new_make_disc_options.png index 00a85f27c6e..9ea934786ee 100644 Binary files a/doc/org.eclipse.cdt.doc.user/images/new_make_disc_options.png and b/doc/org.eclipse.cdt.doc.user/images/new_make_disc_options.png differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm index 64129c9a3f9..15bcd102912 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm @@ -4,20 +4,24 @@ -Project properties +New CDT Project Wizard -

New Make Projects properties

-

In this section, learn about the C/C++ New Make Projects properties pages.

+

New CDT Project Wizard

+

In this section, learn about the C/C++ New CDT project wizard.

- Make Builder preferences
- Error Parser preferences
- Binary Parser preferences
- Discovery Options preferences
- -

IBM Copyright Statement

+

New CDT Project Wizard preferences
+ Makefile Project preferences
+ Binary Parsers preferences
+ Error Parsers preferences
+ Discovery Options preferences
+ Builder Settings preferences
+ Behaviour preferences
+

+


+IBM Copyright Statement

\ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm new file mode 100644 index 00000000000..7931400c133 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_behavior.htm @@ -0,0 +1,71 @@ + + + + + + +Makefile Project - Behavior page + + + + +

Makefile Project - Behavior page

+

You can define build behavior on the Behavior page of the Makefile Project panel in the Preferences window.

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Makefile Project - Behavior options +
Stop on first build error Stops the build when an error occurs.
Use parallel build Activate to generate parallel builds.
Use optimal jobs number Activate to let the system determine the optimal number of parallel jobs to perform.
Use parallel jobs Set the maximum number of parallel jobs to perform.
Build on resource save (Auto build) Defines what the standard builder will call when a file is saved, it is not recommended to enable Auto Build for C/C++ projects.
Make build target Define what the standard builder will call by default when told to build, rebuild, clean, etc. You can change these so that new projects will use different targets if the defaults are not appropriate. Click Variables to open the Select build variable dialog.
Build (Incremental build) Defines what the standard builder will call when an incremental build is performed.
CleanDefines what the standard builder will call when a clean is performed.
+

Related concepts +
+Build overview

+

Related tasks +
+Defining build settings

+

Related reference
+ New CDT Project Wizard

+
+IBM Copyright Statement + + + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm index 3e4976523d8..f18d7e854ff 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_buildset.htm @@ -4,39 +4,59 @@ -Make Builder page, C/C++ Properties window +Makefile Project - Builder Settings page -

Make Builder page, C/C++ Preferences window

- -

You can define build settings on the Make Builder page of the C/C++ Preferences window.

-

Make Builder Preferences window

-
-
Use default
-
Select this checkbox to use the default make command. Clear the check box to specify a new make command.
-
Build command
-
If you clear the Use default checkbox type a new make command in this field.
-
Stop on first build error
-
Stops the build when an error occurs.
-
Workbench Build Behavior
-
These settings are what the standard builder will call by default when told to build, rebuild, clean, etc. You can change these so that new projects will use different targets if the defaults are not appropriate.
-
Build on resource save (Auto Build)
-
This defines what the standard builder will call when a file is saved, it is not recommended to enable Auto Build for C/C++ projects.
-
- +

Makefile Project - Builder Settings page

+

You can define build settings on the Builder Settings page of the Makefile Project preference panel in the Preferences window.

+

Make Builder Preferences window

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Makefile Project - Builder Settings options +
Builder type Select the type of builder used by the project.
Use default build command Select this checkbox to use the default make command. Clear the check box to specify a new make command.
Build command If you clear the Use default build command checkbox type a new make command in this field.
Generate Makefiles automatically Activate to generate makefiles automatically during a build operation.
Expand Env. Variable Refs in Makefiles Activate to expand environment variable references in the generated makefile.
Build directory Type the build directory path, or click Workspace, File system, or Variables to specify the build directory.

Related concepts
Build overview

Related tasks
Defining build settings

-

Related reference -
-Project properties

-IBM Copyright Statement - +

Related reference
+ New CDT Project Wizard

+
+IBM Copyright Statement \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm index 78ec8b22e53..e878feac16a 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_discovery_options.htm @@ -4,33 +4,58 @@ -Discovery Options, C/C++ Properties window +Makefile Project - Discovery Options page -

Discovery Options, C/C++ Preferencs window

- -

You can configure various options for the scanner configuration on the Discovery Options page of the C/C++ Properties window.

-

Discovery Options Preferences Window

-
-
Automate scanner configuration discovery
-
Select this checkbox to configure the scanner discovery to run automatically.
-
Enable build output parser
-
Select this checkbox to configure the scanner to parse the output from a build.
-
Make build output parser:
-
Select a build output parser from the list.
-
Enable generate scanner info command
-
Select this checkbox to enable retrieval of information from the scanner
-
Use default
-
Select this checkbox to use the default scanner information command.
-
Generate scanner info command
-
If you did not select Use default checkbox, you can specify the scanner information command.
-
Command output parser
-
Select a command output parser from the list.
- -
+

Makefile Project - Discovery Options page

+

You can configure various options for the scanner configuration on the Discovery Options page of the Makefile Project panel in the Preferences window.

+

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Makefile Project - Discovery Options page +
Discovery profiles scope Define the scope as configuration-wide or per language for this profile.
Automate discovery of paths and symbols
Activate this checkbox to scan the build output to populate the paths and symbol tables.
Report path detection problems Activate this checkbox to report all path detection problems.
Discovery profile Select the discovery profile to use for paths and symbol detection.
Enable build output scanner info discovery Activate this checkbox to configure the scanner to parse the output from a build.
Local build output from file Click Browse to select a file from disk or click Variables to open the Select Variables window to define the build output file.
Enable generate scanner info command Activate this checkbox to specify use of the default scanner information command
Compiler invocation command Type the command that invokes the compiler, for example: gcc, or click Browse to locate it.

Related concepts
Build overview

@@ -39,7 +64,8 @@ Including paths and symbols

Related reference
-Project properties

+New CDT Project Wizard

+
IBM Copyright Statement diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm index f48aa4016d9..125bbc2e5e3 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_binary.htm @@ -4,34 +4,53 @@ -Binary Parser, C/C++ Properties window +Makefile Project - Binary Parsers page -

Binary Parser page, C/C++ Preferences window

- -

You can view a list of binary parsers on the Binary Parser page of the C/C++ Preferences window.

-

Binary Parser Preferences Window

-
-
Binary Parser
-
Select binary parsers from the list, and changed the order in which they are used.
-
Binary Parser Options
-
If a binary parser has parser options you can define them in this section.
-
+

Makefile Project - Binary Parsers page

+

You can view a list of binary parsers on the Binary Parser page of the Makefile Project preference panel in the Preferences window.

+

Binary Parser Preferences Window

+ + + + + + + + + + + + + + + + + + + + + + + + +
+ Makefile Project - Binary Parsers options +
Binary ParserSelect binary parsers from the list, and changed the order in which they are used.
Move Up Moves the selected binary parser higher in the list.
Move Down Moves the selected binary parser lower in the list.
Binary Parser OptionsIf a binary parser has parser options you can define them in this section.

Related concepts
Build overview

Related tasks
Selecting a binary parser

-

Related reference -
-Project properties

-IBM Copyright Statement - +

Related reference
+ New CDT Project Wizard

+
+IBM Copyright Statement \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm index 7477085bd39..e5670b139fa 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_newproj_parser_error.htm @@ -4,40 +4,57 @@ -Error Parsers, C/C++ Preferences window +Makefile Project - Error Parsers page -

Error Parsers, C/C++ Preferences window

+

Makefile Project - Error Parsers page

-

You can view a list of the filters that detect error patterns in the build output log, on the Error Parsers page of the Preferences window.

- -

Make Error Parser Preferences Dialog Box

- -
-
Error Parsers
-
Lists the various error parsers which can be enabled or disabled.
-
Up
-
Moves the selected error parser higher in the list.
-
Down
-
Moves the selected error parser lower in the list.
-
Select All
-
Selects all error parsers.
-
Unselect All
-
Clears all error parsers.
-
+

You can view a list of the filters that detect error patterns in the build output log, on the Error Parsers page of the Makefile Project panel in the Preferences window.

+

Make Error Parser Preferences Dialog Box

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Makefile Project - Error Parser options +
Error ParsersLists the various error parsers which can be enabled or disabled.
Move Up Moves the selected error parser higher in the list.
Move Down Moves the selected error parser lower in the list.
Check All Selects all error parsers.
Uncheck All Clears all error parsers.

Related concepts
Build overview

Related tasks
Filtering errors

-

Related reference -
-Project properties

+

Related reference
+ New CDT Project Wizard

+
IBM Copyright Statement diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml index e7e60baf213..f4fc27a53c0 100644 --- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml +++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml @@ -70,16 +70,20 @@ + - - - - - + + + + + + + +