From 0d30c8b77989638930952f5d36e09b2e29556168 Mon Sep 17 00:00:00 2001
From: Chris Recoskie <recoskie@ca.ibm.com>
Date: Thu, 3 Jun 2010 18:40:54 +0000
Subject: [PATCH] Bug 315645 -  fix unmerged xlc/xlupc toolchains

---
 .../plugin.properties                         | 12 ++-
 .../plugin.xml                                | 98 ++++++++++++-------
 .../plugin.properties                         | 10 +-
 .../plugin.xml                                | 70 ++++++++++---
 4 files changed, 135 insertions(+), 55 deletions(-)

diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
index 9daef8b8ec4..2ca4f71a87b 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.properties
@@ -428,4 +428,14 @@ XLCompilerPropertyPage.name = XL C/C++ Compiler
 extension.name = Managed Build Tools Description
 tool.name = Abstract XL Compiler
 tool.name.0 = Abstract XL Linker
-tool.name.1 = Abstract XL Shared Object Linker
\ No newline at end of file
+tool.name.1 = Abstract XL Shared Object Linker
+tool.compiler.c.abstract = Abstract XL C Compiler
+tool.compiler.cpp.abstract = Abstract XL C++ Compiler
+tool.compiler.abstract = Abstract XL Compiler
+tool.linker.exe.abstract.name = Abstract XL Linker
+tool.linker.so.abstract.name = Abstract XL Shared Object Linker
+tool.c.compiler.name = Local XL C Compiler
+inputType.c.name = Local C Sources
+tool.cpp.compiler.name = Local XL C++ Compiler
+inputType.c.name.2 = Local C Sources
+inputType.cpp.name = Local C++ Sources
\ No newline at end of file
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
index 014a00896c8..542760a05e3 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlc.ui/plugin.xml
@@ -127,26 +127,12 @@
       </tool>
 	<tool
        command="${XL_compilerRoot}/xlc"
-       id="cdt.managedbuild.tool.xlc.c.compiler"
+       id="cdt.managedbuild.tool.xlc.c.compiler.abstract"
        isAbstract="true"
-       name="%ToolName.compiler.xlc.c"
+       name="%tool.compiler.c.abstract"
        natureFilter="cnature"
        outputFlag="-o"
        superClass="org.eclipse.cdt.managedbuilder.xlc.ui.tool.abstractCompiler">
-       <inputType
-            dependencyContentType="org.eclipse.cdt.core.cHeader"
-            dependencyExtensions="h"
-            id="cdt.managedbuild.tool.xlc.c.compiler.input"
-            primaryInput="true"
-            scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile"
-            sourceContentType="org.eclipse.cdt.core.cSource"
-            sources="c">
-       </inputType>
-       <outputType
-			outputs="o"
-            buildVariable="OBJS"
-            id="cdt.managedbuild.tool.xlc.c.compiler.output">
-       </outputType>
 		<option
 			name="%Option.Cstdinc"
 			category="xlc.c.compiler.category.Input"
@@ -247,26 +233,12 @@
 	  </tool>
 	  <tool
          command="${XL_compilerRoot}/xlC"
-         id="cdt.managedbuild.tool.xlc.cpp.compiler"
+         id="cdt.managedbuild.tool.xlc.cpp.compiler.abstract"
          isAbstract="true"
-         name="%ToolName.compiler.xlc.cpp"
+         name="%tool.compiler.cpp.abstract"
          natureFilter="ccnature"
          outputFlag="-o"
          superClass="org.eclipse.cdt.managedbuilder.xlc.ui.tool.abstractCompiler">
-           <inputType
-               dependencyContentType="org.eclipse.cdt.core.cxxHeader"
-               dependencyExtensions="h,H,hpp"
-               id="cdt.managedbuild.tool.xlc.cpp.compiler.input"
-               primaryInput="true"
-               scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP"
-               sourceContentType="org.eclipse.cdt.core.cxxSource"
-               sources="c,C,cc,cxx,cpp">
-          </inputType>
-         <outputType
-               buildVariable="OBJS"
-               id="org.eclipse.cdt.managedbuilder.xlc.cpp.compiler.output"
-               outputs="o">
-         </outputType>
            <option
                  category="xlc.c.compiler.category.Input"
                  command="-+"
@@ -550,7 +522,7 @@
          targetTool="cdt.managedbuild.tool.xlc.c.linker.exe.debug;cdt.managedbuild.tool.xlc.cpp.linker.exe.debug">
 			      <targetPlatform
 					  id="cdt.managedbuild.target.xlc.platform.exe.debug"
-				 	  name="%PlatformName.Dbg"           					  
+				 	  name="%PlatformName.Dbg"            					  
 					  osList="all"					  
 					  archList="all">
 				  </targetPlatform>
@@ -615,7 +587,7 @@
            targetTool="cdt.managedbuild.tool.xlc.c.linker.exe.release;cdt.managedbuild.tool.xlc.cpp.linker.exe.release">
 		          <targetPlatform
 		              id="cdt.managedbuild.target.xlc.platform.exe.release"
