diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_manage.png b/doc/org.eclipse.cdt.doc.user/images/mprop_manage.png new file mode 100644 index 00000000000..8327a9d3d7d Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/mprop_manage.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_new.png b/doc/org.eclipse.cdt.doc.user/images/mprop_new.png new file mode 100644 index 00000000000..5f2d33cb14b Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/mprop_new.png differ diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_rename.png b/doc/org.eclipse.cdt.doc.user/images/mprop_rename.png new file mode 100644 index 00000000000..0b674f4943c Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/mprop_rename.png differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm index 9c53d32fa59..2b43d0830f9 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm @@ -22,7 +22,7 @@ configuration.
Specifies the selected build configuration from the list provided.
Manage...
-
Adds, removes, renames and manages configurations.
+
Adds, removes, renames and converts configurations.
Configuration Settings
Sets build options for the configuration.
Restore Defaults
@@ -64,6 +64,7 @@ References
C++ Project Properties, Managed, Info
C++ Project Properties, Managed, Builders
+C++ Project Properties, Managed, Manage Configuration Dialog
C++ Project Properties, Managed, C/C++ Build, Tool Settings
C++ Project Properties, diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_settings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_settings.htm index 573d58cfcaa..4782208409b 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_settings.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_settings.htm @@ -19,7 +19,7 @@ configuration.
Configuration:
Specifies the selected build configuration from the list provided.
Manage...
-
Adds, removes, renames and manages configurations.
+
Adds, removes, renames and converts configurations.
Configuration Settings, Build Settings
Sets the build command, build flags, the name of the build goal, and whether to expand build environment macros in the generated make @@ -65,6 +65,7 @@ References
Builders
C++ Project Properties, Managed, C/C++ Build
+C++ Project Properties, Managed, Manage Configuration Dialog
C++ Project Properties, Managed, C/C++ Build, Tool Settings
C++ Project Properties, Managed, C/C++ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_dcbs.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_dcbs.htm index b06cc8e4b94..0ab6d04129f 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_dcbs.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_dcbs.htm @@ -23,7 +23,7 @@ configuration.
Configuration:
Specifies the selected build configuration from the list provided.
Manage...
-
Adds, removes, rename and manages configurations.
+
Adds, removes, renames and converts configurations.
Pre-build Step
    Command
Specifies a command, or a list of semicolon separated commands, @@ -74,6 +74,7 @@ File, Info
Builders
C++ Project Properties, Managed, C/C++ Build
+C++ Project Properties, Managed, Manage Configuration Dialog
C++ Project Properties, Managed, C/C++ Build, Tool Settings
C++ Project Properties, diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_env.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_env.htm index dffeedb7bd5..a5213a962e6 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_env.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_env.htm @@ -30,7 +30,7 @@ configuration.
Configuration:
Specifies the selected build configuration from the list provided.
Manage...
-
Adds, removes, renames and manages configurations.
+
Adds, removes, renames and converts configurations.
Configuration Settings
Adds, removes and edits environment variables for a project or configuration.  Each tab contains two tables - one for @@ -224,6 +224,7 @@ References
Builders
C++ Project Properties, Managed, C/C++ Build
+C++ Project Properties, Managed, Manage Configuration Dialog
C++ Project Properties, Managed, C/C++ Build, Tool Settings
C++ Project Properties, diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_macros.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_macros.htm index 1bcc4b82cc6..d03f7dccf62 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_macros.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_macros.htm @@ -28,7 +28,7 @@ configuration.
Configuration:
Specifies the selected build configuration from the list provided.
Manage...
-
Adds, removes, renames and manages configurations.
+
Adds, removes, renames and converts configurations.
Configuration Settings
Adds, removes, edits and manages build macros for a project or configuration. 
@@ -133,15 +133,6 @@ environment variables defined in the environment passed to Eclipse.

Users can define and delete macros for any given project configuration, for the entire project or for the entire workspace.

