From 92c3c8638f559bde79aa54c9c385344f65edd50b Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Tue, 4 Jan 2011 19:34:49 +0000
Subject: [PATCH] Bug 329531 - Add some missing pieces to enable the builder to
 work.

---
 .../org.eclipse.cdt.build.crossgcc/plugin.xml | 411 +++++++++---------
 1 file changed, 214 insertions(+), 197 deletions(-)

diff --git a/cross/org.eclipse.cdt.build.crossgcc/plugin.xml b/cross/org.eclipse.cdt.build.crossgcc/plugin.xml
index 887753dffcc..225f47129f8 100755
--- a/cross/org.eclipse.cdt.build.crossgcc/plugin.xml
+++ b/cross/org.eclipse.cdt.build.crossgcc/plugin.xml
@@ -1,197 +1,214 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
-      <managedBuildRevision
-            fileVersion="4.0.0">
-      </managedBuildRevision>
-      <toolChain
-            archList="all"
-            configurationEnvironmentSupplier="org.eclipse.cdt.internal.build.crossgcc.CrossEnvironmentVariableSupplier"
-            id="cdt.managedbuild.toolchain.gnu.cross.base"
-            isAbstract="false"
-            name="Cross GCC"
-            osList="all">
-         <targetPlatform
-               archList="all"
-               binaryParser="org.eclipse.cdt.core.ELF"
-               id="cdt.managedbuild.targetPlatform.gnu.cross"
-               isAbstract="false"
-               osList="all">
-         </targetPlatform>
-         <builder
-               id="cdt.managedbuild.builder.gnu.cross"
-               isAbstract="false"
-               isVariableCaseSensitive="false"
-               superClass="org.eclipse.cdt.build.core.internal.builder">
-         </builder>
-         <optionCategory
-               id="cdt.managedbuild.optionCategory.gnu.cross.settings"
-               name="Cross Settings">
-         </optionCategory>
-         <option
-               category="cdt.managedbuild.optionCategory.gnu.cross.settings"
-               id="cdt.managedbuild.option.gnu.cross.prefix"
-               isAbstract="false"
-               name="Prefix"
-               resourceFilter="all"
-               valueType="string">
-         </option>
-         <option
-               browseType="directory"
-               category="cdt.managedbuild.optionCategory.gnu.cross.settings"
-               id="cdt.managedbuild.option.gnu.cross.path"
-               isAbstract="false"
-               name="Path"
-               resourceFilter="all"
-               valueType="string">
-         </option>
-         <tool
-               commandLineGenerator="org.eclipse.cdt.internal.build.crossgcc.CrossCommandLineGenerator"
-               id="cdt.managedbuild.tool.gnu.cross.c.compiler"
-               isAbstract="false"
-               name="Cross GCC Compiler"
-               superClass="cdt.managedbuild.tool.gnu.c.compiler">
-         </tool>
-         <tool
-               commandLineGenerator="org.eclipse.cdt.internal.build.crossgcc.CrossCommandLineGenerator"
-               id="cdt.managedbuild.tool.gnu.cross.cpp.compiler"
-               isAbstract="false"
-               name="Cross G++ Compiler"
-               superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
-         </tool>
-         <tool
-               commandLineGenerator="org.eclipse.cdt.internal.build.crossgcc.CrossCommandLineGenerator"
-               id="cdt.managedbuild.tool.gnu.cross.cpp.linker"
-               isAbstract="false"
-               name="Cross G++ Linker"
-               superClass="cdt.managedbuild.tool.gnu.cpp.linker">
-         </tool>
-      </toolChain>
-	     <projectType
-	        buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
-	        id="cdt.managedbuild.target.gnu.cross.exe"
-	        isAbstract="false"
-	        isTest="false"
-	        >                                  
-	     <configuration
-	           name="Debug"
-	           cleanCommand="rm -rf"
-	           id="cdt.managedbuild.config.gnu.cross.exe.debug"
-	           parent="cdt.managedbuild.config.gnu.base"
-	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug">
-	           <toolChain
-	           		 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
-	                 id="cdt.managedbuild.toolchain.gnu.cross.exe.debug">
-	           </toolChain>                                   
-	     </configuration>
-	     <configuration
-	           name="Release"
-	           cleanCommand="rm -rf"
-	           id="cdt.managedbuild.config.gnu.cross.exe.release"
-	           parent="cdt.managedbuild.config.gnu.base"
-	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release">
-	           <toolChain
-	                 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
-	                 id="cdt.managedbuild.toolchain.gnu.cross.exe.release">
-	           </toolChain>                                                     
-	     </configuration>
-	  </projectType>              
-	     
-	  <projectType
-	        buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"
-	        id="cdt.managedbuild.target.gnu.cross.so"
-	        isAbstract="false"
-	        isTest="false"
-	        >            
-	     <configuration
-	           name="Debug"
-	           cleanCommand="rm -rf"
-	           parent="cdt.managedbuild.config.gnu.base"
-	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
-	           id="cdt.managedbuild.config.gnu.cross.so.debug">
-	           <toolChain
-	                 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
-	                 id="cdt.managedbuild.toolchain.gnu.cross.so.debug">
-	           </toolChain>                                                     
-	     </configuration>
-	     <configuration
-	           name="Release"
-	           cleanCommand="rm -rf"
-	           parent="cdt.managedbuild.config.gnu.base"
-	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
-	           id="cdt.managedbuild.config.gnu.cross.so.release">               
-	           <toolChain
-	                 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
-	                 id="cdt.managedbuild.toolchain.gnu.cross.so.release">
-	           </toolChain>                                                                                
-	     </configuration>
-	  </projectType>
-	                   
-	  <projectType
-	        buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib"
-	        id="cdt.managedbuild.target.gnu.cross.lib"
-	        isAbstract="false"
-	        isTest="false"
-	        >            
-	     <configuration
-	           name="Debug"
-	           parent="cdt.managedbuild.config.gnu.base"
-	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
-	           cleanCommand="rm -rf"
-	           id="cdt.managedbuild.config.gnu.cross.lib.debug">
-	           <toolChain
-	                 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
-	                 id="cdt.managedbuild.toolchain.gnu.cross.lib.debug">
-	           </toolChain>                                                                                				               				  
-	     </configuration>
-	     <configuration
-	           name="Release"
-	           parent="cdt.managedbuild.config.gnu.base"
-	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
-	           cleanCommand="rm -rf"
-	           id="cdt.managedbuild.config.gnu.cross.lib.release">
-	           <toolChain
-	                 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
-	                 id="cdt.managedbuild.toolchain.gnu.cross.lib.release">
-			</toolChain>                                                                                				                    
-         </configuration>         
-      </projectType>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.core.templateProcessTypes">
-      <processType
-            name="setCrossCommand"
-            processRunner="org.eclipse.cdt.build.crossgcc.SetCrossCommandProcess">
-         <simple
-               name="projectName">
-         </simple>
-         <simple
-               name="prefix">
-         </simple>
-         <simple
-               name="path">
-         </simple>
-      </processType>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.core.templates">
-      <template
-            id="org.eclipse.cdt.build.crossgcc.setCrossCommand"
-            location="templates/setCrossCommand/template.xml"
-            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
-      </template>
-   </extension>
-   <extension
-         point="org.eclipse.cdt.core.templateAssociations">
-      <template
-            id="org.eclipse.cdt.build.crossgcc.setCrossCommand">
-         <toolChain
-               id="cdt.managedbuild.toolchain.gnu.cross.base">
-         </toolChain>
-      </template>
-   </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+# Copyright (c) 2009, 2010 Wind River Systems, Inc. and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Doug Schaefer   (Wind River)     - initial API and implementation 
+# Anna Dushistova (Mentor Graphics)- [329531][crossgcc] crossgcc fails to build a project
+-->
+<plugin>
+
+   <extension
+         point="org.eclipse.cdt.managedbuilder.core.buildDefinitions">
+      <managedBuildRevision
+            fileVersion="4.0.0">
+      </managedBuildRevision>
+      <toolChain
+            archList="all"
+            configurationEnvironmentSupplier="org.eclipse.cdt.internal.build.crossgcc.CrossEnvironmentVariableSupplier"
+            id="cdt.managedbuild.toolchain.gnu.cross.base"
+            isAbstract="false"
+            name="Cross GCC"
+            targetTool="cdt.managedbuild.tool.gnu.cross.c.linker;cdt.managedbuild.tool.gnu.cross.cpp.linker;cdt.managedbuild.tool.gnu.archiver"
+            osList="all">
+         <targetPlatform
+               archList="all"
+               binaryParser="org.eclipse.cdt.core.ELF"
+               id="cdt.managedbuild.targetPlatform.gnu.cross"
+               isAbstract="false"
+               osList="all">
+         </targetPlatform>
+         <builder
+               id="cdt.managedbuild.builder.gnu.cross"
+               superClass="cdt.managedbuild.target.gnu.builder">
+         </builder>
+         <optionCategory
+               id="cdt.managedbuild.optionCategory.gnu.cross.settings"
+               name="Cross Settings">
+         </optionCategory>
+         <option
+               category="cdt.managedbuild.optionCategory.gnu.cross.settings"
+               id="cdt.managedbuild.option.gnu.cross.prefix"
+               isAbstract="false"
+               name="Prefix"
+               resourceFilter="all"
+               valueType="string">
+         </option>
+         <option
+               browseType="directory"
+               category="cdt.managedbuild.optionCategory.gnu.cross.settings"
+               id="cdt.managedbuild.option.gnu.cross.path"
+               isAbstract="false"
+               name="Path"
+               resourceFilter="all"
+               valueType="string">
+         </option>
+         <tool
+               commandLineGenerator="org.eclipse.cdt.internal.build.crossgcc.CrossCommandLineGenerator"
+               id="cdt.managedbuild.tool.gnu.cross.c.compiler"
+               isAbstract="false"
+               name="Cross GCC Compiler"
+               superClass="cdt.managedbuild.tool.gnu.c.compiler">
+         </tool>
+         <tool
+               commandLineGenerator="org.eclipse.cdt.internal.build.crossgcc.CrossCommandLineGenerator"
+               id="cdt.managedbuild.tool.gnu.cross.cpp.compiler"
+               isAbstract="false"
+               name="Cross G++ Compiler"
+               superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
+         </tool>
+         <tool
+               commandLineGenerator="org.eclipse.cdt.internal.build.crossgcc.CrossCommandLineGenerator"
+               id="cdt.managedbuild.tool.gnu.cross.c.linker"
+               isAbstract="false"
+               name="Cross GCC Linker"
+               superClass="cdt.managedbuild.tool.gnu.c.linker">
+         </tool>
+         <tool
+               commandLineGenerator="org.eclipse.cdt.internal.build.crossgcc.CrossCommandLineGenerator"
+               id="cdt.managedbuild.tool.gnu.cross.cpp.linker"
+               isAbstract="false"
+               name="Cross G++ Linker"
+               superClass="cdt.managedbuild.tool.gnu.cpp.linker">
+         </tool>
+      </toolChain>
+	     <projectType
+	        buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe"
+	        id="cdt.managedbuild.target.gnu.cross.exe"
+	        isAbstract="false"
+	        isTest="false"
+	        >                                  
+	     <configuration
+	           name="Debug"
+	           cleanCommand="rm -rf"
+	           id="cdt.managedbuild.config.gnu.cross.exe.debug"
+	           parent="cdt.managedbuild.config.gnu.base"
+	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug">
+	           <toolChain
+	           		 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
+	                 id="cdt.managedbuild.toolchain.gnu.cross.exe.debug">
+	           </toolChain>                                   
+	     </configuration>
+	     <configuration
+	           name="Release"
+	           cleanCommand="rm -rf"
+	           id="cdt.managedbuild.config.gnu.cross.exe.release"
+	           parent="cdt.managedbuild.config.gnu.base"
+	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release">
+	           <toolChain
+	                 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
+	                 id="cdt.managedbuild.toolchain.gnu.cross.exe.release">
+	           </toolChain>                                                     
+	     </configuration>
+	  </projectType>              
+	     
+	  <projectType
+	        buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib"
+	        id="cdt.managedbuild.target.gnu.cross.so"
+	        isAbstract="false"
+	        isTest="false"
+	        >            
+	     <configuration
+	           name="Debug"
+	           cleanCommand="rm -rf"
+	           parent="cdt.managedbuild.config.gnu.base"
+	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
+	           id="cdt.managedbuild.config.gnu.cross.so.debug">
+	           <toolChain
+	                 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
+	                 id="cdt.managedbuild.toolchain.gnu.cross.so.debug">
+	           </toolChain>                                                     
+	     </configuration>
+	     <configuration
+	           name="Release"
+	           cleanCommand="rm -rf"
+	           parent="cdt.managedbuild.config.gnu.base"
+	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
+	           id="cdt.managedbuild.config.gnu.cross.so.release">               
+	           <toolChain
+	                 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
+	                 id="cdt.managedbuild.toolchain.gnu.cross.so.release">
+	           </toolChain>                                                                                
+	     </configuration>
+	  </projectType>
+	                   
+	  <projectType
+	        buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib"
+	        id="cdt.managedbuild.target.gnu.cross.lib"
+	        isAbstract="false"
+	        isTest="false"
+	        >            
+	     <configuration
+	           name="Debug"
+	           parent="cdt.managedbuild.config.gnu.base"
+	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug"
+	           cleanCommand="rm -rf"
+	           id="cdt.managedbuild.config.gnu.cross.lib.debug">
+	           <toolChain
+	                 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
+	                 id="cdt.managedbuild.toolchain.gnu.cross.lib.debug">
+	           </toolChain>                                                                                				               				  
+	     </configuration>
+	     <configuration
+	           name="Release"
+	           parent="cdt.managedbuild.config.gnu.base"
+	           buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release"
+	           cleanCommand="rm -rf"
+	           id="cdt.managedbuild.config.gnu.cross.lib.release">
+	           <toolChain
+	                 superClass="cdt.managedbuild.toolchain.gnu.cross.base"
+	                 id="cdt.managedbuild.toolchain.gnu.cross.lib.release">
+			</toolChain>                                                                                				                    
+         </configuration>         
+      </projectType>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.templateProcessTypes">
+      <processType
+            name="setCrossCommand"
+            processRunner="org.eclipse.cdt.build.crossgcc.SetCrossCommandProcess">
+         <simple
+               name="projectName">
+         </simple>
+         <simple
+               name="prefix">
+         </simple>
+         <simple
+               name="path">
+         </simple>
+      </processType>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.templates">
+      <template
+            id="org.eclipse.cdt.build.crossgcc.setCrossCommand"
+            location="templates/setCrossCommand/template.xml"
+            projectType="org.eclipse.cdt.build.core.buildArtefactType.exe">
+      </template>
+   </extension>
+   <extension
+         point="org.eclipse.cdt.core.templateAssociations">
+      <template
+            id="org.eclipse.cdt.build.crossgcc.setCrossCommand">
+         <toolChain
+               id="cdt.managedbuild.toolchain.gnu.cross.base">
+         </toolChain>
+      </template>
+   </extension>
+
+</plugin>