Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
[cdt-patch] Applied: fix for bug 52647


Hi all. I know it wasn't in the development plan, but I got so sick of seeing this on the news group that I figured it was worth fixing . I have applied a fix for bug 52647 which manifested itself as a problem specifying the mingw32-make utility in the project property page. In generally, though the whole argument parsing logic was pretty shaky, so this patch also has a refactor/cleanup to make the whole thing work better and to place the parsing logic where it probably belonged all along.

In 1.2, the target stored the raw, overridden build command the user specified on the property page. This fix involves enhancing the logic to pry apart the command from the args, and moving it into the property itself, so the build system only pays the price to parse once. This fix will make it easier for users to change the make utility they use to build and to set additional arguments. It has been regression tested on Linux and Win32.

Sean Evoy
Rational Software - IBM Software Group
Ottawa, Ontario, Canada
Index: ChangeLog
===================================================================
retrieving revision 1.16
diff -u -r1.16 ChangeLog
--- ChangeLog	17 Feb 2004 14:19:59 -0000	1.16
+++ ChangeLog	23 Feb 2004 21:23:07 -0000
@@ -1,3 +1,27 @@
+2004-02-23 Sean Evoy
+	Fix for bug 52647.
+	In 1.2, the target stored the raw, overridden build command the user 
+	specified on the property page. This string may or may not have included 
+	arguments to make. The managed build info was responsible for parsing the 
+	command from the arguments and returning both to the makefile generator. 
+	The problem was that the logic was too light-weight to really parse a 
+	complex command line. That logic has been refactored to the property page itself, 
+	so the price of parsing is payed once.
+	
+	The Target and its public interface have been reworked to set and get the 
+	arguments for make. This is treated as a project-level setting. It cannot 
+	be defined in a manifest for now. There is also a capability to reset and 
+	test the args when checking for an overridden make command in a target.
+	* src/org/eclipse/cdt/managedbuilder/core/ITarget.java 
+	* src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
+
+	The arguments are now passed to the spawner that launches make correctly. 
+	* src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
+	
+	The ManagedBuildInfo is off the hook now. Rather than performing any 
+	parsing or foo-fa-raw, it simply delegates the lookup to the target.
+	* src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
+
 2004-02-17 Sean Evoy
 	Fix for critical bug 44163.
 	The managed build info would become confused when the project it was associated
Index: src/org/eclipse/cdt/managedbuilder/core/ITarget.java
===================================================================
retrieving revision 1.5
diff -u -r1.5 ITarget.java
--- src/org/eclipse/cdt/managedbuilder/core/ITarget.java	17 Feb 2004 14:19:59 -0000	1.5
+++ src/org/eclipse/cdt/managedbuilder/core/ITarget.java	23 Feb 2004 21:23:07 -0000
@@ -26,6 +26,7 @@
 	public static final String IS_ABSTRACT = "isAbstract";	//$NON-NLS-1$
 	public static final String IS_TEST = "isTest";	//$NON-NLS-1$
 	public static final String MAKE_COMMAND = "makeCommand";	//$NON-NLS-1$
+	public static final String MAKE_ARGS = "makeArguments";	//$NON-NLS-1$
 	public static final String OS_LIST = "osList";	//$NON-NLS-1$
 	public static final String PARENT = "parent";	//$NON-NLS-1$
 	
@@ -95,6 +96,15 @@
 	 */
 	public String getDefaultExtension();	
 
+	
+	/**
+	 * Answers the command line arguments to pass to the make utility used 
+	 * by the receiver to build a project.
+	 * 
+	 * @return
+	 */
+	public String getMakeArguments();
+	
 	/**
 	 * Answers the name of the make utility for the target.
 	 *  
@@ -192,6 +202,14 @@
 	 * @param name
 	 */
 	public void setArtifactName(String name);
+
+	/**
+	 * Sets the arguments to be passed to the make utility used by the 
+	 * receiver to produce a build goal.
+	 * 
+	 * @param makeArgs
+	 */
+	public void setMakeArguments(String makeArgs);
 
 	/**
 	 * Sets the make command for the receiver to the value in the argument.
Index: src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java
===================================================================
retrieving revision 1.7
diff -u -r1.7 GeneratedMakefileBuilder.java
--- src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java	1 Oct 2003 14:25:35 -0000	1.7
+++ src/org/eclipse/cdt/managedbuilder/internal/core/GeneratedMakefileBuilder.java	23 Feb 2004 21:23:07 -0000
@@ -335,9 +335,10 @@
 
 				// Get the arguments to be passed to make from build model
 				ArrayList makeArgs = new ArrayList();
-				String args = info.getMakeArguments();
-				if (args.length() > 0) {
-					makeArgs.add(args);
+				String arg = info.getMakeArguments();
+				String[] args = arg.split("\\s");
+				for (int i = 0; i < args.length; ++i) {
+					makeArgs.add(args[i]);
 				}
 				makeArgs.addAll(Arrays.asList(getMakeTargets(fullBuild)));
 				String[] makeTargets = (String[]) makeArgs.toArray(new String[makeArgs.size()]);
Index: src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java
===================================================================
retrieving revision 1.8
diff -u -r1.8 ManagedBuildInfo.java
--- src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java	17 Feb 2004 14:19:59 -0000	1.8
+++ src/org/eclipse/cdt/managedbuilder/internal/core/ManagedBuildInfo.java	23 Feb 2004 21:23:08 -0000
@@ -19,15 +19,15 @@
 import java.util.ListIterator;
 import java.util.Map;
 
+import org.eclipse.cdt.core.CCProjectNature;
+import org.eclipse.cdt.core.CProjectNature;
+import org.eclipse.cdt.core.parser.IScannerInfo;
 import org.eclipse.cdt.managedbuilder.core.BuildException;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.IManagedBuildInfo;
 import org.eclipse.cdt.managedbuilder.core.IOption;
 import org.eclipse.cdt.managedbuilder.core.ITarget;
 import org.eclipse.cdt.managedbuilder.core.ITool;
-import org.eclipse.cdt.core.CCProjectNature;
-import org.eclipse.cdt.core.CProjectNature;
-import org.eclipse.cdt.core.parser.IScannerInfo;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -47,6 +47,11 @@
 	private Map defaultConfigurations;
 	private ITarget defaultTarget;
 	
+	/**
+	 * Create a new managed build information for the IResource specified in the argument
+	 * 
+	 * @param owner
+	 */
 	public ManagedBuildInfo(IResource owner) {
 		targetMap = new HashMap();
 		targets = new ArrayList();
@@ -54,13 +59,20 @@
 		this.owner = owner;
 	}
 	