-<<<<<<< cdt_u_mprop_macros.htm -

The value of a build macro will be searched for in -the order specified above. If macro is not found for the currently -selected file context, the currently selected option context will be -used, if not found, the currently selected configuration context will -be used, etc. 

-

To define a new macro the "New" button should be -pressed. A dialog will appear representing the macro definition.

-=======

The value of a build macro will be searched for in the order specified above. If macro is not found for the currently selected file context, the currently selected option context will be @@ -152,7 +143,6 @@ macro. Overriding MBS pre-defined macros can have unanticipated consequences.

To define a new macro the "New" button should be pressed. A dialog will appear representing the macro definition.

->>>>>>> 1.3

The "Name" field contains the list of macros that are already @@ -742,6 +732,7 @@ References
Builders
C++ Project Properties, Managed, C/C++ Build
+C++ Project Properties, Managed, Manage Configuration Dialog
C++ Project Properties, Managed, C/C++ Build, Tool Settings
C++ Project Properties, diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_manage.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_manage.htm new file mode 100644 index 00000000000..8f91004c5d4 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_manage.htm @@ -0,0 +1,47 @@ + + + + + + + C/C++ Project Properties, Managed, Manage Configuration Dialog + + + + +

C/C++ Project Properties, Managed, Manage Configuration Dialog

+Manages the configurations defined for the project. Select a button to add, +rename, remove or convert a configuration.

C/C++ Project Properties, Managed,  Manage Configuration Dialog

+ +

+
Manage Configurations:
Displays the list of defined configurations for the given project.
+
Tool chain conversion targets:
The list of Tool chain conversion targets available for the selected configuration.
+
Convert
Converts the configuration selected in manage configurations list.
+
New
Displays the new configuration dialog that can be used to create a new configuration.
+
Remove
Removes the selected configuration from the list, prompts the user to confirm the action.
+
Rename
Displays the rename configuration dialog that can be used to rename the configuration name & description.
+
OK
Closes the manage configuration dialog
+

+ +

Related reference
+
C++ Project Properties, Managed, Info
+C++ Project Properties, Managed, Builders
+C++ Project Properties, Managed, New Configuration Dialog
+C++ Project Properties, Managed, Rename Configuration Dialog
+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, Build Steps
+C++ Project Properties, Managed, C/C++ Build, Error Parsers
+C++ Project Properties, Managed, C/C++ Build, Binary Parser
+C++ Project Properties, Managed, C/C++ Build, Environment
+C++ Project Properties, Managed, C/C++ Build, Macros
+C++ Project Properties, Managed, C/C++ Documentation
+C++ Project Properties, Managed, Project References

+C++ Project Properties, Managed Make File, C/C++ Build

+ +

+IBM Copyright Statement +

+ + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_mbinary.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_mbinary.htm index 360f819eeb4..eab7fed32ad 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_mbinary.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_mbinary.htm @@ -22,7 +22,7 @@ configuration.
Configuration:
Specifies the selected build configuration from the list provided.
Manage...
-
Adds, removes, renames and manages configurations.
+
Adds, removes, renames and converts configurations.
Configuration Settings, Binary Parser
Specifies a binary parser from the list provided.
Binary Parser Options
@@ -74,6 +74,7 @@ References
Builders
C++ Project Properties, Managed, C/C++ Build
+C++ Project Properties, Managed, Manage Configuration Dialog
C++ Project Properties, Managed, C/C++ Build, Tool Settings
C++ Project Properties, diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm index 71a717aeae2..f155bf9b680 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm @@ -19,7 +19,7 @@ configuration.
Configuration:
Specifies the selected build configuration from the list provided.
Manage...
-
Adds, removes, renames and manages configurations.
+
Adds, removes, renames and converts configurations.
Configuration Settings, Error Parsers
Lists the various error parsers which can be enabled or disabled.
Up
@@ -79,6 +79,7 @@ References

