diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.properties b/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
index 20c7c57bb40..0ae8e09fa42 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
@@ -1,5 +1,6 @@
pluginName=C/C++ Managed Builder Core
providerName=Eclipse.org
+ExtensionPoint.name=Managed Build Tools
GeneratedMakefileCBuilder.name=Generated Makefile Builder
-ManagedBuildNature.name=Managed Builder Project
\ No newline at end of file
+ManagedBuildNature.name=Managed Builder Project
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index adbfc6c5bc8..8d371c2d8ff 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -20,7 +20,7 @@
-
+
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 42f6b93620e..17b2e7a10ae 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -11,6 +11,7 @@ MngCCWizard.description=Create a new C++ project and let Eclipse create and mana
MngBuildProp.name=C/C++ Build
# Build Model Names
+Extension.name=Managed Build Tools Description
TargetName.cygw=Cygwin
TargetName.cygw.exe=Cygwin Executable
TargetName.cygw.so=Cygwin Shared Library
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index b02d4f6d41d..cbc19757a15 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -31,8 +31,8 @@
icon="icons/full/wizban/newmngcc_app.gif"
category="org.eclipse.cdt.ui.newCCWizards"
class="org.eclipse.cdt.managedbuilder.ui.wizards.NewManagedCCProjectWizard"
- project="true"
finalPerspective="org.eclipse.cdt.ui.CPerspective"
+ project="true"
id="org.eclipse.cdt.managedbuilder.ui.wizards.StdCCWizard">
%MngCCWizard.description
@@ -43,8 +43,8 @@
icon="icons/full/wizban/newmngc_app.gif"
category="org.eclipse.cdt.ui.newCWizards"
class="org.eclipse.cdt.managedbuilder.ui.wizards.NewManagedCProjectWizard"
- project="true"
finalPerspective="org.eclipse.cdt.ui.CPerspective"
+ project="true"
id="org.eclipse.cdt.managedbuilder.ui.wizards.StdCWizard">
%MngCWizard.description
@@ -54,8 +54,8 @@
@@ -68,7 +68,7 @@
+ id="cygwin.gnu.c.compiler.preprocessor.nostdinc"
+ valueType="boolean">
+ id="cygwin.gnu.c.preprocessor.def.symbols"
+ valueType="definedSymbols">
+ builtIn="true"
+ value="_X86_=1">
+ builtIn="true"
+ value="__OPTIMIZE__">
+ builtIn="true"
+ value="__STDC_HOSTED__=1">
+ builtIn="true"
+ value="i386">
+ builtIn="true"
+ value="__i386">
+ builtIn="true"
+ value="__i386__">
+ builtIn="true"
+ value="__tune_i686__">
+ builtIn="true"
+ value="__tune_pentiumpro__">
+ builtIn="true"
+ value="__tune_pentium2__">
+ builtIn="true"
+ value="__tune_pentium3__">
+ builtIn="true"
+ value="__stdcall=__attribute__((__stdcall__))">
+ builtIn="true"
+ value="__fastcall=__attribute__((__fastcall__))">
+ builtIn="true"
+ value="__cdecl=__attribute__((__cdecl__))">
+ builtIn="true"
+ value="_stdcall=__attribute__((__stdcall__))">
+ builtIn="true"
+ value="_fastcall=__attribute__((__fastcall__))">
+ builtIn="true"
+ value="_cdecl=__attribute__((__cdecl__))">
+ builtIn="true"
+ value="__declspec(x)=__attribute__((x))">
+ builtIn="true"
+ value="__CYGWIN32__">
+ builtIn="true"
+ value="unix">
+ builtIn="true"
+ value="__unix__">
+ builtIn="true"
+ value="__unix">
+ id="cygwin.gnu.c.compiler.general.include.paths"
+ valueType="includePath">
+ builtIn="true"
+ value="C:\Cygwin\usr\include">
+ builtIn="true"
+ value="C:\cygwin\usr\include\w32api">
+ id="cygwin.gnu.c.compiler.general.optimization.level"
+ valueType="enumerated">
+ id="cygwin.gnu.c.compiler.optimization.flags"
+ valueType="string">
+ id="cygwin.c.compiler.debugging.level"
+ valueType="enumerated">
+ id="cygwin.gnu.c.compiler.debugging.other"
+ valueType="string">
+ id="cygwin.gnu.c.compiler.warnings.syntax"
+ valueType="boolean">
+ id="cygwin.gnu.c.compiler.misc.other"
+ valueType="string">
+ id="cygwin.gnu.compiler.preprocessor.nostdinc"
+ valueType="boolean">
+ id="cygwin.preprocessor.def.symbols"
+ valueType="definedSymbols">
+ builtIn="true"
+ value="_X86_=1">
+ builtIn="true"
+ value="__OPTIMIZE__">
+ builtIn="true"
+ value="__STDC_HOSTED__=1">
+ builtIn="true"
+ value="i386">
+ builtIn="true"
+ value="__i386">
+ builtIn="true"
+ value="__i386__">
+ builtIn="true"
+ value="__tune_i686__">
+ builtIn="true"
+ value="__tune_pentiumpro__">
+ builtIn="true"
+ value="__tune_pentium2__">
+ builtIn="true"
+ value="__tune_pentium3__">
+ builtIn="true"
+ value="__stdcall=__attribute__((__stdcall__))">
+ builtIn="true"
+ value="__fastcall=__attribute__((__fastcall__))">
+ builtIn="true"
+ value="__cdecl=__attribute__((__cdecl__))">
+ builtIn="true"
+ value="_stdcall=__attribute__((__stdcall__))">
+ builtIn="true"
+ value="_fastcall=__attribute__((__fastcall__))">
+ builtIn="true"
+ value="_cdecl=__attribute__((__cdecl__))">
+ builtIn="true"
+ value="__declspec(x)=__attribute__((x))">
+ builtIn="true"
+ value="__CYGWIN32__">
-
-
-
-
+ builtIn="true"
+ value="unix">
+ value="__unix__">
+ value="__unix">
+
+
+
+
+ id="cygwin.compiler.general.include.paths"
+ valueType="includePath">
+
+
+ value="C:\cygwin\usr\include\c++\3.3.1\backward">
+ builtIn="true"
+ value="C:\cygwin\lib\gcc-lib\i686-pc-cygwin\3.3.1\include">
+ builtIn="true"
+ value="C:\cygwin\usr\include">
-
-
+ builtIn="true"
+ value="C:\cygwin\usr\include\w32api">
+ id="cygwin.compiler.general.optimization.level"
+ valueType="enumerated">
+ id="cygwin.compiler.optimization.flags"
+ valueType="string">
+ id="cygwin.compiler.debugging.level"
+ valueType="enumerated">
+ id="cygwin.gnu.compiler.debugging.other"
+ valueType="string">
+ id="cygwin.gnu.compiler.warnings.syntax"
+ valueType="boolean">
+ id="cygwin.compiler.misc.other"
+ valueType="string">
@@ -836,8 +836,8 @@
natureFilter="cnature"
name="%ToolName.linker.c"
outputFlag="-o"
- outputs="exe"
command="gcc"
+ outputs="exe"
id="cdt.build.tool.cygwin.c.link">
+ id="cygwin.gnu.c.link.options.nostart"
+ valueType="boolean">
+ id="cygwin.gnu.c.link.libs"
+ valueType="libs">
+ id="cygwin.gnu.c.link.ldflags"
+ valueType="string">
+ id="cygwin.gnu.linker.options.nostart"
+ valueType="boolean">
+ id="cygwin.link.libs"
+ valueType="libs">
+ id="cygwin.link.ld.flags"
+ valueType="string">
@@ -1094,9 +1094,9 @@
natureFilter="cnature"
name="%ToolName.linker.c"
outputFlag="-o"
- outputs="dll"
- outputPrefix="lib"
command="gcc"
+ outputPrefix="lib"
+ outputs="dll"
id="cdt.build.tool.cygwin.c.solink">
+ id="cygwin.gnu.c.solink.options.nostart"
+ valueType="boolean">
+ id="cygwin.gnu.c.solink.libs"
+ valueType="libs">
+ id="cygwin.gnu.c.solink.ldflags"
+ valueType="string">
+ id="cygwin.gnu.solink.options.nostart"
+ valueType="boolean">
+ id="cygwin.solink.libs"
+ valueType="libs">
+ id="cygwin.solink.ld.flags"
+ valueType="string">
@@ -1324,9 +1324,9 @@
natureFilter="ccnature"
name="%ToolName.linker.cpp"
outputFlag="-o"
- outputs="dll"
- outputPrefix="cyg"
command="g++ -shared"
+ outputPrefix="cyg"
+ outputs="dll"
id="org.eclipse.cdt.build.tool.cygwin.explink">
+ id="cygwin.explink.ld.flags"
+ valueType="string">
@@ -1422,9 +1422,9 @@
+ id="cygwin.ar.flags"
+ valueType="string">
@@ -1452,12 +1452,12 @@
osList="linux">
+ id="linux.gnu.c.compiler.preprocessor.nostdinc"
+ valueType="boolean">
+ id="linux.gnu.c.preprocessor.def.symbols"
+ valueType="definedSymbols">
+ builtIn="true"
+ value="__ELF__">
+ builtIn="true"
+ value="unix">
+ builtIn="true"
+ value="__gnu_linux__">
+ builtIn="true"
+ value="linux">
+ builtIn="true"
+ value="__unix__">
+ builtIn="true"
+ value="__linux__">
+ builtIn="true"
+ value="__unix">
+ builtIn="true"
+ value="__linux">
+ builtIn="true"
+ value="__OPTIMIZE__">
+ builtIn="true"
+ value="__STDC_HOSTED__=1">
+ builtIn="true"
+ value="_GNU_SOURCE">
+ builtIn="true"
+ value="i386">
+ builtIn="true"
+ value="__i386">
+ builtIn="true"
+ value="__i386__">
+ builtIn="true"
+ value="__tune_i386__">
+ id="linux.gnu.c.compiler.general.include.paths"
+ valueType="includePath">
+ id="linux.gnu.c.compiler.general.optimization.level"
+ valueType="enumerated">
+ id="linux.gnu.c.compiler.optimization.flags"
+ valueType="string">
+ id="linux.c.compiler.debugging.level"
+ valueType="enumerated">
+ id="linux.gnu.c.compiler.debugging.other"
+ valueType="string">
+ id="linux.gnu.c.compiler.warnings.syntax"
+ valueType="boolean">
+ id="linux.gnu.c.compiler.misc.other"
+ valueType="string">
+ id="linux.gnu.compiler.preprocessor.nostdinc"
+ valueType="boolean">
+ id="linux.gnu.compiler.dirs.incpaths"
+ valueType="includePath">
+ builtIn="true"
+ value="/usr/local/include">
+ builtIn="true"
+ value="/usr/include">
+ id="linux.gnu.compiler.optimization.level"
+ valueType="enumerated">
+ id="linux.compiler.optimization.flags"
+ valueType="string">
+ id="linux.gnu.compiler.debugging.level"
+ valueType="enumerated">
+ id="linux.gnu.compiler.debugging.other"
+ valueType="string">
+ id="linux.gnu.compiler.warnings.syntax"
+ valueType="boolean">
+ id="linux.gnu.compiler.other.other"
+ valueType="string">
@@ -2115,40 +2115,40 @@
name="%Option.Posix.Linker.NoStartFiles"
category="linux.gnu.c.linker.category.general"
command="-nostartfiles"
- valueType="boolean"
- id="linux.gnu.c.link.options.nostart">
+ id="linux.gnu.c.link.options.nostart"
+ valueType="boolean">
+ id="linux.gnu.c.link.libs"
+ valueType="libs">
+ id="linux.gnu.c.link.ldflags"
+ valueType="string">
@@ -2211,40 +2211,40 @@
name="%Option.Posix.Linker.NoStartFiles"
category="linux.gnu.linker.category.options"
command="-nostartfiles"
- valueType="boolean"
- id="linux.gnu.linker.options.nostart">
+ id="linux.gnu.linker.options.nostart"
+ valueType="boolean">
+ id="linux.gnu.linker.libs.libs"
+ valueType="libs">
+ id="linux.gnu.linker.libs.flags"
+ valueType="string">
@@ -2353,12 +2353,12 @@
+ id="linux.gnu.c.solink.options.nostart"
+ valueType="boolean">
+ id="linux.gnu.c.solink.libs"
+ valueType="libs">
+ id="linux.gnu.c.solink.ldflags"
+ valueType="string">
+ id="linux.gnu.solink.options.nostart"
+ valueType="boolean">
+ id="linux.gnu.solink.libs.libs"
+ valueType="libs">
+ id="linux.gnu.solink.libs.flags"
+ valueType="string">
@@ -2604,11 +2604,11 @@
+ id="linux.gnu.lib.flags"
+ valueType="string">
@@ -2636,12 +2636,12 @@
osList="solaris">
+ id="solaris.gnu.c.compiler.preprocessor.nostdinc"
+ valueType="boolean">
+ id="solaris.gnu.c.preprocessor.def.symbols"
+ valueType="definedSymbols">
+ builtIn="true"
+ value="sun">
+ builtIn="true"
+ value="sparc">
+ builtIn="true"
+ value="unix">
+ builtIn="true"
+ value="__svr4__">
+ builtIn="true"
+ value="__SVR4">
+ builtIn="true"
+ value="__GCC_NEW_VARARGS__">
+ builtIn="true"
+ value="__sun__">
+ builtIn="true"
+ value="__sparc__">
+ builtIn="true"
+ value="__unix__">
+ builtIn="true"
+ value="__sun">
+ builtIn="true"
+ value="__sparc">
+ builtIn="true"
+ value="__unix">
+ builtIn="true"
+ value="__OPTIMIZE__">
+ id="solaris.gnu.c.compiler.general.include.paths"
+ valueType="includePath">
+ id="solaris.gnu.c.compiler.general.optimization.level"
+ valueType="enumerated">
+ id="solaris.gnu.c.compiler.optimization.flags"
+ valueType="string">
+ id="solaris.c.compiler.debugging.level"
+ valueType="enumerated">
+ id="solaris.gnu.c.compiler.debugging.other"
+ valueType="string">
+ id="solaris.gnu.c.compiler.warnings.syntax"
+ valueType="boolean">
+ id="solaris.gnu.c.compiler.misc.other"
+ valueType="string">
+ id="solaris.gnu.compiler.preprocessor.nostdinc"
+ valueType="boolean">
+ id="solaris.gnu.compiler.dirs.incpaths"
+ valueType="includePath">
+ builtIn="true"
+ value="/usr/local/include">
+ builtIn="true"
+ value="/usr/include">
+ id="solaris.gnu.compiler.optimization.level"
+ valueType="enumerated">
+ id="solaris.compiler.optimization.flags"
+ valueType="string">
+ id="solaris.gnu.compiler.debugging.level"
+ valueType="enumerated">
+ id="solaris.gnu.compiler.debugging.other"
+ valueType="string">
+ id="solaris.gnu.compiler.warnings.syntax"
+ valueType="boolean">
+ id="solaris.gnu.compiler.other.other"
+ valueType="string">
@@ -3276,40 +3276,40 @@
name="%Option.Posix.Linker.NoStartFiles"
category="solaris.gnu.c.linker.category.general"
command="-nostartfiles"
- valueType="boolean"
- id="solaris.gnu.c.link.options.nostart">
+ id="solaris.gnu.c.link.options.nostart"
+ valueType="boolean">
+ id="solaris.gnu.c.link.libs"
+ valueType="libs">
+ id="solaris.gnu.c.link.ldflags"
+ valueType="string">
@@ -3372,40 +3372,40 @@
name="%Option.Posix.Linker.NoStartFiles"
category="solaris.gnu.linker.category.options"
command="-nostartfiles"
- valueType="boolean"
- id="solaris.gnu.linker.options.nostart">
+ id="solaris.gnu.linker.options.nostart"
+ valueType="boolean">
+ id="solaris.gnu.linker.libs.libs"
+ valueType="libs">
+ id="solaris.gnu.linker.libs.flags"
+ valueType="string">
@@ -3518,12 +3518,12 @@
+ id="solaris.gnu.c.solink.options.nostart"
+ valueType="boolean">
+ id="solaris.gnu.c.solink.libs"
+ valueType="libs">
+ id="solaris.gnu.c.solink.ldflags"
+ valueType="string">
+ id="solaris.gnu.solink.options.nostart"
+ valueType="boolean">
+ id="solaris.gnu.solink.libs.libs"
+ valueType="libs">
+ id="solaris.gnu.solink.libs.flags"
+ valueType="string">
@@ -3769,11 +3769,11 @@
+ id="solaris.gnu.lib.flags"
+ valueType="string">