+	/**
+	 * Reads the build information from the project file and creates the 
+	 * internal representation of the build settings for the project.
+	 * 
+	 * @param owner
+	 * @param element
+	 */
 	public ManagedBuildInfo(IResource owner, Element element) {
 		this(owner);
+		Node child = element.getFirstChild();
 		
 		// The id of the default configuration
 		String defaultTargetId = null;
 		List configIds = new ArrayList();
-		Node child = element.getFirstChild();
 		while (child != null) {
 			if (child.getNodeName().equals("target")) {
 				new Target(this, (Element)child);
@@ -495,46 +507,14 @@
 	 * @see org.eclipse.cdt.core.build.managed.IManagedBuildInfo#getMakeArguments()
 	 */
 	public String getMakeArguments() {
-		String arguments = new String();		
-		
-		// The make command may or may not have any flags
-		ITarget target = getDefaultTarget();
-		String command = target.getMakeCommand();
-		
-		// If it does, the flags will be everything between the '-' and the next space
-		int indexOfArgs = command.indexOf('-');
-		if (indexOfArgs != - 1) {
-			try {
-				String argsAndTargs = command.substring(indexOfArgs);
-				int indexOfTargs = argsAndTargs.indexOf(' ');
-				arguments = (indexOfTargs != -1) ? 
-							argsAndTargs.substring(0, indexOfTargs) : 
-							argsAndTargs;
-				// Make sure the arg list does not contain f or C
-				
-			} catch (IndexOutOfBoundsException e) {
-			}
-		}
-		
-		return arguments.trim();
+		return getDefaultTarget().getMakeArguments();
 	}
 
 	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.build.managed.IManagedBuildInfo#getMakeCommand()
 	 */
 	public String getMakeCommand() {
-		String command = new String();
-		ITarget target = getDefaultTarget();
-		command = target.getMakeCommand();
-		
-		// There may actually be arguments, so just get everything up to the first '-'
-		int indexOfArgs = command.indexOf('-');
-		if (indexOfArgs != -1) {
-			// Return ecverything up to the first argument as the command
-			return command.substring(0, indexOfArgs).trim();
-		} else {
-			return command.trim();
-		}
+		return getDefaultTarget().getMakeCommand();
 	}
 
 	/* (non-Javadoc)
Index: src/org/eclipse/cdt/managedbuilder/internal/core/Target.java
===================================================================
retrieving revision 1.6
diff -u -r1.6 Target.java
--- src/org/eclipse/cdt/managedbuilder/internal/core/Target.java	17 Feb 2004 14:19:59 -0000	1.6
+++ src/org/eclipse/cdt/managedbuilder/internal/core/Target.java	23 Feb 2004 21:23:08 -0000
@@ -42,6 +42,7 @@
 	private String extension;
 	private boolean isAbstract = false;
 	private boolean isTest = false;
+	private String makeArguments;
 	private String makeCommand;
 	private IResource owner;
 	private ITarget parent;
@@ -214,10 +215,13 @@
 		// Get the clean command
 		cleanCommand = element.getAttribute(CLEAN_COMMAND);
 		
-		// Get the make command
+		// Get the make command and arguments
 		if (element.hasAttribute(MAKE_COMMAND)) {
 			makeCommand = element.getAttribute(MAKE_COMMAND);
 		}
+		if(element.hasAttribute(MAKE_ARGS)) {
+			makeArguments = element.getAttribute(MAKE_ARGS);
+		}
 	
 		Node child = element.getFirstChild();
 		while (child != null) {
@@ -249,6 +253,7 @@
 	 */
 	public void resetMakeCommand() {
 		makeCommand = null;
+		makeArguments = null;
 	}
 	
 	/**
@@ -272,6 +277,9 @@
 		if (makeCommand != null) {
 			element.setAttribute(MAKE_COMMAND, makeCommand);
 		}
+		if (makeArguments != null) {
+			element.setAttribute(MAKE_ARGS, makeArguments);
+		}
 				
 		if (configurations != null)
 			for (int i = 0; i < configurations.size(); ++i) {
@@ -283,6 +291,22 @@
 	}
 
 	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.core.ITarget#getMakeArguments()
+	 */
+	public String getMakeArguments() {
+		if (makeArguments == null) {
+			// See if it is defined in my parent
+			if (parent != null) {
+				return parent.getMakeArguments();
+			} else { 
+				// No parent and no user setting
+				return new String("");
+			}
+		}
+		return makeArguments;
+	}
+
+	/* (non-Javadoc)
 	 * @see org.eclipse.cdt.core.build.managed.ITarget#getMakeCommand()
 	 */
 	public String getMakeCommand() {
@@ -376,7 +400,9 @@
 	 * @see org.eclipse.cdt.managedbuilder.core.ITarget#hasMakeCommandOverride()
 	 */
 	public boolean hasOverridenMakeCommand() {
-		return (makeCommand != null && !makeCommand.equals(parent.getMakeCommand()));
+		// We answer true if the make command or the flags are different
+		return ((makeCommand != null && !makeCommand.equals(parent.getMakeCommand())) 
+			|| (makeArguments != null && !makeArguments.equals(parent.getMakeArguments())));
 	}
 
 	/**
@@ -548,6 +574,15 @@
 	public void setArtifactName(String name) {
 		if (name != null) {
 			artifactName = name;		
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.managedbuilder.core.ITarget#setMakeArguments(java.lang.String)
+	 */
+	public void setMakeArguments(String makeArgs) {
+		if (makeArgs != null && !getMakeArguments().equals(makeArgs)) {
+			makeArguments = makeArgs;
 		}
 	}
 
Index: ChangeLog
===================================================================
retrieving revision 1.13
diff -u -r1.13 ChangeLog
--- ChangeLog	17 Feb 2004 14:20:11 -0000	1.13
+++ ChangeLog	24 Feb 2004 15:14:20 -0000
@@ -1,189 +1,202 @@
-2004-2-17 Sean Evoy
-	Fixes for 51640
-	Externalized strings for the target names. 
-	* plugin.properties
-	* plugin.xml
-	
-	Fixes for bug 49590:
-	The system now makes a distinction between the name of the output and its extension. 
-	The UI for managing the name of the build output now has a field for entering the 
-	extension. The new project wizard does not automatically append the extension to the 
-	name of the build output.
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/ManageConfigDialog.java
-	* src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java
-	
-	Some ground work for C11:
-	Added a browse button and an area for selecting a path variable to the browse
-	dialog. However, this is still turned off since it is not fully functional.
-	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionListFieldEditor.java
-	
-	Changed the order of the configurations in the manifest so that debug configurations are the default for every project.
-	* plugin.xml
-
-2003-11-10 Tanya Wolff
-
-	I18N-Externalized strings from plugin.xml.
-	I18N-Added keys & strings to plugin.properties.
-	Fixed an id error in linux c compiler debugger options.
-	* plugin.xml
-	* plugin.properties
-
-2003-11-11 Sean Evoy
-	Work to implement bugzilla 44841:
-	Added a scrollbar to the list control inside the custom list field editor. 
-	Also added an Edit button to the field editor to make it easier for keyboard-only 
-	accessibility.
-	
-	Work for bugzilla 44451:
-	Changed the method that prompts user for information so that if the user cancels 
-	with an empty input dialog, the method always returns an empty string. The responsibility 
-	now rests with the caller to test the return value for length > 0 to decide whether or 
-	not to add string to the list.
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionListFieldEditor.java
-
-	Moved string constants from core UI plugin to build UI plugin. These values are duplicated 
-	in the standadrd make UI plugin anyway, so the argument for keeping them in a common 
-	plugin seems pretty weak. This removes another dependency between the builder UI and 
-	common UI plugin. I did have to change the string resource lookup method in a few of 
-	the UI implementation classes that use the constants.
-	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/ManageConfigDialog.java
-	
-2003-10-17 Tom Tromey
-	
-	Changed -werror to -Werror
-	* plugin.xml
-
-2003-10-14  Alain Magloire
-
-	ICOptionPage was added a new method
-		Preferences getPreferences();
-	This is needed to get the preference store when saving
-	On the plugin.  We had the equivalent for project
-		IProject getProject();
-
-	* src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectOptionPage
-
-2003-10-01 Sean Evoy
-	Fix for bugs 43490 (trivial), 44020, and 43980.
-	A massive change has occurred in the plugin file. I added new C tools that apply 
-	only to projects with C natures. I also added option overrides in the default 
-	configurations for these new tools. The trivial fix for the new C project wizard 
-	involved changing the icon entry in the plugin file.
-	* plugin.xml
-
-	In preparation for 44020, each new configuration created is assigned a truly 
-	random ID.
-	* src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java
-	
-	Removed a tooltip that was not being populated properly.
-	* src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java
-
-2003-09-30 Sean Evoy
-	Fix for bug 41826.
-
-	Updated the tool specifications for Win32, Linux, and Solaris so that header 
-	file extension info is available.
-	* plugin.xml
-
-2003-09-25 Sean Evoy
-	For bug (really an enhancement request)43756, I added the word default to a 
-	widget label to try and make it clear that a new configuration will be based 
-	on default values, not user-overridden stuff. It remains to be seen if this 
-	actually helps, but it seems reasonable.
-	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
-	
-	For bug 43220 I now display a widget just for user objects.
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolsSettingsStore.java
-	
-	I also reordered the plugin definition for the linker tools, and moved some of 
-	the option labels to the plugin property file. I also added a user object option 
-	to each linker tool definition.
-	* plugin.properties
-	* plugin.xml
-	
-2003-09-25 Sean Evoy
-	This patch contains a lot of changes needed to implement fixes for 42648 and 
-	43122. 
-	
-	The properties file has been updated to externalize some of the option labels
-	to try and address some of the concern about continuity between UIs on 
-	different platforms.
-	* plugin.properties
-	
-	There are changes in the plugin XML file to accomodate showing the targets 
-	only on the correct host platform. Option names have bee replaced with 
-	externalized equivalents where possible. The release and debug configurations 
-	for each configuration now apply "reasonable" defaults for debug and optimization
-	option. Finally, the Cygwinb tool specification has been brought closer to those 
-	for *nix.
-	* plugin.xml
-	
-	Only targets that correspond to the host platforms are shown in the drop-down
-	list.
-	* src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java
-
-2003-09-23 Sean Evoy
-	I added a fix for critical bug 43439. The new project wizard is ready to be hooked 
-	up to the help system content on F1. There is a new file with the string constant 
-	the doc project will use to map the widget to a help file.
-	* src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java
-	* src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderHelpContextIds.java
-	
-	In support of the fix for critical bug 43292, I added a new set of widgets to 
-	the ManageConfigDialog implementation. I added new string literals in the properties 
-	file for the plugin. There are obviously new event handlers for the Manage dialog. 
-	It displays the make command for the target, the name of the build artifact, and 
-	a list of current and deleted configurations. There is no way to add new targets. 
-	Users can restore deleted configurations up until they click OK. The client of this 
-	dialog has been changed to properly respond to the changes. The NewConfigurationDialog 
-	now displays an externalized string in the title bar.
-	* plugin.xml
-	* plugin.properties
-	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/ManageConfigDialog.java
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/NewConfigurationDialog.java
-
-2003-09-19 Sean Evoy
-	Removed the binary parser selection tab from the new class wizard. Updated the
-	page description externalized string.
-	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
-	* src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectOptionPage.java
-	
-	Added the hard-coded binary parser info to the defined targets.
-	* plugin.xml
-	
-	Fixed the event handling for add/remove in the list widget for build settings pages.
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionListFieldEditor.java
-	
-2003-09-16 Sean Evoy
-	Changed the initialization and button status logic so the list buttons are 
-	enabled correctly on start-up and that the fist item in the list (if 
-	any) is selected. Also changed the "Add" event handler to properly enable 
-	the buttons and set the list selection.
-	
-	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionListFieldEditor.java
-
-2003-09-15 Sean Evoy
-	First submission of code to new project. Moved all the managed 
-	builder-specific UI elements out of the cdt.ui project. This 
-	includes the icons, and externalized strings.
-	
-	There are 2 new classes to handle the externalized strings and image 
-	files:
-	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
-	* src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIPlugin.java
-	* src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIImages.java
-	
-	The property pages have been modified to use a mix of externalized 
-	strings from the CUIPlugin and ManagedBuilderUIPlugin. The new project 
-	wizard has been reimplemented using the new C project classes added by 
+2004-02-23 Sean Evoy
+	Fix for bug 52647.
+	In 1.2, the target stored the raw, overridden build command the user 
+	specified on the property page. This fix involves enhancing the logic 
+	to pry apart the command from the args, and moving it into the property 
+	itself, so the build system only pays the price to parse once. 
+	Obviously since the make command or the args can be overridden by a user, 
+	the logic as to when to enable the edit field and check box in the manage 
+	dialog had to be tweaked. I am still not 100% satisfied, but this gets the 
+	meat of the fix into the hands of users.
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/ManageConfigDialog.java
+
+2004-2-17 Sean Evoy
+	Fixes for 51640
+	Externalized strings for the target names. 
+	* plugin.properties
+	* plugin.xml
+	
+	Fixes for bug 49590:
+	The system now makes a distinction between the name of the output and its extension. 
+	The UI for managing the name of the build output now has a field for entering the 
+	extension. The new project wizard does not automatically append the extension to the 
+	name of the build output.
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/ManageConfigDialog.java
+	* src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java
+	
+	Some ground work for C11:
+	Added a browse button and an area for selecting a path variable to the browse
+	dialog. However, this is still turned off since it is not fully functional.
+	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionListFieldEditor.java
+	
+	Changed the order of the configurations in the manifest so that debug configurations are the default for every project.
+	* plugin.xml
+
+2003-11-10 Tanya Wolff
+
+	I18N-Externalized strings from plugin.xml.
+	I18N-Added keys & strings to plugin.properties.
+	Fixed an id error in linux c compiler debugger options.
+	* plugin.xml
+	* plugin.properties
+
+2003-11-11 Sean Evoy
+	Work to implement bugzilla 44841:
+	Added a scrollbar to the list control inside the custom list field editor. 
+	Also added an Edit button to the field editor to make it easier for keyboard-only 
+	accessibility.
+	
+	Work for bugzilla 44451:
+	Changed the method that prompts user for information so that if the user cancels 
+	with an empty input dialog, the method always returns an empty string. The responsibility 
+	now rests with the caller to test the return value for length > 0 to decide whether or 
+	not to add string to the list.
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionListFieldEditor.java
+
+	Moved string constants from core UI plugin to build UI plugin. These values are duplicated 
+	in the standadrd make UI plugin anyway, so the argument for keeping them in a common 
+	plugin seems pretty weak. This removes another dependency between the builder UI and 
+	common UI plugin. I did have to change the string resource lookup method in a few of 
+	the UI implementation classes that use the constants.
+	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BrowseEntryDialog.java
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/ManageConfigDialog.java
+	
+2003-10-17 Tom Tromey
+	
+	Changed -werror to -Werror
+	* plugin.xml
+
+2003-10-14  Alain Magloire
+
+	ICOptionPage was added a new method
+		Preferences getPreferences();
+	This is needed to get the preference store when saving
+	On the plugin.  We had the equivalent for project
+		IProject getProject();
+
+	* src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectOptionPage
+
+2003-10-01 Sean Evoy
+	Fix for bugs 43490 (trivial), 44020, and 43980.
+	A massive change has occurred in the plugin file. I added new C tools that apply 
+	only to projects with C natures. I also added option overrides in the default 
+	configurations for these new tools. The trivial fix for the new C project wizard 
+	involved changing the icon entry in the plugin file.
+	* plugin.xml
+
+	In preparation for 44020, each new configuration created is assigned a truly 
+	random ID.
+	* src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectWizard.java
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java
+	
+	Removed a tooltip that was not being populated properly.
+	* src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java
+
+2003-09-30 Sean Evoy
+	Fix for bug 41826.
+
+	Updated the tool specifications for Win32, Linux, and Solaris so that header 
+	file extension info is available.
+	* plugin.xml
+
+2003-09-25 Sean Evoy
+	For bug (really an enhancement request)43756, I added the word default to a 
+	widget label to try and make it clear that a new configuration will be based 
+	on default values, not user-overridden stuff. It remains to be seen if this 
+	actually helps, but it seems reasonable.
+	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
+	
+	For bug 43220 I now display a widget just for user objects.
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolSettingsPage.java
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildToolsSettingsStore.java
+	
+	I also reordered the plugin definition for the linker tools, and moved some of 
+	the option labels to the plugin property file. I also added a user object option 
+	to each linker tool definition.
+	* plugin.properties
+	* plugin.xml
+	
+2003-09-25 Sean Evoy
+	This patch contains a lot of changes needed to implement fixes for 42648 and 
+	43122. 
+	
+	The properties file has been updated to externalize some of the option labels
+	to try and address some of the concern about continuity between UIs on 
+	different platforms.
+	* plugin.properties
+	
+	There are changes in the plugin XML file to accomodate showing the targets 
+	only on the correct host platform. Option names have bee replaced with 
+	externalized equivalents where possible. The release and debug configurations 
+	for each configuration now apply "reasonable" defaults for debug and optimization
+	option. Finally, the Cygwinb tool specification has been brought closer to those 
+	for *nix.
+	* plugin.xml
+	
+	Only targets that correspond to the host platforms are shown in the drop-down
+	list.
+	* src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java
+
+2003-09-23 Sean Evoy
+	I added a fix for critical bug 43439. The new project wizard is ready to be hooked 
+	up to the help system content on F1. There is a new file with the string constant 
+	the doc project will use to map the widget to a help file.
+	* src/org/eclipse/cdt/managedbuilder/ui/wizards/CProjectPlatformPage.java
+	* src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderHelpContextIds.java
+	
+	In support of the fix for critical bug 43292, I added a new set of widgets to 
+	the ManageConfigDialog implementation. I added new string literals in the properties 
+	file for the plugin. There are obviously new event handlers for the Manage dialog. 
+	It displays the make command for the target, the name of the build artifact, and 
+	a list of current and deleted configurations. There is no way to add new targets. 
+	Users can restore deleted configurations up until they click OK. The client of this 
+	dialog has been changed to properly respond to the changes. The NewConfigurationDialog 
+	now displays an externalized string in the title bar.
+	* plugin.xml
+	* plugin.properties
+	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildPropertyPage.java
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/ManageConfigDialog.java
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/NewConfigurationDialog.java
+
+2003-09-19 Sean Evoy
+	Removed the binary parser selection tab from the new class wizard. Updated the
+	page description externalized string.
+	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
+	* src/org/eclipse/cdt/managedbuilder/ui/wizards/NewManagedProjectOptionPage.java
+	
+	Added the hard-coded binary parser info to the defined targets.
+	* plugin.xml
+	
+	Fixed the event handling for add/remove in the list widget for build settings pages.
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionListFieldEditor.java
+	
+2003-09-16 Sean Evoy
+	Changed the initialization and button status logic so the list buttons are 
+	enabled correctly on start-up and that the fist item in the list (if 
+	any) is selected. Also changed the "Add" event handler to properly enable 
+	the buttons and set the list selection.
+	
+	* src/org/eclipse/cdt/managedbuilder/ui/properties/BuildOptionListFieldEditor.java
+
+2003-09-15 Sean Evoy
+	First submission of code to new project. Moved all the managed 
+	builder-specific UI elements out of the cdt.ui project. This 
+	includes the icons, and externalized strings.
+	
+	There are 2 new classes to handle the externalized strings and image 
+	files:
+	* src/org/eclipse/cdt/managedbuilder/internal/ui/PluginResources.properties
+	* src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIPlugin.java
+	* src/org/eclipse/cdt/managedbuilder/internal/ui/ManagedBuilderUIImages.java
+	
+	The property pages have been modified to use a mix of externalized 
+	strings from the CUIPlugin and ManagedBuilderUIPlugin. The new project 
+	wizard has been reimplemented using the new C project classes added by 
 	QNX September 12, 2003. The UI itself has not changed.
Index: plugin.xml
===================================================================
retrieving revision 1.16
diff -u -r1.16 plugin.xml
--- plugin.xml	17 Feb 2004 14:20:11 -0000	1.16
+++ plugin.xml	24 Feb 2004 15:14:22 -0000
@@ -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">
          <description>
             %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">
          <description>
             %MngCWizard.description
@@ -54,6 +54,7 @@
    <extension
          point="org.eclipse.ui.propertyPages">
       <page
+            adaptable="true"
             objectClass="org.eclipse.core.resources.IProject"
             name="%MngBuildProp.name"
             class="org.eclipse.cdt.managedbuilder.ui.properties.BuildPropertyPage"
@@ -84,12 +85,12 @@
             osList="win32">
          <tool
                natureFilter="cnature"
-               sources="c"
                name="%ToolName.compiler.c"
+               sources="c"
                headerExtensions="h"
                outputFlag="-o"
-               outputs="o"
                command="gcc"
+               outputs="o"
                id="cdt.build.tool.cygwin.gnu.c.compiler">
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -101,16 +102,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="cygwin.gnu.c.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.preprocessor.nostdinc">
+                  id="cygwin.gnu.c.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="cygwin.gnu.c.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.preprocessor.preprocess">
+                  id="cygwin.gnu.c.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -121,103 +122,103 @@
                   name="%Option.Posix.DefSym"
                   category="cygwin.gnu.c.compiler.category.symbols"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="cygwin.gnu.c.preprocessor.def.symbols">
+                  id="cygwin.gnu.c.preprocessor.def.symbols"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="_X86_=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_X86_=1">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
                <listOptionValue
-                     value="__STDC_HOSTED__=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__STDC_HOSTED__=1">
                </listOptionValue>
                <listOptionValue
-                     value="i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_i686__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_i686__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentiumpro__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentiumpro__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentium2__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentium2__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentium3__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentium3__">
                </listOptionValue>
                <listOptionValue
-                     value="__stdcall=__attribute__((__stdcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__stdcall=__attribute__((__stdcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="__fastcall=__attribute__((__fastcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__fastcall=__attribute__((__fastcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="__cdecl=__attribute__((__cdecl__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__cdecl=__attribute__((__cdecl__))">
                </listOptionValue>
                <listOptionValue
-                     value="_stdcall=__attribute__((__stdcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_stdcall=__attribute__((__stdcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="_fastcall=__attribute__((__fastcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_fastcall=__attribute__((__fastcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="_cdecl=__attribute__((__cdecl__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_cdecl=__attribute__((__cdecl__))">
                </listOptionValue>
                <listOptionValue
-                     value="__declspec(x)=__attribute__((x))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__declspec(x)=__attribute__((x))">
                </listOptionValue>
                <listOptionValue
-                     value="__CYGWIN32__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__CYGWIN32__">
                </listOptionValue>
                <listOptionValue
-                     value="__CYGWIN__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__CYGWIN__">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="cygwin.gnu.c.compiler.category.symbols"
                   command="-U"
-                  valueType="stringList"
-                  id="cygwin.gnu.c.preprocessor.undef.symbol">
+                  id="cygwin.gnu.c.preprocessor.undef.symbol"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -228,11 +229,11 @@
                   name="%Option.Posix.InclPaths"
                   category="cygwin.gnu.c.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="cygwin.gnu.c.compiler.general.include.paths">
+                  id="cygwin.gnu.c.compiler.general.include.paths"
+                  valueType="includePath">
                <listOptionValue
-                     value="C:\cygwin\usr\include\w32api"
-                     builtIn="true">
+                     builtIn="true"
+                     value="C:\cygwin\usr\include\w32api">
                </listOptionValue>
             </option>
             <optionCategory
@@ -243,8 +244,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="cygwin.gnu.c.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="cygwin.gnu.c.compiler.general.optimization.level">
+                  id="cygwin.gnu.c.compiler.general.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -271,8 +272,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="cygwin.gnu.c.compiler.category.optimization"
-                  valueType="string"
-                  id="cygwin.gnu.c.compiler.optimization.flags">
+                  id="cygwin.gnu.c.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -282,8 +283,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="cygwin.gnu.c.compiler.category.debug"
-                  valueType="enumerated"
-                  id="cygwin.c.compiler.debugging.level">
+                  id="cygwin.c.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -311,24 +312,24 @@
                   defaultValue="-gstabs"
                   name="%Option.Posix.Debug.Other"
                   category="cygwin.gnu.c.compiler.category.debug"
-                  valueType="string"
-                  id="cygwin.gnu.c.compiler.debugging.other">
+                  id="cygwin.gnu.c.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="cygwin.gnu.c.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.debugging.gprof">
+                  id="cygwin.gnu.c.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="cygwin.gnu.c.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.debugging.prof">
+                  id="cygwin.gnu.c.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -340,48 +341,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="cygwin.c.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.syntax">
+                  id="cygwin.gnu.c.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="cygwin.c.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.pedantic">
+                  id="cygwin.gnu.c.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="cygwin.c.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.pedantic.error">
+                  id="cygwin.gnu.c.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="cygwin.c.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.nowarn">
+                  id="cygwin.gnu.c.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="cygwin.c.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.allwarn">
+                  id="cygwin.gnu.c.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="cygwin.c.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.warnings.toerrors">
+                  id="cygwin.gnu.c.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.gnu.c.compiler"
@@ -392,34 +393,34 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="cygwin.c.compiler.category.other"
-                  valueType="string"
-                  id="cygwin.gnu.c.compiler.misc.other">
+                  id="cygwin.gnu.c.compiler.misc.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="cygwin.c.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.misc.verbose">
+                  id="cygwin.gnu.c.compiler.misc.verbose"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Ansi"
                   category="cygwin.c.compiler.category.other"
                   command="-ansi"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.compiler.misc.ansi">
+                  id="cygwin.gnu.c.compiler.misc.ansi"
+                  valueType="boolean">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="c,cc,cpp,cxx,C"
                name="%ToolName.compiler.cpp"
+               sources="c,cc,cpp,cxx,C"
                headerExtensions="h,H,hpp"
                outputFlag="-o"
-               outputs="o"
                command="g++"
+               outputs="o"
                id="org.eclipse.cdt.build.tool.cygwin.compiler">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -431,16 +432,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="cygwin.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.preprocessor.nostdinc">
+                  id="cygwin.gnu.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="cygwin.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.preprocessor.preprocess">
+                  id="cygwin.gnu.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -451,103 +452,103 @@
                   name="%Option.Posix.DefSym"
                   category="cygwin.gnu.compiler.category.symbols"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="cygwin.preprocessor.def.symbols">
+                  id="cygwin.preprocessor.def.symbols"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="_X86_=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_X86_=1">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
                <listOptionValue
-                     value="__STDC_HOSTED__=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__STDC_HOSTED__=1">
                </listOptionValue>
                <listOptionValue
-                     value="i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_i686__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_i686__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentiumpro__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentiumpro__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentium2__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentium2__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_pentium3__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_pentium3__">
                </listOptionValue>
                <listOptionValue
-                     value="__stdcall=__attribute__((__stdcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__stdcall=__attribute__((__stdcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="__fastcall=__attribute__((__fastcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__fastcall=__attribute__((__fastcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="__cdecl=__attribute__((__cdecl__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__cdecl=__attribute__((__cdecl__))">
                </listOptionValue>
                <listOptionValue
-                     value="_stdcall=__attribute__((__stdcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_stdcall=__attribute__((__stdcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="_fastcall=__attribute__((__fastcall__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_fastcall=__attribute__((__fastcall__))">
                </listOptionValue>
                <listOptionValue
-                     value="_cdecl=__attribute__((__cdecl__))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_cdecl=__attribute__((__cdecl__))">
                </listOptionValue>
                <listOptionValue
-                     value="__declspec(x)=__attribute__((x))"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__declspec(x)=__attribute__((x))">
                </listOptionValue>
                <listOptionValue
-                     value="__CYGWIN32__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__CYGWIN32__">
                </listOptionValue>
                <listOptionValue
-                     value="__CYGWIN__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__CYGWIN__">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="cygwin.gnu.compiler.category.symbols"
                   command="-U"
-                  valueType="stringList"
-                  id="cygwin.preprocessor.undef.symbol">
+                  id="cygwin.preprocessor.undef.symbol"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -558,11 +559,11 @@
                   name="%Option.Posix.InclPaths"
                   category="cygwin.gnu.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="cygwin.compiler.general.include.paths">
+                  id="cygwin.compiler.general.include.paths"
+                  valueType="includePath">
                <listOptionValue
-                     value="C:\cygwin\usr\include\w32api"
-                     builtIn="true">
+                     builtIn="true"
+                     value="C:\cygwin\usr\include\w32api">
                </listOptionValue>
             </option>
             <optionCategory
@@ -573,8 +574,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="cygwin.gnu.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="cygwin.compiler.general.optimization.level">
+                  id="cygwin.compiler.general.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -601,8 +602,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="cygwin.gnu.compiler.category.optimization"
-                  valueType="string"
-                  id="cygwin.compiler.optimization.flags">
+                  id="cygwin.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -612,8 +613,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="cygwin.gnu.compiler.category.debug"
-                  valueType="enumerated"
-                  id="cygwin.compiler.debugging.level">
+                  id="cygwin.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -641,24 +642,24 @@
                   defaultValue="-gstabs"
                   name="%Option.Posix.Debug.Other"
                   category="cygwin.gnu.compiler.category.debug"
-                  valueType="string"
-                  id="cygwin.gnu.compiler.debugging.other">
+                  id="cygwin.gnu.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="cygwin.gnu.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.debugging.prof">
+                  id="cygwin.gnu.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="cygwin.gnu.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.debugging.gprof">
+                  id="cygwin.gnu.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.compiler"
@@ -670,48 +671,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="cygwin.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.syntax">
+                  id="cygwin.gnu.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="cygwin.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.pedantic">
+                  id="cygwin.gnu.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="cygwin.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.pedantic.error">
+                  id="cygwin.gnu.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="cygwin.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.nowarn">
+                  id="cygwin.gnu.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="cygwin.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.allwarn">
+                  id="cygwin.gnu.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="cygwin.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="cygwin.gnu.compiler.warnings.toerrors">
+                  id="cygwin.gnu.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -722,24 +723,24 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="cygwin.compiler.category.other"
-                  valueType="string"
-                  id="cygwin.compiler.misc.other">
+                  id="cygwin.compiler.misc.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="cygwin.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="cygwin.compiler.misc.verbose">
+                  id="cygwin.compiler.misc.verbose"
+                  valueType="boolean">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.cygw.exe"
-            parent="cygwin"
             binaryParser="org.eclipse.cdt.core.PE"
+            parent="cygwin"
             defaultExtension="exe"
             isAbstract="false"
             id="cygwin.exec">
@@ -802,8 +803,8 @@
                natureFilter="cnature"
                name="%ToolName.linker.c"
                outputFlag="-o"
-               outputs="exe"
                command="gcc"
+               outputs="exe"
                id="cdt.build.tool.cygwin.c.link">
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.link"
@@ -815,40 +816,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.link.options.nostart">
+                  id="cygwin.gnu.c.link.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.link.options.nodeflibs">
+                  id="cygwin.gnu.c.link.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.link.options.nostdlibs">
+                  id="cygwin.gnu.c.link.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.link.options.strip">
+                  id="cygwin.gnu.c.link.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="cygwin.gnu.c.linker.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.link.options.noshared">
+                  id="cygwin.gnu.c.link.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.link"
@@ -859,15 +860,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.c.linker.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="cygwin.gnu.c.link.libs">
+                  id="cygwin.gnu.c.link.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.c.linker.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="cygwin.gnu.c.link.paths">
+                  id="cygwin.gnu.c.link.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.link"
@@ -877,29 +878,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.c.linker.category.other"
-                  valueType="string"
-                  id="cygwin.gnu.c.link.ldflags">
+                  id="cygwin.gnu.c.link.ldflags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.c.linker.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="cygwin.gnu.c.link.options.other">
+                  id="cygwin.gnu.c.link.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.c.linker.category.other"
-                  valueType="userObjs"
-                  id="cygwin.gnu.c.link.ld.userobjs">
+                  id="cygwin.gnu.c.link.ld.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
                name="%ToolName.linker.cpp"
                outputFlag="-o"
-               outputs="exe"
                command="g++"
+               outputs="exe"
                id="org.eclipse.cdt.build.tool.cygwin.link">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.link"
@@ -911,40 +912,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.linker.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="cygwin.gnu.linker.options.nostart">
+                  id="cygwin.gnu.linker.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.linker.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="cygwin.gnu.linker.options.nodeflibs">
+                  id="cygwin.gnu.linker.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.linker.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="cygwin.gnu.linker.options.nostdlibs">
+                  id="cygwin.gnu.linker.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.linker.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="cygwin.gnu.linker.options.strip">
+                  id="cygwin.gnu.linker.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="cygwin.linker.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="cygwin.gnu.linker.options.noshared">
+                  id="cygwin.gnu.linker.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.link"
@@ -955,15 +956,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.linker.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="cygwin.link.libs">
+                  id="cygwin.link.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.linker.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="cygwin.link.ld.paths">
+                  id="cygwin.link.ld.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.link"
@@ -973,29 +974,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.linker.category.other"
-                  valueType="string"
-                  id="cygwin.link.ld.flags">
+                  id="cygwin.link.ld.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.linker.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="cygwin.gnu.linker.options.other">
+                  id="cygwin.gnu.linker.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.linker.category.other"
-                  valueType="userObjs"
-                  id="cygwin.gnu.link.ld.userobjs">
+                  id="cygwin.gnu.link.ld.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.cygw.so"
-            parent="cygwin"
             binaryParser="org.eclipse.cdt.core.PE"
+            parent="cygwin"
             defaultExtension="dll"
             isAbstract="false"
             id="cygwin.so">
@@ -1058,9 +1059,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">
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.solink"
@@ -1072,40 +1073,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.solink.options.nostart">
+                  id="cygwin.gnu.c.solink.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.solink.options.nodeflibs">
+                  id="cygwin.gnu.c.solink.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.solink.options.nostdlibs">
+                  id="cygwin.gnu.c.solink.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.solink.options.strip">
+                  id="cygwin.gnu.c.solink.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="cygwin.gnu.c.solink.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="cygwin.gnu.c.solink.options.noshared">
+                  id="cygwin.gnu.c.solink.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.solink"
@@ -1116,15 +1117,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.c.solink.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="cygwin.gnu.c.solink.libs">
+                  id="cygwin.gnu.c.solink.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.c.solink.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="cygwin.gnu.c.solink.paths">
+                  id="cygwin.gnu.c.solink.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.cygwin.c.solink"
@@ -1135,30 +1136,30 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.c.solink.category.other"
-                  valueType="string"
-                  id="cygwin.gnu.c.solink.ldflags">
+                  id="cygwin.gnu.c.solink.ldflags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.c.solink.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="cygwin.gnu.c.solink.options.other">
+                  id="cygwin.gnu.c.solink.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.c.solink.category.other"
-                  valueType="userObjs"
-                  id="cygwin.gnu.c.solink.userobjs">
+                  id="cygwin.gnu.c.solink.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
                name="%ToolName.linker.cpp"
                outputFlag="-o"
-               outputs="dll"
-               outputPrefix="lib"
                command="g++"
+               outputPrefix="lib"
+               outputs="dll"
                id="org.eclipse.cdt.build.tool.cygwin.solink">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.solink"
@@ -1170,32 +1171,32 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="cygwin.gnu.solink.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="cygwin.gnu.solink.options.nostart">
+                  id="cygwin.gnu.solink.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="cygwin.gnu.solink.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="cygwin.gnu.solink.options.nodeflibs">
+                  id="cygwin.gnu.solink.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="cygwin.gnu.solink.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="cygwin.gnu.solink.options.nostdlibs">
+                  id="cygwin.gnu.solink.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="cygwin.gnu.solink.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="cygwin.gnu.solink.options.strip">
+                  id="cygwin.gnu.solink.options.strip"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.solink"
@@ -1206,15 +1207,15 @@
                   name="%Option.Posix.Libs"
                   category="cygwin.gnu.solink.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="cygwin.solink.libs">
+                  id="cygwin.solink.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.gnu.solink.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="cygwin.solink.ld.paths">
+                  id="cygwin.solink.ld.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.solink"
@@ -1225,29 +1226,29 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.gnu.solink.category.other"
-                  valueType="string"
-                  id="cygwin.solink.ld.flags">
+                  id="cygwin.solink.ld.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="cygwin.gnu.solink.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="cygwin.gnu.solinker.options.other">
+                  id="cygwin.gnu.solinker.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="cygwin.gnu.solink.category.other"
-                  valueType="userObjs"
-                  id="cygwin.gnu.solink.userobjs">
+                  id="cygwin.gnu.solink.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
       </target>
       <target
             isTest="true"
             name="%TargetName.cygw.dll"
-            parent="cygwin"
             binaryParser="org.eclipse.cdt.core.PE"
+            parent="cygwin"
             defaultExtension="dll.a"
             isAbstract="false"
             id="cygwin.exp">
@@ -1288,9 +1289,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">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.explink"
@@ -1301,30 +1302,30 @@
                   defaultValue="-Wl,--export-all-symbols -Wl,--enable-auto-import"
                   name="%Option.Posix.Linker.Flags"
                   category="cygwin.explink.category.general"
-                  valueType="string"
-                  id="cygwin.explink.ld.flags">
+                  id="cygwin.explink.ld.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Libs"
                   category="cygwin.explink.category.general"
                   command="-l"
-                  valueType="libs"
-                  id="cygwin.explink.libs">
+                  id="cygwin.explink.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="cygwin.explink.category.general"
                   command="-L"
-                  valueType="stringList"
-                  id="cygwin.explink.ld.paths">
+                  id="cygwin.explink.ld.paths"
+                  valueType="stringList">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.cygw.lib"
-            parent="cygwin"
             binaryParser="org.eclipse.cdt.core.PE"
+            parent="cygwin"
             defaultExtension="a"
             isAbstract="false"
             id="cygwin.lib">
@@ -1386,9 +1387,9 @@
          <tool
                natureFilter="both"
                name="%ToolName.archiver"
-               outputs="a"
-               outputPrefix="lib"
                command="ar"
+               outputPrefix="lib"
+               outputs="a"
                id="org.eclipse.cdt.build.tool.cygwin.ar">
             <optionCategory
                   owner="org.eclipse.cdt.build.tool.cygwin.ar"
@@ -1399,8 +1400,8 @@
                   defaultValue="-r"
                   name="%Option.Posix.Archiver.Flags"
                   category="cygwin.ar.category.general"
-                  valueType="string"
-                  id="cygwin.ar.flags">
+                  id="cygwin.ar.flags"
+                  valueType="string">
             </option>
          </tool>
       </target>
@@ -1416,12 +1417,12 @@
             osList="linux">
          <tool
                natureFilter="cnature"
-               sources="c"
                name="%ToolName.compiler.c"
+               sources="c"
                headerExtensions="h"
                outputFlag="-o"
-               outputs="o"
                command="gcc"
+               outputs="o"
                id="cdt.build.tool.linux.gnu.c.compiler">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1433,16 +1434,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="linux.gnu.c.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.preprocessor.nostdinc">
+                  id="linux.gnu.c.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="linux.gnu.c.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.preprocessor.preprocess">
+                  id="linux.gnu.c.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1453,75 +1454,75 @@
                   name="%Option.Posix.DefSym"
                   category="linux.gnu.c.compiler.category.symbols"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="linux.gnu.c.preprocessor.def.symbols">
+                  id="linux.gnu.c.preprocessor.def.symbols"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="__ELF__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__ELF__">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__gnu_linux__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__gnu_linux__">
                </listOptionValue>
                <listOptionValue
-                     value="linux"
-                     builtIn="true">
+                     builtIn="true"
+                     value="linux">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__linux__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__linux__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
                <listOptionValue
-                     value="__linux"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__linux">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
                <listOptionValue
-                     value="__STDC_HOSTED__=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__STDC_HOSTED__=1">
                </listOptionValue>
                <listOptionValue
-                     value="_GNU_SOURCE"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_GNU_SOURCE">
                </listOptionValue>
                <listOptionValue
-                     value="i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_i386__">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="linux.gnu.c.compiler.category.symbols"
                   command="-U"
-                  valueType="stringList"
-                  id="linux.gnu.c.preprocessor.undef.symbol">
+                  id="linux.gnu.c.preprocessor.undef.symbol"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1532,8 +1533,8 @@
                   name="%Option.Posix.InclPaths"
                   category="linux.gnu.c.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="linux.gnu.c.compiler.general.include.paths">
+                  id="linux.gnu.c.compiler.general.include.paths"
+                  valueType="includePath">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1543,8 +1544,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="linux.gnu.c.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="linux.gnu.c.compiler.general.optimization.level">
+                  id="linux.gnu.c.compiler.general.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -1571,8 +1572,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="linux.gnu.c.compiler.category.optimization"
-                  valueType="string"
-                  id="linux.gnu.c.compiler.optimization.flags">
+                  id="linux.gnu.c.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1582,8 +1583,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="linux.gnu.c.compiler.category.debug"
-                  valueType="enumerated"
-                  id="linux.c.compiler.debugging.level">
+                  id="linux.c.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -1610,24 +1611,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="linux.gnu.c.compiler.category.debug"
-                  valueType="string"
-                  id="linux.gnu.c.compiler.debugging.other">
+                  id="linux.gnu.c.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="linux.gnu.c.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.debugging.gprof">
+                  id="linux.gnu.c.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="linux.gnu.c.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.debugging.prof">
+                  id="linux.gnu.c.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1639,48 +1640,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="linux.c.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.syntax">
+                  id="linux.gnu.c.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="linux.c.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.pedantic">
+                  id="linux.gnu.c.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="linux.c.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.pedantic.error">
+                  id="linux.gnu.c.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="linux.c.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.nowarn">
+                  id="linux.gnu.c.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="linux.c.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.allwarn">
+                  id="linux.gnu.c.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="linux.c.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.warnings.toerrors">
+                  id="linux.gnu.c.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.compiler"
@@ -1691,34 +1692,34 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="linux.c.compiler.category.other"
-                  valueType="string"
-                  id="linux.gnu.c.compiler.misc.other">
+                  id="linux.gnu.c.compiler.misc.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="linux.c.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.misc.verbose">
+                  id="linux.gnu.c.compiler.misc.verbose"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Ansi"
                   category="linux.c.compiler.category.other"
                   command="-ansi"
-                  valueType="boolean"
-                  id="linux.gnu.c.compiler.misc.ansi">
+                  id="linux.gnu.c.compiler.misc.ansi"
+                  valueType="boolean">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="c,C,cc,cxx,cpp"
                name="%ToolName.compiler.cpp"
+               sources="c,C,cc,cxx,cpp"
                headerExtensions="h,H,hpp"
                outputFlag="-o"
-               outputs="o"
                command="g++"
+               outputs="o"
                id="cdt.build.tool.linux.gnu.compiler">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1730,90 +1731,90 @@
                   name="%Option.Posix.Nostdinc"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.preprocessor.nostdinc">
+                  id="linux.gnu.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.preprocessor.preprocess">
+                  id="linux.gnu.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <option
                   name="%Option.Posix.DefSym"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="linux.gnu.compiler.preprocessor.def">
+                  id="linux.gnu.compiler.preprocessor.def"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="__ELF__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__ELF__">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__gnu_linux__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__gnu_linux__">
                </listOptionValue>
                <listOptionValue
-                     value="linux"
-                     builtIn="true">
+                     builtIn="true"
+                     value="linux">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__linux__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__linux__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
                <listOptionValue
-                     value="__linux"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__linux">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
                <listOptionValue
-                     value="__STDC_HOSTED__=1"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__STDC_HOSTED__=1">
                </listOptionValue>
                <listOptionValue
-                     value="_GNU_SOURCE"
-                     builtIn="true">
+                     builtIn="true"
+                     value="_GNU_SOURCE">
                </listOptionValue>
                <listOptionValue
-                     value="i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386">
                </listOptionValue>
                <listOptionValue
-                     value="__i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__i386__">
                </listOptionValue>
                <listOptionValue
-                     value="__tune_i386__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__tune_i386__">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="linux.gnu.compiler.category.preprocessor"
                   command="-U"
-                  valueType="stringList"
-                  id="linux.gnu.compiler.preprocessor.undef">
+                  id="linux.gnu.compiler.preprocessor.undef"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1824,15 +1825,15 @@
                   name="%Option.Posix.InclPaths"
                   category="linux.gnu.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="linux.gnu.compiler.dirs.incpaths">
+                  id="linux.gnu.compiler.dirs.incpaths"
+                  valueType="includePath">
                <listOptionValue
-                     value="/usr/local/include"
-                     builtIn="true">
+                     builtIn="true"
+                     value="/usr/local/include">
                </listOptionValue>
                <listOptionValue
-                     value="/usr/include"
-                     builtIn="true">
+                     builtIn="true"
+                     value="/usr/include">
                </listOptionValue>
             </option>
             <optionCategory
@@ -1843,8 +1844,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="linux.gnu.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="linux.gnu.compiler.optimization.level">
+                  id="linux.gnu.compiler.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      command="-O0"
@@ -1870,8 +1871,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="linux.gnu.compiler.category.optimization"
-                  valueType="string"
-                  id="linux.compiler.optimization.flags">
+                  id="linux.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1881,8 +1882,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="linux.gnu.compiler.category.debug"
-                  valueType="enumerated"
-                  id="linux.gnu.compiler.debugging.level">
+                  id="linux.gnu.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -1909,24 +1910,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="linux.gnu.compiler.category.debug"
-                  valueType="string"
-                  id="linux.gnu.compiler.debugging.other">
+                  id="linux.gnu.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="linux.gnu.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.debugging.prof">
+                  id="linux.gnu.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="linux.gnu.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.debugging.gprof">
+                  id="linux.gnu.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1938,48 +1939,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="linux.gnu.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.syntax">
+                  id="linux.gnu.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="linux.gnu.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.pedantic">
+                  id="linux.gnu.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="linux.gnu.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.pedantic.error">
+                  id="linux.gnu.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="linux.gnu.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.nowarn">
+                  id="linux.gnu.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="linux.gnu.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.allwarn">
+                  id="linux.gnu.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="linux.gnu.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.warnings.toerrors">
+                  id="linux.gnu.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.compiler"
@@ -1990,24 +1991,24 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="linux.gnu.compiler.category.other"
-                  valueType="string"
-                  id="linux.gnu.compiler.other.other">
+                  id="linux.gnu.compiler.other.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="linux.gnu.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="linux.gnu.compiler.other.verbose">
+                  id="linux.gnu.compiler.other.verbose"
+                  valueType="boolean">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.linux.exe"
-            parent="linux.gnu"
             binaryParser="org.eclipse.cdt.core.ELF"
+            parent="linux.gnu"
             isAbstract="false"
             id="linux.gnu.exec">
          <configuration
@@ -2064,8 +2065,8 @@
          </configuration>
          <tool
                natureFilter="cnature"
-               sources="o"
                name="%ToolName.linker.c"
+               sources="o"
                outputFlag="-o"
                command="gcc"
                id="cdt.build.tool.linux.c.link">
@@ -2079,40 +2080,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">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.c.linker.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="linux.gnu.c.link.options.nodeflibs">
+                  id="linux.gnu.c.link.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.c.linker.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="linux.gnu.c.link.options.nostdlibs">
+                  id="linux.gnu.c.link.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.c.linker.category.options"
                   command="-s"
-                  valueType="boolean"
-                  id="linux.gnu.c.link.options.strip">
+                  id="linux.gnu.c.link.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="linux.gnu.c.linker.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="linux.gnu.c.link.options.noshared">
+                  id="linux.gnu.c.link.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.c.link"
@@ -2123,15 +2124,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.c.linker.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="linux.gnu.c.link.libs">
+                  id="linux.gnu.c.link.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.c.linker.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="linux.gnu.c.link.paths">
+                  id="linux.gnu.c.link.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.c.link"
@@ -2141,27 +2142,27 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.c.linker.category.other"
-                  valueType="string"
-                  id="linux.gnu.c.link.ldflags">
+                  id="linux.gnu.c.link.ldflags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.c.linker.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="linux.gnu.c.link.options.other">
+                  id="linux.gnu.c.link.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.c.linker.category.other"
-                  valueType="userObjs"
-                  id="linux.gnu.c.link.ld.userobjs">
+                  id="linux.gnu.c.link.ld.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="o"
                name="%ToolName.linker.cpp"
+               sources="o"
                outputFlag="-o"
                command="g++"
                id="cdt.build.tool.linux.gnu.link">
@@ -2175,40 +2176,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">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.linker.category.options"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="linux.gnu.linker.options.nodeflibs">
+                  id="linux.gnu.linker.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.linker.category.options"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="linux.gnu.linker.options.nostdlibs">
+                  id="linux.gnu.linker.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.linker.category.options"
                   command="-s"
-                  valueType="boolean"
-                  id="linux.gnu.linker.options.strip">
+                  id="linux.gnu.linker.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="linux.gnu.linker.category.options"
                   command="-static"
-                  valueType="boolean"
-                  id="linux.gnu.linker.options.noshared">
+                  id="linux.gnu.linker.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.link"
@@ -2219,15 +2220,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.linker.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="linux.gnu.linker.libs.libs">
+                  id="linux.gnu.linker.libs.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.linker.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="linux.gnu.linker.libs.paths">
+                  id="linux.gnu.linker.libs.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.link"
@@ -2237,29 +2238,29 @@
             <option
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.linker.category.other"
-                  valueType="string"
-                  id="linux.gnu.linker.libs.flags">
+                  id="linux.gnu.linker.libs.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.linker.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="linux.gnu.linker.options.other">
+                  id="linux.gnu.linker.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.linker.category.other"
-                  valueType="userObjs"
-                  id="linux.gnu.linker.userobjs">
+                  id="linux.gnu.linker.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.linux.so"
-            parent="linux.gnu"
             binaryParser="org.eclipse.cdt.core.ELF"
+            parent="linux.gnu"
             defaultExtension="so"
             isAbstract="false"
             id="linux.gnu.so">
@@ -2317,12 +2318,12 @@
          </configuration>
          <tool
                natureFilter="cnature"
-               sources="o"
                name="%ToolName.linker.c"
+               sources="o"
                outputFlag="-o"
-               outputs="so"
-               outputPrefix="lib"
                command="gcc"
+               outputPrefix="lib"
+               outputs="so"
                id="cdt.build.tool.linux.gnu.c.solink">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.solink"
@@ -2334,40 +2335,40 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="linux.gnu.c.solink.category.general"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="linux.gnu.c.solink.options.nostart">
+                  id="linux.gnu.c.solink.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.c.solink.category.general"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="linux.gnu.c.solink.options.nodeflibs">
+                  id="linux.gnu.c.solink.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.c.solink.category.general"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="linux.gnu.c.solink.options.nostdlibs">
+                  id="linux.gnu.c.solink.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.c.solink.category.general"
                   command="-s"
-                  valueType="boolean"
-                  id="linux.gnu.c.solink.options.strip">
+                  id="linux.gnu.c.solink.options.strip"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Static"
                   category="linux.gnu.c.solink.category.general"
                   command="-static"
-                  valueType="boolean"
-                  id="linux.gnu.c.solink.options.noshared">
+                  id="linux.gnu.c.solink.options.noshared"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.solink"
@@ -2378,15 +2379,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.c.solink.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="linux.gnu.c.solink.libs">
+                  id="linux.gnu.c.solink.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.c.solink.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="linux.gnu.c.solink.paths">
+                  id="linux.gnu.c.solink.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.c.solink"
@@ -2397,31 +2398,31 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.c.solink.category.other"
-                  valueType="string"
-                  id="linux.gnu.c.solink.ldflags">
+                  id="linux.gnu.c.solink.ldflags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.c.solink.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="linux.gnu.c.solink.options.other">
+                  id="linux.gnu.c.solink.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.c.solink.category.other"
-                  valueType="userObjs"
-                  id="linux.gnu.c.solink.userobjs">
+                  id="linux.gnu.c.solink.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="o"
                name="%ToolName.linker.cpp"
+               sources="o"
                outputFlag="-o"
-               outputs="so"
-               outputPrefix="lib"
                command="g++"
+               outputPrefix="lib"
+               outputs="so"
                id="cdt.build.tool.linux.gnu.solink">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.solink"
@@ -2433,32 +2434,32 @@
                   name="%Option.Posix.Linker.NoStartFiles"
                   category="linux.gnu.solink.category.options"
                   command="-nostartfiles"
-                  valueType="boolean"
-                  id="linux.gnu.solink.options.nostart">
+                  id="linux.gnu.solink.options.nostart"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoDefLibs"
                   category="linux.gnu.solink.category.options"
                   command="-nodefaultlibs"
-                  valueType="boolean"
-                  id="linux.gnu.solink.options.nodeflibs">
+                  id="linux.gnu.solink.options.nodeflibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.NoStdLibs"
                   category="linux.gnu.solink.category.options"
                   command="-nostdlib"
-                  valueType="boolean"
-                  id="linux.gnu.solink.options.nostdlibs">
+                  id="linux.gnu.solink.options.nostdlibs"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Linker.Strip"
                   category="linux.gnu.solink.category.options"
                   command="-s"
-                  valueType="boolean"
-                  id="linux.gnu.solink.options.strip">
+                  id="linux.gnu.solink.options.strip"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.solink"
@@ -2469,15 +2470,15 @@
                   name="%Option.Posix.Libs"
                   category="linux.gnu.solink.category.libs"
                   command="-l"
-                  valueType="libs"
-                  id="linux.gnu.solink.libs.libs">
+                  id="linux.gnu.solink.libs.libs"
+                  valueType="libs">
             </option>
             <option
                   name="%Option.Posix.Libsearch"
                   category="linux.gnu.solink.category.libs"
                   command="-L"
-                  valueType="stringList"
-                  id="linux.gnu.solink.libs.paths">
+                  id="linux.gnu.solink.libs.paths"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.solink"
@@ -2488,29 +2489,29 @@
                   defaultValue="-shared"
                   name="%Option.Posix.Linker.Flags"
                   category="linux.gnu.solink.category.other"
-                  valueType="string"
-                  id="linux.gnu.solink.libs.flags">
+                  id="linux.gnu.solink.libs.flags"
+                  valueType="string">
             </option>
             <option
                   name="%Option.Posix.Linker.XLinker"
                   category="linux.gnu.solink.category.other"
                   command="-Xlinker"
-                  valueType="stringList"
-                  id="linux.gnu.solink.options.other">
+                  id="linux.gnu.solink.options.other"
+                  valueType="stringList">
             </option>
             <option
                   name="%Option.Posix.UserObjs"
                   category="linux.gnu.solink.category.other"
-                  valueType="userObjs"
-                  id="linux.gnu.solink.userobjs">
+                  id="linux.gnu.solink.userobjs"
+                  valueType="userObjs">
             </option>
          </tool>
       </target>
       <target
             isTest="false"
             name="%TargetName.linux.lib"
-            parent="linux.gnu"
             binaryParser="org.eclipse.cdt.core.ELF"
+            parent="linux.gnu"
             defaultExtension="a"
             isAbstract="false"
             id="linux.gnu.lib">
@@ -2568,11 +2569,11 @@
          </configuration>
          <tool
                natureFilter="both"
-               sources="o"
                name="%ToolName.archiver"
-               outputs="a"
-               outputPrefix="lib"
+               sources="o"
                command="ar"
+               outputPrefix="lib"
+               outputs="a"
                id="cdt.build.tool.linux.gnu.lib">
             <optionCategory
                   owner="cdt.build.tool.linux.gnu.lib"
@@ -2583,8 +2584,8 @@
                   defaultValue="-r"
                   name="%Option.Posix.Archiver.Flags"
                   category="linux.gnu.lib.category.general"
-                  valueType="string"
-                  id="linux.gnu.lib.flags">
+                  id="linux.gnu.lib.flags"
+                  valueType="string">
             </option>
          </tool>
       </target>
@@ -2600,12 +2601,12 @@
             osList="solaris">
          <tool
                natureFilter="cnature"
-               sources="c"
                name="%ToolName.compiler.c"
+               sources="c"
                headerExtensions="h"
                outputFlag="-o"
-               outputs="o"
                command="gcc"
+               outputs="o"
                id="cdt.build.tool.solaris.gnu.c.compiler">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2617,16 +2618,16 @@
                   name="%Option.Posix.Nostdinc"
                   category="solaris.gnu.c.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.preprocessor.nostdinc">
+                  id="solaris.gnu.c.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="solaris.gnu.c.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.preprocessor.preprocess">
+                  id="solaris.gnu.c.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2637,67 +2638,67 @@
                   name="%Option.Posix.DefSym"
                   category="solaris.gnu.c.compiler.category.symbols"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="solaris.gnu.c.preprocessor.def.symbols">
+                  id="solaris.gnu.c.preprocessor.def.symbols"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="sun"
-                     builtIn="true">
+                     builtIn="true"
+                     value="sun">
                </listOptionValue>
                <listOptionValue
-                     value="sparc"
-                     builtIn="true">
+                     builtIn="true"
+                     value="sparc">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__svr4__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__svr4__">
                </listOptionValue>
                <listOptionValue
-                     value="__SVR4"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__SVR4">
                </listOptionValue>
                <listOptionValue
-                     value="__GCC_NEW_VARARGS__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__GCC_NEW_VARARGS__">
                </listOptionValue>
                <listOptionValue
-                     value="__sun__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sun__">
                </listOptionValue>
                <listOptionValue
-                     value="__sparc__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sparc__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__sun"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sun">
                </listOptionValue>
                <listOptionValue
-                     value="__sparc"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sparc">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
             </option>
             <option
                   name="%Option.Posix.UndefSym"
                   category="solaris.gnu.c.compiler.category.symbols"
                   command="-U"
-                  valueType="stringList"
-                  id="solaris.gnu.c.preprocessor.undef.symbol">
+                  id="solaris.gnu.c.preprocessor.undef.symbol"
+                  valueType="stringList">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2708,8 +2709,8 @@
                   name="%Option.Posix.InclPaths"
                   category="solaris.gnu.c.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="solaris.gnu.c.compiler.general.include.paths">
+                  id="solaris.gnu.c.compiler.general.include.paths"
+                  valueType="includePath">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2719,8 +2720,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="solaris.gnu.c.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="solaris.gnu.c.compiler.general.optimization.level">
+                  id="solaris.gnu.c.compiler.general.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      isDefault="false"
@@ -2747,8 +2748,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="solaris.gnu.c.compiler.category.optimization"
-                  valueType="string"
-                  id="solaris.gnu.c.compiler.optimization.flags">
+                  id="solaris.gnu.c.compiler.optimization.flags"
+                  valueType="string">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2758,8 +2759,8 @@
             <option
                   name="%Option.Posix.DebugLevel"
                   category="solaris.gnu.c.compiler.category.debug"
-                  valueType="enumerated"
-                  id="solaris.c.compiler.debugging.level">
+                  id="solaris.c.compiler.debugging.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Debug.None"
                      isDefault="false"
@@ -2786,24 +2787,24 @@
             <option
                   name="%Option.Posix.Debug.Other"
                   category="solaris.gnu.c.compiler.category.debug"
-                  valueType="string"
-                  id="solaris.gnu.c.compiler.debugging.other">
+                  id="solaris.gnu.c.compiler.debugging.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.gprof"
                   category="solaris.gnu.c.compiler.category.debug"
                   command="-pg"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.debugging.gprof">
+                  id="solaris.gnu.c.compiler.debugging.gprof"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Debug.prof"
                   category="solaris.gnu.c.compiler.category.debug"
                   command="-p"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.debugging.prof">
+                  id="solaris.gnu.c.compiler.debugging.prof"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2815,48 +2816,48 @@
                   name="%Option.Posix.Warn.Syntax"
                   category="solaris.c.compiler.category.warnings"
                   command="-fsyntax-only"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.syntax">
+                  id="solaris.gnu.c.compiler.warnings.syntax"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.Pedandic"
                   category="solaris.c.compiler.category.warnings"
                   command="-pedantic"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.pedantic">
+                  id="solaris.gnu.c.compiler.warnings.pedantic"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.PedErrors"
                   category="solaris.c.compiler.category.warnings"
                   command="-pedantic-errors"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.pedantic.error">
+                  id="solaris.gnu.c.compiler.warnings.pedantic.error"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.nowarn"
                   category="solaris.c.compiler.category.warnings"
                   command="-w"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.nowarn">
+                  id="solaris.gnu.c.compiler.warnings.nowarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="true"
                   name="%Option.Posix.Warn.allwarn"
                   category="solaris.c.compiler.category.warnings"
                   command="-Wall"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.allwarn">
+                  id="solaris.gnu.c.compiler.warnings.allwarn"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Warn.toerrs"
                   category="solaris.c.compiler.category.warnings"
                   command="-Werror"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.warnings.toerrors">
+                  id="solaris.gnu.c.compiler.warnings.toerrors"
+                  valueType="boolean">
             </option>
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.c.compiler"
@@ -2867,34 +2868,34 @@
                   defaultValue="-c"
                   name="%Option.OtherFlags"
                   category="solaris.c.compiler.category.other"
-                  valueType="string"
-                  id="solaris.gnu.c.compiler.misc.other">
+                  id="solaris.gnu.c.compiler.misc.other"
+                  valueType="string">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Verbose"
                   category="solaris.c.compiler.category.other"
                   command="-v"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.misc.verbose">
+                  id="solaris.gnu.c.compiler.misc.verbose"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.Ansi"
                   category="solaris.c.compiler.category.other"
                   command="-ansi"
-                  valueType="boolean"
-                  id="solaris.gnu.c.compiler.misc.ansi">
+                  id="solaris.gnu.c.compiler.misc.ansi"
+                  valueType="boolean">
             </option>
          </tool>
          <tool
                natureFilter="ccnature"
-               sources="c,C,cc,cxx,cpp"
                name="%ToolName.compiler.cpp"
+               sources="c,C,cc,cxx,cpp"
                headerExtensions="h,H,hpp"
                outputFlag="-o"
-               outputs="o"
                command="g++"
+               outputs="o"
                id="cdt.build.tool.solaris.gnu.compiler">
             <optionCategory
                   owner="cdt.build.tool.solaris.gnu.compiler"
@@ -2906,74 +2907,74 @@
                   name="%Option.Posix.Nostdinc"
                   category="solaris.gnu.compiler.category.preprocessor"
                   command="-nostdinc"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.preprocessor.nostdinc">
+                  id="solaris.gnu.compiler.preprocessor.nostdinc"
+                  valueType="boolean">
             </option>
             <option
                   defaultValue="false"
                   name="%Option.Posix.PreprocOnly"
                   category="solaris.gnu.compiler.category.preprocessor"
                   command="-E"
-                  valueType="boolean"
-                  id="solaris.gnu.compiler.preprocessor.preprocess">
+                  id="solaris.gnu.compiler.preprocessor.preprocess"
+                  valueType="boolean">
             </option>
             <option
                   name="%Option.Posix.DefSym"
                   category="solaris.gnu.compiler.category.preprocessor"
                   command="-D"
-                  valueType="definedSymbols"
-                  id="solaris.gnu.compiler.preprocessor.def">
+                  id="solaris.gnu.compiler.preprocessor.def"
+                  valueType="definedSymbols">
                <listOptionValue
-                     value="sun"
-                     builtIn="true">
+                     builtIn="true"
+                     value="sun">
                </listOptionValue>
                <listOptionValue
-                     value="sparc"
-                     builtIn="true">
+                     builtIn="true"
+                     value="sparc">
                </listOptionValue>
                <listOptionValue
-                     value="unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="unix">
                </listOptionValue>
                <listOptionValue
-                     value="__svr4__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__svr4__">
                </listOptionValue>
                <listOptionValue
-                     value="__SVR4"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__SVR4">
                </listOptionValue>
                <listOptionValue
-                     value="__GCC_NEW_VARARGS__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__GCC_NEW_VARARGS__">
                </listOptionValue>
                <listOptionValue
-                     value="__sun__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sun__">
                </listOptionValue>
                <listOptionValue
-                     value="__sparc__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sparc__">
                </listOptionValue>
                <listOptionValue
-                     value="__unix__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix__">
                </listOptionValue>
                <listOptionValue
-                     value="__sun"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sun">
                </listOptionValue>
                <listOptionValue
-                     value="__sparc"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__sparc">
                </listOptionValue>
                <listOptionValue
-                     value="__unix"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__unix">
                </listOptionValue>
                <listOptionValue
-                     value="__OPTIMIZE__"
-                     builtIn="true">
+                     builtIn="true"
+                     value="__OPTIMIZE__">
                </listOptionValue>
             </option>
             <optionCategory
@@ -2985,15 +2986,15 @@
                   name="%Option.Posix.InclPaths"
                   category="solaris.gnu.compiler.category.dirs"
                   command="-I"
-                  valueType="includePath"
-                  id="solaris.gnu.compiler.dirs.incpaths">
+                  id="solaris.gnu.compiler.dirs.incpaths"
+                  valueType="includePath">
                <listOptionValue
-                     value="/usr/local/include"
-                     builtIn="true">
+                     builtIn="true"
+                     value="/usr/local/include">
                </listOptionValue>
                <listOptionValue
-                     value="/usr/include"
-                     builtIn="true">
+                     builtIn="true"
+                     value="/usr/include">
                </listOptionValue>
             </option>
             <optionCategory
@@ -3004,8 +3005,8 @@
             <option
                   name="%Option.Posix.OptLevel"
                   category="solaris.gnu.compiler.category.optimization"
-                  valueType="enumerated"
-                  id="solaris.gnu.compiler.optimization.level">
+                  id="solaris.gnu.compiler.optimization.level"
+                  valueType="enumerated">
                <enumeratedOptionValue
                      name="%Option.Posix.Optimize.None"
                      command="-O0"
@@ -3031,8 +3032,8 @@
             <option
                   name="%Option.Posix.Optimize.Flags"
                   category="solaris.gnu.compiler.category.optimization"

Back to the top