Builders
C++ Project Properties, Managed, C/C++ Build
+C++ Project Properties, Managed, Manage Configuration Dialog
C++ Project Properties, Managed, C/C++ Build, Tool Settings
C++ Project Properties, diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_new.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_new.htm new file mode 100644 index 00000000000..5e8ce1bfba4 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_new.htm @@ -0,0 +1,46 @@ + + + + + + + C/C++ Project Properties, Managed, Manage Configuration Dialog + + + + +

C/C++ Project Properties, Managed, New Configuration Dialog

+Creates a new configuration based on either an existing configuration or a default configuration.

C/C++ Project Properties, Managed,  New Configuration Dialog

+ +

+
Name:
Name of the new configuration.
+
Description:
Description of the new configuration.
+
Default configuration:
A list of default configurations available for the current project.
+
Existing configuration:
A list of existing configurations of the current project.
+
Show unsupported configurations:
Check box to show unsupported configurations
+
OK
Creates a new configuration with name & description provided.
+
Cancel
Discard the changes and go back to manage configuration dialog.
+

+ +

Related reference
+
C++ Project Properties, Managed, Info
+C++ Project Properties, Managed, Builders
+C++ Project Properties, Managed, Manage Configuration Dialog
+C++ Project Properties, Managed, Rename Configuration Dialog
+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, Build Steps
+C++ Project Properties, Managed, C/C++ Build, Error Parsers
+C++ Project Properties, Managed, C/C++ Build, Binary Parser
+C++ Project Properties, Managed, C/C++ Build, Environment
+C++ Project Properties, Managed, C/C++ Build, Macros
+C++ Project Properties, Managed, C/C++ Documentation
+C++ Project Properties, Managed, Project References

+C++ Project Properties, Managed Make File, C/C++ Build

+ +

+IBM Copyright Statement +

+ + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_rename.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_rename.htm new file mode 100644 index 00000000000..5c0d32ebd31 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_rename.htm @@ -0,0 +1,43 @@ + + + + + + + C/C++ Project Properties, Managed, Manage Configuration Dialog + + + + +

C/C++ Project Properties, Managed, Rename Configuration Dialog

+Renames the name and the description of the existing configuration.

C/C++ Project Properties, Managed,  New Configuration Dialog

+ +

+
Name:
Name of the configuration.
+
Description:
Description of the configuration.
+
OK
Apply the changes made to name & description of the configuration.
+
Cancel
Discard the changes.
+

+ +

Related reference
+C++ Project Properties, Managed, Info
+C++ Project Properties, Managed, Builders
+C++ Project Properties, Managed, Manage Configuration Dialog
+C++ Project Properties, Managed, New Configuration Dialog
+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, Build Steps
+C++ Project Properties, Managed, C/C++ Build, Error Parsers
+C++ Project Properties, Managed, C/C++ Build, Binary Parser
+C++ Project Properties, Managed, C/C++ Build, Environment
+C++ Project Properties, Managed, C/C++ Build, Macros
+C++ Project Properties, Managed, C/C++ Documentation
+C++ Project Properties, Managed, Project References

+C++ Project Properties, Managed Make File, C/C++ Build

+ +

+IBM Copyright Statement +

+ + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm index ef94d85c434..1bb2baf916b 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm @@ -19,7 +19,7 @@ configuration.
Configuration:
Specifies the selected build configuration from the list provided.
Manage...
-
Adds, removes, renames and manages configurations.
+
Adds, removes, renames and converts configurations.
Configuration Settings, Tool Settings
Sets individual tool options.
Restore Defaults
@@ -63,6 +63,7 @@ References
Builders
C++ Project Properties, Managed, C/C++ Build
+C++ Project Properties, Managed, Manage Configuration Dialog
C++ Project Properties, Managed, C/C++ Build, Build Settings
C++ Project Properties, Managed, C/C++