-		              name="%PlatformName.Rel"		      
+		              name="%PlatformName.Rel"		             
 		              osList="all"
 		              archList="all">		              
 		          </targetPlatform>
@@ -930,7 +902,7 @@
             errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
             id="org.eclipse.cdt.managedbuilder.xlc.ui.tool.abstractCompiler"
             isAbstract="true"
-            name="%tool.name">
+            name="%tool.compiler.abstract">
          <envVarBuildPath 
 			pathType="buildpathInclude"
 			variableList="CPATH,C_INCLUDE_PATH">
@@ -3050,7 +3022,7 @@
             errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
             id="org.eclipse.cdt.managedbuilder.xlc.ui.tool.abstractLinker"
             isAbstract="true"
-            name="%tool.name.0"
+            name="%tool.linker.exe.abstract.name"
             outputFlag="-o">
                   <envVarBuildPath 
          	pathType="buildpathLibrary"
@@ -3246,7 +3218,7 @@
             errorParsers="org.eclipse.cdt.errorparsers.xlc.XlcErrorParser"
             id="org.eclipse.cdt.managedbuilder.xlc.ui.tool.linker.abstractSOLinker"
             isAbstract="true"
-            name="%tool.name.1"
+            name="%tool.linker.so.abstract.name"
             superClass="org.eclipse.cdt.managedbuilder.xlc.ui.tool.abstractLinker">
             <option
             	name="%Option.Linking.mkshrobj"
@@ -3285,6 +3257,58 @@
 			    id="cdt.managedbuild.tool.xlc.c.linker.so.debug.output">
 			</outputType>
     </tool>
+     <tool
+           id="cdt.managedbuild.tool.xlc.c.compiler"
+           isAbstract="false"
+           name="%tool.c.compiler.name"
+           superClass="cdt.managedbuild.tool.xlc.c.compiler.abstract">
+           <inputType
+                 dependencyContentType="org.eclipse.cdt.core.cHeader"
+                 dependencyExtensions="h"
+                 id="cdt.managedbuild.tool.xlc.c.compiler.input"
+                 name="%inputType.c.name"
+                 primaryInput="true"
+                 scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile"
+                 sourceContentType="org.eclipse.cdt.core.cSource"
+                 sources="c">
+       		</inputType>
+       		<outputType
+               buildVariable="OBJS"
+               id="cdt.managedbuild.tool.xlc.c.compiler.output"
+               outputs="o">
+            </outputType>
+     </tool>
+     <tool
+           id="cdt.managedbuild.tool.xlc.cpp.compiler"
+           isAbstract="false"
+           name="%tool.cpp.compiler.name"
+           superClass="cdt.managedbuild.tool.xlc.cpp.compiler.abstract">
+           <inputType
+                 dependencyContentType="org.eclipse.cdt.core.cHeader"
+                 dependencyExtensions="h"
+                 id="cdt.managedbuild.tool.xlc.cpp.c.compiler.input"
+                 name="%inputType.c.name.2"
+                 primaryInput="true"
+                 scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile"
+                 sourceContentType="org.eclipse.cdt.core.cSource"
+                 sources="c">
+           </inputType>
+           <inputType
+                 dependencyContentType="org.eclipse.cdt.core.cxxHeader"
+                 dependencyExtensions="h,H,hpp"
+                 id="cdt.managedbuild.tool.xlc.cpp.compiler.input"
+                 name="%inputType.cpp.name"
+                 primaryInput="true"
+                 scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfileCPP"
+                 sourceContentType="org.eclipse.cdt.core.cxxSource"
+                 sources="c,C,cc,cxx,cpp">
+          </inputType>
+          <outputType
+               buildVariable="OBJS"
+               id="org.eclipse.cdt.managedbuilder.xlc.cpp.compiler.output"
+               outputs="o">
+         </outputType>
+     </tool>
     
 	</extension>
    <extension
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties
index dbb48ac23da..b4e76b65992 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.properties
@@ -16,6 +16,8 @@ category.name.1=XL UPC
 wizard.name.1=XL UPC Project
 
 ToolName.compiler.xlupc = XL UPC Compiler
+ToolName.linker.xlupc = XL UPC Linker
+tool.name.0 = Abstract XL UPC Linker
 
 TargetName.xlupc.exe=Executable (XL UPC)
 TargetName.xlupc.so=Shared Library (XL UPC)
@@ -51,4 +53,10 @@ Option.compilation.q32=-q32
 Option.compilation.q64=-q64
 
 
-extension.name = Base Build Properties Definition
\ No newline at end of file
+extension.name = Base Build Properties Definition
+tool.linker.exe.name = XL UPC Executable Linker
+tool.linker.so.name = XL UPC Shared Object Linker
+tool.compiler.abstract.name = Abstract XL UPC Compiler
+tool.compiler.name = Local XL UPC Compiler
+inputType.upc.name = Local UPC Sources
+inputType.c.name = Local C Sources
\ No newline at end of file
diff --git a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml
index 53e812ee330..e9e9b84d754 100644
--- a/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml
+++ b/xlc/org.eclipse.cdt.managedbuilder.xlupc.ui/plugin.xml
@@ -49,7 +49,7 @@
                </tool>
                <tool
                      id="cdt.managedbuild.tool.linker.xlupc.exe.debug"
