From 2942d637ad8e9c98526cccf75b5bd33803b2948d Mon Sep 17 00:00:00 2001
From: Vivian Kong <vivkong@ca.ibm.com>
Date: Wed, 16 Apr 2008 16:03:39 +0000
Subject: [PATCH] externalize Gnu Make Builder's name (bug 227369)

---
 .../plugin.properties                                         | 4 +++-
 build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml    | 2 +-
 build/org.eclipse.cdt.managedbuilder.core/plugin.properties   | 3 ++-
 build/org.eclipse.cdt.managedbuilder.core/plugin.xml          | 2 +-
 build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties | 4 +++-
 build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml        | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.properties b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.properties
index b14cacd2154..a7f33d835cb 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2007 QNX Software Systems and others.
+# Copyright (c) 2007, 2008 QNX Software Systems 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
@@ -7,4 +7,6 @@
 #
 # Contributors:
 #     QNX Software Systems - initial API and implementation
+#	  IBM Corporation
 ###############################################################################
+GNUMakeBuilder.name=Gnu Make Builder
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
index ff1a2c230b4..1ca7ae0bc46 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/plugin.xml
@@ -7875,7 +7875,7 @@
           ignoreErrCmd="-k"
           parallelBuildCmd="-j*"
           errorParsers="org.eclipse.cdt.core.MakeErrorParser"
-          name="Gnu Make Builder">
+          name="%GNUMakeBuilder.name">
    	  </builder>   
    	  
       <toolChain
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.properties b/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
index 0fa16703362..62f3c29eb66 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2007 IBM Corporation and others.
+# Copyright (c) 2003, 2008 IBM Corporation 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
@@ -33,6 +33,7 @@ extensionGCCPerProjectProfile.name=GNU C/C++ Scanner Info per project profile
 extensionGCCPerFileProfile.name=GNU C/C++ Scanner Info per file profile
 
 InternalBuilder.name=CDT Internal Builder
+GNUMakeBuilder.name=Gnu Make Builder
 
 BuildSystem.name=CDT Build System
 
diff --git a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
index fa013abb439..5abacc69d9f 100644
--- a/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.core/plugin.xml
@@ -371,7 +371,7 @@
           ignoreErrCmd="-k"
           parallelBuildCmd="-j*"
           errorParsers="org.eclipse.cdt.core.MakeErrorParser"
-          name="Gnu Make Builder"
+          name="%GNUMakeBuilder.name"
           isSystem="true">
    	  </builder>   
 	  	
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
index e5972055303..ffbc8ebe77c 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2005, 2007 Texas Instruments Inc. and others.
+# Copyright (c) 2005, 2008 Texas Instruments 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
@@ -173,3 +173,5 @@ Option.Windows.Windres.OutputFormat.Coff = coff (--output-format coff)
 Option.Windows.Windres.OutputFormat.RC = rc (--output-format rc)
 Option.Windows.Windres.OutputFormat.Res = res (--output-format res)
 Option.MacOSX.Linker.Shared=Shared (-dynamiclib)
+
+GNUMakeBuilder.name=Gnu Make Builder
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index 990c6dcb294..3ea56602342 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -1625,7 +1625,7 @@
           ignoreErrCmd="-k"
           parallelBuildCmd="-j*"
           errorParsers="org.eclipse.cdt.core.MakeErrorParser"
-          name="Gnu Make Builder">
+          name="%GNUMakeBuilder.name">
    	  </builder>   
    	  
       <toolChain