diff --git a/doc/org.eclipse.cdt.doc.user/images/mfile_build.PNG b/doc/org.eclipse.cdt.doc.user/images/mfile_build.PNG new file mode 100644 index 00000000000..af93998850f Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/mfile_build.PNG differ diff --git a/doc/org.eclipse.cdt.doc.user/images/mfile_info.PNG b/doc/org.eclipse.cdt.doc.user/images/mfile_info.PNG new file mode 100644 index 00000000000..aef7171ac6d Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/mfile_info.PNG differ diff --git a/doc/org.eclipse.cdt.doc.user/images/update_managed_build20.PNG b/doc/org.eclipse.cdt.doc.user/images/update_managed_build20.PNG new file mode 100644 index 00000000000..b562efd8e6a Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/update_managed_build20.PNG differ diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_file.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_file.htm new file mode 100644 index 00000000000..6e3287cf800 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_file.htm @@ -0,0 +1,23 @@ + + + + + + +C/C++ Project Properties, Managed Make Files + + + + + +

C/C++ Project Properties, Managed Make Files

+

This section describes properties for a Managed make project source file.

+ Info
+ C/C++ Build
+     +Tool Settings
+ +

IBM Copyright Statement

+ + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm new file mode 100644 index 00000000000..36667b8b9a5 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm @@ -0,0 +1,36 @@ + + + + + + + C/C++ Project Properties, Managed Make File, Build + + + + +

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

+Customizes the options used for a specific file in your build configuration. Select a tab in the +Resource Configuration settings area to set a specific category of options.

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

+ +

+
Exclude from build
Excludes the selected file from being built with the + selected build configuration.
+
Configuration:
Select the build configuration from the list provided.
+
Resource Configuration settings
Edit individual file options.
+
Restore Defaults
Returns any changes back to the setting of the selected configuration.
+
Apply
Applies any changes.
+

+ + +

Related reference
+C++ Project Properties, Managed Make File, C/C++ Build, Tool Settings
+C++ Project Properties, Managed Make File, Info
+C++ Project Properties, Managed, C/C++ Build

+ +

+IBM Copyright Statement +

+ + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_info.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_info.htm new file mode 100644 index 00000000000..7014b3e0cda --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_info.htm @@ -0,0 +1,34 @@ + + + + + + + C/C++ Project Properties, Managed Make File, Info + + + + +

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

+ +

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

+ +
+
Info
Shows file information.
+
Read only
You can set the file to be read only.
+
Derived
You can indicate that the file is derived from other resources.
+
Text file encoding
You can specify an alternate text encoding.
+
Restore Defaults
Returns any changes back to their default setting.
+
Apply
Applies any changes.
+

+ +

Related reference
+C++ Project Properties, Managed Make File, C/C++ Build
+C++ Project Properties, Managed, Info

+ +

+IBM Copyright Statement +

+ + + diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm new file mode 100644 index 00000000000..192ec5f5497 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm @@ -0,0 +1,35 @@ + + + + + + + C/C++ Project Properties, Managed Make File, Build + + + + +

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

+Customizes the tools and tool options used by the selected file in your build configuration. +

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

+ +

+
Exclude from build
Excludes the selected file from being built with the + selected build configuration.
+
Configuration:
Select the build configuration from the list provided.
+
Resource Configuration settings, Tool Settings
Edit individual tool options for the selected file.
+
Restore Defaults
Returns any changes back to the setting of the selected configuration.
+
Apply
Applies any changes.
+

+ + +

Related reference
+C++ Project Properties, Managed Make File, Info
+C++ Project Properties, Managed, C/C++ Build, Tool Settings

+ +

+IBM Copyright Statement +

+ + + 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 21087cc0874..09940bf077b 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 @@ -48,7 +48,8 @@ Configuration Settings area to set a specific category of options.

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

+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 0a034e2b2f7..c707c9921a6 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 @@ -48,7 +48,8 @@ Customizes the tools and tool options used in your build configuration. 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

+C++ Project Properties, Managed, Project References
+C++ Project Properties, Managed Make File, C/C++ Build, Tool Settings

IBM Copyright Statement diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm index a93bd5b4c10..95e3bc8b033 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm @@ -18,6 +18,7 @@ Creating a makefile
Hiding files by type in the C/C++ Projects view
Converting CDT 1.x Projects
+ Converting CDT 2.0 Managed Make Projects
Adding Convert to a C/C++ Make Project to the New menu
Set Discovery Options
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm index 5dfdf24921b..176a07e1de5 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm @@ -41,7 +41,8 @@ See Set Discovery Options for details.

Related tasks
Adding Convert to a C/C++ Make Project to the New menu
-Set Discovery Options

+Set Discovery Options
+Converting CDT 2.0 Managed Make Projects

IBM Copyright Statement

diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm new file mode 100644 index 00000000000..c3d49aa60e0 --- /dev/null +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm @@ -0,0 +1,32 @@ + + + + + + +Converting CDT 2.0 Managed Make Projects + + + + + +

Converting CDT 2.0 Managed Make Projects

+ +

For a CDT 2.0 Managed Make project, the Managed Build system will prompt you to +convert your project when it attempts to read the Managed Build project +information and discovers that project needs to be updated.  You will be prompted to update the project.

+

Update CDT 2.0 Managed Builder dialog box

+

Click Yes and the project will be updated.  The updated Managed +Build information can no longer be loaded by CDT 2.0.  Select +No and the project will not be updated.  You will be able to view the +Managed Build settings, but no changes will be saved when you close the project +or exit Eclipse.

+ +

Related tasks
+Converting CDT 1.x Projects

+ +

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 6c789039747..e4ea7facee8 100644 --- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml +++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml @@ -76,6 +76,12 @@ + + + + + + diff --git a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml index b02ea7fa588..b0899178f96 100644 --- a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml +++ b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml @@ -11,6 +11,7 @@ +