From 6760d0c61d82aa145ecd29c727588721bec05621 Mon Sep 17 00:00:00 2001
From: Anton Leherbauer <anton.leherbauer@windriver.com>
Date: Thu, 14 Jun 2007 12:11:39 +0000
Subject: [PATCH] Fix for 182637: Error is logged when selecting "Build
 configurations" in the Customize Perspective dialog

---
 .../plugin.properties                         |  7 +++--
 .../plugin.xml                                | 16 +++++++++++
 core/org.eclipse.cdt.ui/plugin.xml            | 28 +++++++++----------
 3 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
index 1bbf077ce39..a7567b0f4da 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2006 IBM Corporation and others.
+# Copyright (c) 2003, 2007 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
@@ -82,4 +82,7 @@ Data.hierarchy=Data hierarchy
 Preferred.toolchains=Preferred toolchains
 Wizard.defaults=Wizard defaults
 PropertyPage.defaults=Property page settings
-MBSPerProjectProfile.name=Managed Build System - per project scanner info profile
\ No newline at end of file
+MBSPerProjectProfile.name=Managed Build System - per project scanner info profile
+
+# menu labels
+Configurations.menu=Build Configurations
diff --git a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
index f1fca078033..353314ddf1e 100644
--- a/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.ui/plugin.xml
@@ -142,6 +142,22 @@
      <actionSet
            id="org.eclipse.cdt.managedbuilder.ui.BuildAllActionSet"
            label="%BuildCfgMenu.label">
+<!-- Note: The menu (re-) definition has to be here due to bug: -->
+<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=15670  -->
+        <menu
+              id="org.eclipse.cdt.ui.prjmenu"
+              label="%Configurations.menu"
+              path="project/build">
+           <groupMarker
+                 name="gm1">
+           </groupMarker>
+           <separator
+                 name="s2">
+           </separator>
+           <groupMarker
+                 name="gm2">
+           </groupMarker>
+        </menu>
         <action
               class="org.eclipse.cdt.managedbuilder.ui.actions.BuildAllAction"
               enablesFor="+"
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 583f1df4fdb..bd75fabe077 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -1056,6 +1056,20 @@
            id="org.eclipse.cdt.ui.buildConfigActionSet"
            label="%BuildConfigActionSet.label"
            visible="false">
+        <menu
+              id="org.eclipse.cdt.ui.prjmenu"
+              label="%Configurations.menu"
+              path="project/build">
+           <groupMarker
+                 name="gm1">
+           </groupMarker>
+           <separator
+                 name="s2">
+           </separator>
+           <groupMarker
+                 name="gm2">
+           </groupMarker>
+        </menu>
         <action
               class="org.eclipse.cdt.ui.actions.ChangeBuildConfigMenuAction"
               disabledIcon="icons/dlcl16/config-tool.gif"
@@ -1098,20 +1112,6 @@
               label="%DeleteRcConfigAction.label"
               menubarPath="project/org.eclipse.cdt.ui.prjmenu/gm1"
               />
-        <menu
-              id="org.eclipse.cdt.ui.prjmenu"
-              label="%Configurations.menu"
-              path="project/build">
-           <groupMarker
-                 name="gm1">
-           </groupMarker>
-           <separator
-                 name="s2">
-           </separator>
-           <groupMarker
-                 name="gm2">
-           </groupMarker>
-        </menu>
      </actionSet>
      <actionSet
             label="%CElementCreationActionSet.label"