-                     superClass="cdt.managedbuild.tool.xlc.c.linker">
+                     superClass="cdt.managedbuild.tool.xlupc.linker.exe">
                </tool>
                <tool
                      id="cdt.managedbuild.tool.assembler.xlupc.exe.debug"
@@ -96,7 +96,7 @@
                </tool>
                <tool
                      id="cdt.managedbuild.tool.linker.xlupc.exe.release"
-                     superClass="cdt.managedbuild.tool.xlc.c.linker">
+                     superClass="cdt.managedbuild.tool.xlupc.linker.exe">
                </tool>
                <tool
                      id="cdt.managedbuild.tool.assembler.xlupc.exe.release"
@@ -148,7 +148,7 @@
                </tool>
                <tool
                      id="cdt.managedbuild.tool.linker.xlupc.so.debug"
-                     superClass="cdt.managedbuild.tool.xlc.c.linker.so">
+                     superClass="cdt.managedbuild.tool.xlupc.linker.so">
                </tool>
                <tool
                      id="cdt.managedbuild.tool.assembler.xlupc.so.debug"
@@ -192,7 +192,7 @@
                </tool>
                <tool
                      id="cdt.managedbuild.tool.linker.xlupc.so.release"
-                     superClass="cdt.managedbuild.tool.xlc.c.linker.so">
+                     superClass="cdt.managedbuild.tool.xlupc.linker.so">
                </tool>
                <tool
                      id="cdt.managedbuild.tool.assembler.xlupc.so.release"
@@ -297,23 +297,30 @@
             </toolChain>
          </configuration>
       </projectType>
+
+    <tool
+          command="${XL_compilerRoot}/xlupc"
+          id="cdt.managedbuild.tool.xlupc.linker.exe"
+          isAbstract="false"
+          name="%tool.linker.exe.name"
+          natureFilter="cnature"
+          superClass="cdt.managedbuild.tool.xlc.c.linker">
+    </tool>
+    <tool
+          id="cdt.managedbuild.tool.xlupc.linker.so"
+          isAbstract="false"
+          name="%tool.linker.so.name">
+    </tool>
+      
+      
       <tool
             command="${XL_compilerRoot}/xlupc"
-            id="org.eclipse.cdt.managedbuilder.xlupc.ui.compiler"
+            id="org.eclipse.cdt.managedbuilder.xlupc.ui.compiler.abstract"
             isAbstract="true"
-            name="%ToolName.compiler.xlupc"
+            name="%tool.compiler.abstract.name"
             natureFilter="cnature"
             outputFlag="-o"
-            superClass="cdt.managedbuild.tool.xlc.c.compiler">
-         <inputType
-               dependencyContentType="org.eclipse.cdt.core.cHeader"
-               dependencyExtensions="h"
-               id="org.eclipse.cdt.managedbuilder.xlupc.ui.inputType.upc"
-               primaryInput="true"
-               scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile"
-               sourceContentType="org.eclipse.cdt.core.parser.upc.upcSource"
-               sources="upc">
-         </inputType>
+            superClass="cdt.managedbuild.tool.xlc.c.compiler.abstract">
          <optionCategory
                id="org.eclipse.cdt.managedbuilder.xlupc.ui.optionCategory.upc"
                name="%OptionCategory.upc">
@@ -399,6 +406,37 @@
          </option>
         
       </tool>
+      <tool
+            id="org.eclipse.cdt.managedbuilder.xlupc.ui.compiler"
+            isAbstract="false"
+            name="%tool.compiler.name"
+            superClass="org.eclipse.cdt.managedbuilder.xlupc.ui.compiler.abstract">
+            <inputType
+                  dependencyContentType="org.eclipse.cdt.core.cHeader"
+                  dependencyExtensions="h"
+                  id="org.eclipse.cdt.managedbuilder.xlupc.ui.inputType.upc"
+                  name="%inputType.upc.name"
+                  primaryInput="true"
+                  scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile"
+                  sourceContentType="org.eclipse.cdt.core.parser.upc.upcSource"
+                  sources="upc">
+         </inputType>
+            <inputType
+                  dependencyContentType="org.eclipse.cdt.core.cHeader"
+                  dependencyExtensions="h"
+                  id="org.eclipse.cdt.managedbuilder.xlupc.ui.inputType.c"
+                  name="%inputType.c.name"
+                  primaryInput="true"
+                  scannerConfigDiscoveryProfileId="org.eclipse.cdt.managedbuilder.xlc.core.XLCManagedMakePerProjectProfile"
+                  sourceContentType="org.eclipse.cdt.core.cSource"
+                  sources="c">
+            </inputType>
+            <outputType
+                  buildVariable="OBJS"
+                  id="org.eclipse.cdt.managedbuilder.xlupc.ui.outputType.objectFile"
+                  outputs="o">
+            </outputType>
+      </tool>
    </extension>
    <extension
          point="org.eclipse.cdt.managedbuilder.ui.newWizardPages">