bug 309113: Ability to have a single build console for a multi-project build

Patch from Alex Collins (with a few improvements)

build/org.eclipse.cdt.make.ui/src/org/eclipse/cdt/make/ui/TargetBuild.java

@@ -17,6 +17,7 @@ import java.util.List;
 import org.eclipse.cdt.make.core.IMakeTarget;
 import org.eclipse.cdt.make.internal.ui.MakeUIPlugin;
 import org.eclipse.cdt.make.internal.ui.preferences.MakePreferencePage;
+import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspaceRunnable;
@@ -87,6 +88,9 @@ public class TargetBuild {
 	}
 
 	static public void buildTargets(Shell shell, final IMakeTarget[] targets) {
+		// Setup the global build console
+		CUIPlugin.getDefault().getConsoleManager().startGlobalConsole();
+
 		saveAllResources(targets);
 		Job targetJob = new Job(MakeUIPlugin.getResourceString("TargetBuild.backgroundTask.name")) { //$NON-NLS-1$
 			@Override

build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildAllConfigurationsAction.java

@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.jobs.Job;
@@ -36,6 +37,9 @@ public class BuildAllConfigurationsAction implements IObjectActionDelegate {
 	}
 
 	public void run(IAction action) {
+		// Setup the global build console
+		CUIPlugin.getDefault().getConsoleManager().startGlobalConsole();
+
 		for (IProject project : projects) {
 			ICProjectDescription prjd = CoreModel.getDefault().getProjectDescription(project, false);
 			if (prjd != null) {

build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/BuildConfigurationsJob.java

@@ -14,6 +14,7 @@ import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
 import org.eclipse.cdt.managedbuilder.internal.ui.Messages;
+import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -67,6 +68,9 @@ public class BuildConfigurationsJob extends Job {
 	 */
 	@Override
 	protected IStatus run(IProgressMonitor monitor) {
+		// Setup the global build console
+		CUIPlugin.getDefault().getConsoleManager().startGlobalConsole();
+
 		IConfiguration[] cfgs = new IConfiguration[cfgDescriptions.length];
 		for (int i=0; i<cfgDescriptions.length; i++) {
 			cfgs[i] = ManagedBuildManager.getConfigurationForDescription(cfgDescriptions[i]);

build/org.eclipse.cdt.managedbuilder.ui/src/org/eclipse/cdt/managedbuilder/internal/ui/actions/CleanAllConfigurationsAction.java

@@ -15,6 +15,7 @@ import java.util.ArrayList;
 import org.eclipse.cdt.core.model.CoreModel;
 import org.eclipse.cdt.core.settings.model.ICConfigurationDescription;
 import org.eclipse.cdt.core.settings.model.ICProjectDescription;
+import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.jobs.Job;
@@ -36,6 +37,9 @@ public class CleanAllConfigurationsAction implements IObjectActionDelegate {
 	}
 
 	public void run(IAction action) {
+		// Setup the global build console
+		CUIPlugin.getDefault().getConsoleManager().startGlobalConsole();
+
 		for (IProject project : projects) {
 			ICProjectDescription prjd = CoreModel.getDefault().getProjectDescription(project, false);
 			if (prjd != null) {

core/org.eclipse.cdt.ui/plugin.properties

@@ -178,6 +178,7 @@ CPluginPreferencePage.name=C/C++
 CPluginEditorPreferencePage.name=Editor
 CPluginTemplatePreferencePage.name=Templates
 CPluginBuildConsolePreferencePage.name=Console
+CPluginGlobalBuildLogPreferencePage.name=Logging
 CPluginFileTypesPreferencePage.name=File Types
 CodeFormatterPreferencePage.name=Code Style
 codeTemplatePreferencePage.name=Code Templates

core/org.eclipse.cdt.ui/plugin.xml

@@ -684,6 +684,13 @@
             id="org.eclipse.cdt.ui.preferneces.CBuildConsolePreferernces">
           <keywordReference id="org.eclipse.cdt.ui.common"/>
       </page>
+      <page
+            name="%CPluginGlobalBuildLogPreferencePage.name"
+            category="org.eclipse.cdt.make.ui.preferences.BuildSettings"
+            class="org.eclipse.cdt.internal.ui.preferences.GlobalBuildLogPreferencePage"
+            id="org.eclipse.cdt.ui.preferences.CGlobalBuildLogPreferences">
+          <keywordReference id="org.eclipse.cdt.ui.common"/>
+      </page>
       <page
             name="%CPluginFileTypesPreferencePage.name"
             category="org.eclipse.cdt.ui.preferences.CPluginPreferencePage"
@@ -1627,6 +1634,16 @@
             class="org.eclipse.cdt.internal.ui.buildconsole.CBuildConsole">
       </CBuildConsole>
    </extension>
+   <extension
+         point="org.eclipse.ui.console.consolePageParticipants">
+      <consolePageParticipant
+            class="org.eclipse.cdt.internal.ui.buildconsole.BuildConsolePageParticipant"
+            id="org.eclipse.cdt.internal.ui.buildconsole.BuildConsolePageParticipant">
+         <enablement>
+            <instanceof value="org.eclipse.cdt.internal.ui.buildconsole.BuildConsole"/>
+         </enablement>
+      </consolePageParticipant>
+   </extension>
    <extension
    		 point="org.eclipse.ui.contexts">
    	   <context

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsole.java

@@ -9,6 +9,7 @@
  * QNX Software Systems - Initial API and implementation
  * Red Hat Inc. - Multiple build console support
  * Dmitry Kozlov (CodeSourcery) - Build error highlighting and navigation
+ * Alex Collins (Broadcom Corp.) - Global build console
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.buildconsole;
 
@@ -35,8 +36,11 @@ public class BuildConsole extends AbstractConsole {
 	 */
 	public static final String P_STREAM_COLOR = CUIPlugin.PLUGIN_ID  + ".CONSOLE_P_STREAM_COLOR";	 //$NON-NLS-1$
 
-	private static BuildConsolePage fBuildConsolePage;
+	/** The page containing this build console */
-	
+	private BuildConsolePage fBuildConsolePage;
+	/** The page for the console currently being displayed by the UI */
+	private static BuildConsolePage fCurrentBuildConsolePage;
+
 	private IBuildConsoleManager fConsoleManager;
 	private String fConsoleName;
 	private String fConsoleId;
@@ -51,13 +55,22 @@ public class BuildConsole extends AbstractConsole {
 
 	public IPageBookViewPage createPage(IConsoleView view) {
 		fBuildConsolePage = new BuildConsolePage(view, this, fConsoleId); 
+		fCurrentBuildConsolePage = fBuildConsolePage;
 		return fBuildConsolePage;
 	}
 	
-	static BuildConsolePage getPage() {
+	BuildConsolePage getPage() {
 		return fBuildConsolePage;
 	}
 
+	static BuildConsolePage getCurrentPage() {
+		return fCurrentBuildConsolePage;
+	}
+
+	static void setCurrentPage(BuildConsolePage page) {
+		fCurrentBuildConsolePage = page;
+	}
+
 	public void setTitle(IProject project) {
 		String title = fConsoleName;
 		if (project != null) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleManager.java

@@ -9,6 +9,7 @@
  *     QNX Software Systems - initial API and implementation
  *     Red Hat Inc. - multiple build console support
  *     Dmitry Kozlov (CodeSourcery) - Build error highlighting and navigation
+ *     Alex Collins (Broadcom Corp.) - Global build console
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.buildconsole;
 
@@ -28,6 +29,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.ListenerList;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.preference.PreferenceConverter;
 import org.eclipse.jface.text.IDocument;
@@ -45,6 +47,7 @@ import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.console.ConsolePlugin;
 import org.eclipse.ui.console.IConsoleConstants;
 import org.eclipse.ui.console.IConsoleView;
+import org.eclipse.ui.preferences.ScopedPreferenceStore;
 import org.osgi.service.prefs.Preferences;
 
 import org.eclipse.cdt.core.resources.IConsole;
@@ -60,12 +63,22 @@ import org.eclipse.cdt.internal.ui.preferences.BuildConsolePreferencePage;
 public class BuildConsoleManager implements IBuildConsoleManager, IResourceChangeListener, IPropertyChangeListener {
 	private static final String QUALIFIER = CUIPlugin.PLUGIN_ID;
 	private static final String BUILD_CONSOLE_NODE = "buildConsole"; //$NON-NLS-1$
+	private static final String GLOBAL_BUILD_CONSOLE_NODE = "globalBuildConsole"; //$NON-NLS-1$
 	public static final String KEY_KEEP_LOG = "keepLog"; //$NON-NLS-1$
 	public static final String KEY_LOG_LOCATION = "logLocation"; //$NON-NLS-1$
 	public static final boolean CONSOLE_KEEP_LOG_DEFAULT = true;
+	private static final String GLOBAL_LOG_FILE = "global-build.log"; //$NON-NLS-1$
+	private static final String PROJECT_LOG_EXT = ".build.log"; //$NON-NLS-1$
 
 	private ListenerList listeners = new ListenerList();
+	/** UI console object in which per-project consoles are shown */
 	private BuildConsole fConsole;
+	/**
+	 * UI console object in which the global console is shown (a concatenation of all the
+	 * per project consoles)
+	 */
+	private BuildConsole fGlobalConsole;
+	private BuildConsolePartitioner fGlobalConsolePartitioner;
 	private Map<IProject, BuildConsolePartitioner> fConsoleMap = new HashMap<IProject, BuildConsolePartitioner>();
 	private Color infoColor;
 	private Color outputColor;
@@ -132,7 +145,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 
 	/**
 	 * Opens the console view. If the view is already open, it is brought to the
-	 * front.
+	 * front. The console that is shown is the console that was last on top.
 	 */
 	protected void showConsole() {
 		IWorkbenchWindow window = CUIPlugin.getActiveWorkbenchWindow();
@@ -157,7 +170,10 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 					}
 				}
 				if (consoleView instanceof IConsoleView) {
-					((IConsoleView)consoleView).display(fConsole);
+					if (BuildConsole.getCurrentPage() == null)
+						((IConsoleView)consoleView).display(fGlobalConsole);
+					else
+						((IConsoleView)consoleView).display(BuildConsole.getCurrentPage().getConsole());
 				}
 			}
 		}
@@ -209,7 +225,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 			problemInfoBackgroundColor.dispose();
 			problemHighlightedColor.dispose();
 		}
-		ConsolePlugin.getDefault().getConsoleManager().removeConsoles(new org.eclipse.ui.console.IConsole[]{fConsole});
+		ConsolePlugin.getDefault().getConsoleManager().removeConsoles(new org.eclipse.ui.console.IConsole[]{fGlobalConsole, fConsole});
 		CUIPlugin.getWorkspace().removeResourceChangeListener(this);
 		CUIPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(this);
 	}
@@ -241,8 +257,9 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 			 */
 			public void run() {
 				// install colors
+				fGlobalConsole = new GlobalBuildConsole(BuildConsoleManager.this, fName, null);
 				fConsole = new BuildConsole(BuildConsoleManager.this, fName, fContextMenuId);
-				ConsolePlugin.getDefault().getConsoleManager().addConsoles(new org.eclipse.ui.console.IConsole[]{fConsole});
+				ConsolePlugin.getDefault().getConsoleManager().addConsoles(new org.eclipse.ui.console.IConsole[]{fGlobalConsole, fConsole});
 				infoStream.setConsole(fConsole);
 				infoColor = createColor(CUIPlugin.getStandardDisplay(), BuildConsolePreferencePage.PREF_BUILDCONSOLE_INFO_COLOR);
 				infoStream.setColor(infoColor);
@@ -254,6 +271,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 				errorStream.setColor(errorColor);
 				backgroundColor = createBackgroundColor(CUIPlugin.getStandardDisplay(), BuildConsolePreferencePage.PREF_BUILDCONSOLE_BACKGROUND_COLOR);
 				fConsole.setBackground(backgroundColor);
+				fGlobalConsole.setBackground(backgroundColor);
 				problemHighlightedColor = createColor(CUIPlugin.getStandardDisplay(), BuildConsolePreferencePage.PREF_BUILDCONSOLE_PROBLEM_HIGHLIGHTED_COLOR);
 				problemErrorBackgroundColor = createBackgroundColor(CUIPlugin.getStandardDisplay(), BuildConsolePreferencePage.PREF_BUILDCONSOLE_PROBLEM_BACKGROUND_COLOR);
 				problemWarningBackgroundColor = createBackgroundColor(CUIPlugin.getStandardDisplay(), BuildConsolePreferencePage.PREF_BUILDCONSOLE_PROBLEM_WARNING_BACKGROUND_COLOR);
@@ -290,6 +308,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 		} else if (property.equals(BuildConsolePreferencePage.PREF_BUILDCONSOLE_BACKGROUND_COLOR)) {
 			Color newColor = createBackgroundColor(CUIPlugin.getStandardDisplay(), BuildConsolePreferencePage.PREF_BUILDCONSOLE_BACKGROUND_COLOR);
 			fConsole.setBackground(newColor);
+			fGlobalConsole.setBackground(newColor);
 			backgroundColor.dispose();
 			backgroundColor = newColor;
 		} else if (property.equals(BuildConsolePreferencePage.PREF_BUILDCONSOLE_PROBLEM_HIGHLIGHTED_COLOR)) {
@@ -316,7 +335,7 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 	}
 
 	private void redrawTextViewer() {
-		final BuildConsolePage p = BuildConsole.getPage(); 
+		final BuildConsolePage p = BuildConsole.getCurrentPage();
 		if ( p == null ) return;
 		final BuildConsoleViewer v = p.getViewer();
 		if ( v  == null ) return;		
@@ -367,9 +386,23 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 	 * Returns the console for the project, or <code>null</code> if none.
 	 */
 	public IConsole getConsole(IProject project) {
+		return new MultiBuildConsoleAdapter(getProjectConsole(project), getGlobalConsole());
+	}
+
+	/**
+	 * @return the console for the specified project
+	 */
+	public IConsole getProjectConsole(IProject project) {
 		Assert.isNotNull(project);
 		fLastProject = project;
-		return getConsolePartioner(project).getConsole();
+		return getProjectConsolePartioner(project).getConsole();
+	}
+
+	/**
+	 * @return the global build console
+	 */
+	public IConsole getGlobalConsole() {
+		return getGlobalConsolePartitioner().getConsole();
 	}
 
 	/*
@@ -380,23 +413,57 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 	public IProject getLastBuiltProject() {
 		return fLastProject;
 	}
-	
+
-	private BuildConsolePartitioner getConsolePartioner(IProject project) {
+	/**
-		BuildConsolePartitioner partioner = fConsoleMap.get(project);
+	 * @return the partitioner for the specified projects build console
-		if (partioner == null) {
+	 */
-			partioner = new BuildConsolePartitioner(project, this);
+	private BuildConsolePartitioner getProjectConsolePartioner(IProject project) {
-			fConsoleMap.put(project, partioner);
+		BuildConsolePartitioner partitioner = fConsoleMap.get(project);
+		if (partitioner == null) {
+			partitioner = new BuildConsolePartitioner(project, this);
+			fConsoleMap.put(project, partitioner);
 		}
-		return partioner;
+		return partitioner;
 	}
 
 	/**
-	 * Returns the document for the projects console, or <code>null</code> if
+	 * @return the partitioner for the global build console
-	 * none.
+	 */
+	private BuildConsolePartitioner getGlobalConsolePartitioner() {
+		if (fGlobalConsolePartitioner == null)
+			fGlobalConsolePartitioner = new BuildConsolePartitioner(this);
+		return fGlobalConsolePartitioner;
+	}
+
+	/**
+	 * Start the global console; called at the start of the build.
+	 * Clears the contents of the console and sets up the log output stream.
+	 */
+	public void startGlobalConsole() {
+		if (BuildConsolePreferencePage.isClearBuildConsole())
+			getGlobalConsolePartitioner().appendToDocument("", null, null); //$NON-NLS-1$
+		getGlobalConsolePartitioner().setStreamOpened();
+	}
+
+	public void stopGlobalConsole() {
+		// Doesn't do anything currently. This would be a cleaner place to close the global console
+		// log, but there is nowhere in CDT that can invoke it at the end of the entire build.
+		// Instead, the log is repeatedly closed and opened for append by each project build.
+	}
+
+	/**
+	 * @return the document backing the build console for the specified project
 	 */
 	public IDocument getConsoleDocument(IProject project) {
 		Assert.isNotNull(project);
-		return getConsolePartioner(project).getDocument();
+		return getProjectConsolePartioner(project).getDocument();
+	}
+
+	/**
+	 * @return the document backing the global build console
+	 */
+	public IDocument getGlobalConsoleDocument() {
+		return getGlobalConsolePartitioner().getDocument();
 	}
 
 	public void addConsoleListener(IBuildConsoleListener listener) {
@@ -408,19 +475,34 @@ public class BuildConsoleManager implements IBuildConsoleManager, IResourceChang
 	}
 
 	/**
-	 * @return logging preferences for a given project. 
+	 * @return logging preferences for a given project or for the workspace.
-	 * @param project to get logging preferences for.
+	 * @param project to get logging preferences for; or null for the workspace.
 	 */
 	public static Preferences getBuildLogPreferences(IProject project) {
-		return new LocalProjectScope(project).getNode(QUALIFIER).node(BUILD_CONSOLE_NODE);
+		if (project == null)
+			return new InstanceScope().getNode(QUALIFIER).node(GLOBAL_BUILD_CONSOLE_NODE);
+		else
+			return new LocalProjectScope(project).getNode(QUALIFIER).node(BUILD_CONSOLE_NODE);
 	}
 
 	/**
-	 * @return default location of logs for a project.
+	 * @return logging preference store for a given project; or for the workspace.
-	 * @param project to get default log location for.
+	 * @param project to get logging preferences for; or null for the workspace.
+	 */
+	public static IPreferenceStore getBuildLogPreferenceStore(IProject project) {
+		if (project == null)
+			return new ScopedPreferenceStore(new InstanceScope(), QUALIFIER + "/" + GLOBAL_BUILD_CONSOLE_NODE); //$NON-NLS-1$
+		else
+			return new ScopedPreferenceStore(new LocalProjectScope(project), QUALIFIER + "/" + BUILD_CONSOLE_NODE); //$NON-NLS-1$
+	}
+
+	/**
+	 * @return default location of logs for a project or for the workspace.
+	 * @param project to get default log location for; or null for the workspace.
 	 */
 	public static String getDefaultConsoleLogLocation(IProject project) {
-		IPath defaultLogLocation = CUIPlugin.getDefault().getStateLocation().append(project.getName()+".build.log"); //$NON-NLS-1$
+		String name = project == null ? GLOBAL_LOG_FILE : project.getName() + PROJECT_LOG_EXT;
+		IPath defaultLogLocation = CUIPlugin.getDefault().getStateLocation().append(name);
 		return defaultLogLocation.toOSString();
 	}
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePage.java

@@ -10,6 +10,7 @@
  *     Red Hat Inc. - multiple build console support
  *     Dmitry Kozlov (CodeSourcery) - Build error highlighting and navigation
  *                                    Save build output
+ *     Alex Collins (Broadcom Corp.) - Global build console
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.buildconsole;
 
@@ -162,11 +163,21 @@ public class BuildConsolePage extends Page
 		IProject project = getProject();
 		if (project != null) {
 			IBuildConsoleManager consoleManager = getConsole().getConsoleManager();
-			getViewer().setDocument(consoleManager.getConsoleDocument(project));
+			IDocument document;
-			IConsole console = consoleManager.getConsole(project);
+			IConsole console;
-			if ( console instanceof BuildConsolePartitioner) {
+			if (getConsole() instanceof GlobalBuildConsole) {
+				document = consoleManager.getGlobalConsoleDocument();
+				console = consoleManager.getGlobalConsole();
+			} else {
+				document = consoleManager.getConsoleDocument(project);
+				console = consoleManager.getProjectConsole(project);
+			}
+			getViewer().setDocument(document);
+			if (console instanceof BuildConsolePartitioner) {
 				BuildConsolePartitioner par = (BuildConsolePartitioner)console;
-				showError(par, fShowErrorAction.isChecked() );
+				// Show the error, but don't show it in the editor if we are viewing the global console.
+				// Prevents showing errors in the editor for projects other than the current project.
+				showError(par, fShowErrorAction.isChecked() && !(getConsole() instanceof GlobalBuildConsole));
 			}
 		}
 		return null;
@@ -548,17 +559,27 @@ public class BuildConsolePage extends Page
 		}
 	}
 
+	/**
+	 * Get the current CDT IConsole being displayed on the page
+	 */
+	private IConsole getCurrentConsole() {
+		BuildConsoleManager consoleManager = (BuildConsoleManager)CUIPlugin.getDefault().getConsoleManager();
+		if (getConsole() instanceof GlobalBuildConsole)
+			return consoleManager.getGlobalConsole();
+		else if (getProject() == null)
+			return null;
+		else
+			return consoleManager.getProjectConsole(getProject());
+	}
+
 	/**
 	 * Highlight next/previous error or error by console offset
 	 * @param position POSITION_NEXT (-1), POSITION_PREV (-2), or offset
 	 */
 	void moveToError(int position) {
-		IProject project = getProject();
+		IConsole console = getCurrentConsole();
-		if (project == null) return;
+		if (console == null) return;
-		
+		if (console instanceof BuildConsolePartitioner) {
-		IBuildConsoleManager consoleManager = CUIPlugin.getDefault().getConsoleManager();
-		IConsole console = consoleManager.getConsole(project);
-		if ( console instanceof BuildConsolePartitioner) {
 			BuildConsolePartitioner par = (BuildConsolePartitioner)console;
 			// Move to specified line in the model (BuildConsolePartitioner)
 			if ( position == POSITION_NEXT ) {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePageParticipant.java

@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Broadcom 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alex Collins (Broadcom Corp.) - Initial implementation
+ *******************************************************************************/
+package org.eclipse.cdt.internal.ui.buildconsole;
+
+import org.eclipse.ui.console.IConsole;
+import org.eclipse.ui.console.IConsolePageParticipant;
+import org.eclipse.ui.part.IPageBookViewPage;
+
+/**
+ * Attached to extension point org.eclipse.ui.console.consolePageParticipants to notify
+ * BuildConsole that a new page has become visible.
+ */
+public class BuildConsolePageParticipant implements IConsolePageParticipant {
+	private BuildConsole console;
+
+	public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) {
+		return null;
+	}
+
+	public void init(IPageBookViewPage page, IConsole console) {
+		this.console = (BuildConsole)console;
+	}
+
+	public void dispose() {
+	}
+
+	public void activated() {
+		BuildConsole.setCurrentPage(console.getPage());
+	}
+
+	public void deactivated() {
+	}
+}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartitioner.java

@@ -9,6 +9,7 @@
  *     QNX Software Systems - initial API and implementation
  *     Dmitry Kozlov (CodeSourcery) - Build error highlighting and navigation
  *     Andrew Gvozdev (Quoin Inc.)  - Copy build log (bug 306222)
+ *     Alex Collins (Broadcom Corp.) - Global console
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.buildconsole;
 
@@ -90,6 +91,7 @@ public class BuildConsolePartitioner
 		static public final int EVENT_APPEND = 0;
 		static public final int EVENT_OPEN_LOG = 1;
 		static public final int EVENT_CLOSE_LOG = 2;
+		static public final int EVENT_OPEN_APPEND_LOG = 3;
 
 		/** Identifier of the stream written to. */
 		private BuildConsoleStreamDecorator fStream;
@@ -157,6 +159,13 @@ public class BuildConsolePartitioner
 
 	}
 
+	/**
+	 * Construct a partitioner that is not associated with a specific project
+	 */
+	public BuildConsolePartitioner(BuildConsoleManager manager) {
+		this(null, manager);
+	}
+
 	public BuildConsolePartitioner(IProject project, BuildConsoleManager manager) {
 		fProject = project;
 		fManager = manager;
@@ -179,6 +188,16 @@ public class BuildConsolePartitioner
 		asyncProcessQueue();
 	}
 
+	/**
+	 * Open the stream for appending. Must be called after a call to setStreamOpened().
+	 * Can be used to reopen a stream for writing after it has been closed, without
+	 * emptying the log file.
+	 */
+	public void setStreamAppend() {
+		fQueue.add(new StreamEntry(StreamEntry.EVENT_OPEN_APPEND_LOG));
+		asyncProcessQueue();
+	}
+
 	/**
 	 * Sets the indicator that stream was closed so logging should be stopped. Should be called when
 	 * build process has finished. Note that there could still be unprocessed console
@@ -240,7 +259,7 @@ public class BuildConsolePartitioner
 
 	/**
 	 * Asynchronous processing of stream entries to append to console.
-	 * Note that all these are processed by the same by the user-interface thread
+	 * Note that all these are processed by the same thread - the user-interface thread
 	 * as of {@link Display#asyncExec(Runnable)}.
 	 */
 	private void asyncProcessQueue() {
@@ -254,7 +273,8 @@ public class BuildConsolePartitioner
 				}
 				switch (entry.getEventType()) {
 				case StreamEntry.EVENT_OPEN_LOG:
-					logOpen();
+				case StreamEntry.EVENT_OPEN_APPEND_LOG:
+					logOpen(entry.getEventType() == StreamEntry.EVENT_OPEN_APPEND_LOG);
 					break;
 				case StreamEntry.EVENT_APPEND:
 					fLastStream = entry.getStream();
@@ -267,9 +287,12 @@ public class BuildConsolePartitioner
 							fDocumentMarkerManager.clear();
 							fDocument.set(""); //$NON-NLS-1$
 						}
-						addStreamEntryToDocument(entry);
+						String text = entry.getText();
-						log(entry.getText());
+						if (text.length()>0) {
-						checkOverflow();
+							addStreamEntryToDocument(entry);
+							log(text);
+							checkOverflow();
+						}
 					} catch (BadLocationException e) {
 					}
 					break;
@@ -278,12 +301,22 @@ public class BuildConsolePartitioner
 					break;
 				}
 			}
-			private void logOpen() {
+
+			/**
+			 * Open the log
+			 * @param append Set to true if the log should be opened for appending, false for overwriting.
+			 */
+			private void logOpen(boolean append) {
 				fLogURI = getLogURI(fProject);
 				if (fLogURI!=null) {
 					try {
 						IFileStore logStore = EFS.getStore(fLogURI);
-						fLogStream = logStore.openOutputStream(EFS.NONE, null);
+						// Ensure the directory exists before opening the file
+						IFileStore dir = logStore.getParent();
+						if (dir != null)
+							dir.mkdir(EFS.NONE, null);
+						int opts = append ? EFS.APPEND : EFS.NONE;
+						fLogStream = logStore.openOutputStream(opts, null);
 					} catch (CoreException e) {
 						CUIPlugin.log(e);
 					} finally {
@@ -557,13 +590,13 @@ public class BuildConsolePartitioner
 		if (display != null) {
 			display.asyncExec(new Runnable() {
 				public void run() {
+					fLogStream = null;
+					fLogURI = null;
 					fManager.startConsoleActivity(project);
 				}
 			});
 		}
 
-		fLogURI = null;
-		fLogStream = null;
 
 		if (BuildConsolePreferencePage.isClearBuildConsole()) {
 			appendToDocument("", null, null); //$NON-NLS-1$
@@ -620,4 +653,8 @@ public class BuildConsolePartitioner
 	public URI getLogURI() {
 		return fLogURI;
 	}
+
+	IProject getProject() {
+		return fProject;
+	}
 }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java

@@ -239,7 +239,7 @@ public class BuildConsoleViewer extends TextViewer
 		try {
 			Point p = new Point(e.x, e.y);
 			offset = getTextWidget().getOffsetAtLocation(p);
-			BuildConsole.getPage().moveToError(offset);
+			BuildConsole.getCurrentPage().moveToError(offset);
 		} catch (IllegalArgumentException ex) {
 		}
 	}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildOutputStream.java

@@ -8,6 +8,7 @@
  * Contributors:
  *     QNX Software Systems - initial API and implementation
  *     Dmitry Kozlov (CodeSourcery) - Build error highlighting and navigation
+ *     Alex Collins (Broadcom Corp.) - Global build console
  *******************************************************************************/
 
 package org.eclipse.cdt.internal.ui.buildconsole;
@@ -31,7 +32,12 @@ public class BuildOutputStream extends ConsoleOutputStream implements IErrorMark
 	public BuildOutputStream(BuildConsolePartitioner partitioner, 
 			BuildConsoleStreamDecorator stream) {
 		fPartitioner = partitioner;
-		fPartitioner.setStreamOpened();
+		if (fPartitioner.getProject() == null)
+			// Note: The global console log stream should have been
+			// opened by BuildConsoleManager.startGlobalConsole()
+			fPartitioner.setStreamAppend();
+		else
+			fPartitioner.setStreamOpened();
 		fStream = stream;
 	}
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.java

@@ -22,6 +22,7 @@ public final class ConsoleMessages extends NLS {
 		// Do not instantiate
 	}
 
+	public static String BuildConsole_GlobalConsole;
 	public static String find_replace_action_label;
 	public static String find_replace_action_tooltip;
 	public static String find_replace_action_image;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ConsoleMessages.properties

@@ -10,6 +10,8 @@
 # IBM Corporation
 ###############################################################################
 
+BuildConsole_GlobalConsole=CDT Global Build Console
+
 find_replace_action_label=&Find/Replace...@Ctrl+F
 find_replace_action_tooltip=Find/Replace
 find_replace_action_image=

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/CopyBuildLogAction.java

@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Andrew Gvozdev (Quoin Inc.) - Initial API and implementation
+ *     Alex Collins (Broadcom Corp.) - Global console
  *******************************************************************************/
 
 package org.eclipse.cdt.internal.ui.buildconsole;
@@ -46,13 +47,17 @@ public class CopyBuildLogAction extends Action {
 
 	@Override
 	public void run() {
-		IProject project = fConsolePage.getProject();
-		if (project == null || !project.isAccessible())
-			return;
-
 		IBuildConsoleManager consoleManager = CUIPlugin.getDefault().getConsoleManager();
+		IConsole console;
+		if (fConsolePage.getConsole() instanceof GlobalBuildConsole)
+			console = consoleManager.getGlobalConsole();
+		else {
+			IProject project = fConsolePage.getProject();
+			if (project == null || !project.isAccessible())
+				return;
+			console = consoleManager.getProjectConsole(project);
+		}
 
-		IConsole console = consoleManager.getConsole(project);
 		if (console instanceof BuildConsolePartitioner) {
 			Shell shell = Display.getCurrent().getActiveShell();
 			URI srcURI = ((BuildConsolePartitioner)console).getLogURI();

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/GlobalBuildConsole.java

@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Broadcom 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alex Collins (Broadcom Corp.)
+ *******************************************************************************/
+package org.eclipse.cdt.internal.ui.buildconsole;
+
+import org.eclipse.cdt.ui.IBuildConsoleManager;
+import org.eclipse.core.resources.IProject;
+
+/**
+ * Customised BuildConsole for the global console that displays its title differently
+ */
+public class GlobalBuildConsole extends BuildConsole {
+	public GlobalBuildConsole(IBuildConsoleManager manager, String name, String id) {
+		super(manager, name, id);
+		setName(ConsoleMessages.BuildConsole_GlobalConsole);
+	}
+
+	@Override
+	public void setTitle(IProject project) {
+	}
+}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/MultiBuildConsoleAdapter.java

@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Broadcom 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alex Collins (Broadcom Corp.)
+ *******************************************************************************/
+package org.eclipse.cdt.internal.ui.buildconsole;
+
+import java.io.IOException;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+
+import org.eclipse.cdt.core.ConsoleOutputStream;
+import org.eclipse.cdt.core.ProblemMarkerInfo;
+import org.eclipse.cdt.core.resources.IConsole;
+
+import org.eclipse.cdt.internal.core.IErrorMarkeredOutputStream;
+
+/**
+ * Adapter that wraps a project console and the global console to allow builders
+ * to send their build output to a single IConsole object
+ */
+class MultiBuildConsoleAdapter implements IConsole {
+
+	private final IConsole fProjectConsole;
+	private final IConsole fGlobalConsole;
+
+	private static class BuildOutputStreamAdapter extends ConsoleOutputStream implements IErrorMarkeredOutputStream	{
+		private final BuildOutputStream one;
+		private final BuildOutputStream two;
+
+		public BuildOutputStreamAdapter(BuildOutputStream one, BuildOutputStream two) {
+			this.one = one;
+			this.two = two;
+		}
+
+		@Override
+		public synchronized String readBuffer() {
+			return one.readBuffer();
+		}
+
+		@Override
+		public synchronized void write(int c) throws IOException {
+			one.write(c);
+			two.write(c);
+		}
+
+	    @Override
+		public synchronized void write(byte[] b, int off, int len) throws IOException {
+			one.write(b, off, len);
+			two.write(b, off, len);
+	    }
+
+		public void write(String s, ProblemMarkerInfo marker) throws IOException {
+			one.write(s, marker);
+			two.write(s, marker);
+		}
+
+		@Override
+		public void close() throws IOException {
+			one.flush();
+			two.flush();
+			one.close();
+			two.close();
+		}
+
+	}
+
+	public MultiBuildConsoleAdapter(IConsole projectConsole, IConsole globalConsole) {
+		fProjectConsole = projectConsole;
+		fGlobalConsole = globalConsole;
+	}
+
+	public void start(IProject project) {
+		fProjectConsole.start(project);
+	}
+
+	public ConsoleOutputStream getOutputStream() throws CoreException {
+		return new BuildOutputStreamAdapter((BuildOutputStream)fProjectConsole.getOutputStream(), (BuildOutputStream)fGlobalConsole.getOutputStream());
+	}
+
+	public ConsoleOutputStream getInfoStream() throws CoreException {
+		return new BuildOutputStreamAdapter((BuildOutputStream)fProjectConsole.getInfoStream(), (BuildOutputStream)fGlobalConsole.getInfoStream());
+	}
+
+	public ConsoleOutputStream getErrorStream() throws CoreException {
+		return new BuildOutputStreamAdapter((BuildOutputStream)fProjectConsole.getErrorStream(), (BuildOutputStream)fGlobalConsole.getErrorStream());
+	}
+
+}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/ShowErrorAction.java

@@ -7,6 +7,7 @@
  *
  * Contributors:
  * Dmitry Kozlov (CodeSourcery) - Initial API and implementation
+ * Alex Collins (Broadcom Corp.)
  *******************************************************************************/
 
 package org.eclipse.cdt.internal.ui.buildconsole;
@@ -43,15 +44,19 @@ public class ShowErrorAction extends Action {
 	@Override
 	public void run() {
 		super.run();
-		if ( isChecked() ) {
+		if (isChecked()) {
-			IProject project = fConsolePage.getProject();
-			if (project == null) return;
-			
 			IBuildConsoleManager consoleManager = CUIPlugin.getDefault().getConsoleManager();
-			IConsole console = consoleManager.getConsole(project);
+			IProject project = fConsolePage.getProject();
-			if ( console instanceof BuildConsolePartitioner) {
+			IConsole console;
+			if (fConsolePage.getConsole() instanceof GlobalBuildConsole)
+				console = consoleManager.getGlobalConsole();
+			else if (project == null)
+				return;
+			else
+				console = consoleManager.getProjectConsole(project);
+			if (console instanceof BuildConsolePartitioner) {
 				BuildConsolePartitioner par = (BuildConsolePartitioner)console;
-				fConsolePage.showError(par, true );
+				fConsolePage.showError(par, true);
 			}
 		}
 	}	

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/BuildGroup.java

@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Alex Collins (Broadcom Corp.)
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.cview;
 
@@ -40,6 +41,8 @@ import org.eclipse.ui.actions.BuildAction;
 import org.eclipse.ui.ide.IDEActionFactory;
 import org.eclipse.ui.ide.ResourceUtil;
 
+import org.eclipse.cdt.ui.CUIPlugin;
+
 /**
  * This is the action group for workspace actions such as Build
  */
@@ -76,6 +79,9 @@ public class BuildGroup extends CViewActionGroup {
 	    	}
 	    	saveEditors(prjs);
 
+			// Clear the build console, and open a stream
+			CUIPlugin.getDefault().getConsoleManager().startGlobalConsole();
+
 	    	// Now delegate to the parent
 	    	super.run();
 	    }

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/BuildLogPreferencePage.java

@@ -61,6 +61,7 @@ public class BuildLogPreferencePage extends PropertyPage implements ICOptionCont
 
 			// [v] Enable Logging
 			enableLoggingCheckbox = ControlFactory.createCheckBox(contents, PreferencesMessages.BuildLogPreferencePage_EnableLogging);
+			((GridData) enableLoggingCheckbox.getLayoutData()).horizontalSpan = 2;
 			boolean keepLog = prefs.getBoolean(BuildConsoleManager.KEY_KEEP_LOG, BuildConsoleManager.CONSOLE_KEEP_LOG_DEFAULT);
 			enableLoggingCheckbox.setSelection(keepLog);
 			enableLoggingCheckbox.addSelectionListener(new SelectionAdapter() {

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/GlobalBuildLogPreferencePage.java

@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Broadcom 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
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alex Collins (Broadcom Corp.) - Initial implementation
+ *******************************************************************************/
+package org.eclipse.cdt.internal.ui.preferences;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.preference.BooleanFieldEditor;
+import org.eclipse.jface.preference.FieldEditorPreferencePage;
+import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.preference.StringButtonFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+import org.eclipse.cdt.internal.ui.buildconsole.BuildConsoleManager;
+
+/**
+ * Preference page for build logging options, such as whether the
+ * global build console should be logged and, if so, where.
+ */
+public class GlobalBuildLogPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
+	public GlobalBuildLogPreferencePage() {
+		 super(GRID);
+		 setPreferenceStore(BuildConsoleManager.getBuildLogPreferenceStore(null));
+	}
+
+	/**
+	 * A file path field with choose button that does not require the chosen file to exist.
+	 */
+	static private class FilePathEditor extends StringButtonFieldEditor {
+		public FilePathEditor(String name, String label, Composite parent) {
+			super(name, label, parent);
+		}
+
+		@Override
+		protected String changePressed() {
+			FileDialog dialog = new FileDialog(getShell(), SWT.NONE);
+			dialog.setText(getLabelText());
+			String fileName = super.oldValue;
+			IPath logFolder = new Path(fileName).removeLastSegments(1);
+			dialog.setFilterPath(logFolder.toOSString());
+			return dialog.open();
+		}
+	}
+
+	@Override
+	protected void createFieldEditors() {
+		 Composite parent = getFieldEditorParent();
+		 BooleanFieldEditor keepLog = new BooleanFieldEditor(BuildConsoleManager.KEY_KEEP_LOG,
+				   PreferencesMessages.GlobalBuildLogPreferencePage_EnableLogging, parent);
+		 addField(keepLog);
+		 FilePathEditor logLocation = new FilePathEditor(BuildConsoleManager.KEY_LOG_LOCATION,
+				   PreferencesMessages.GlobalBuildLogPreferencePage_LogLocation, parent);
+		 addField(logLocation);
+	}
+
+	public void init(IWorkbench workbench) {
+		 initDefaults(BuildConsoleManager.getBuildLogPreferenceStore(null));
+	}
+
+	public static void initDefaults(IPreferenceStore prefs) {
+		 prefs.setDefault(BuildConsoleManager.KEY_KEEP_LOG, BuildConsoleManager.CONSOLE_KEEP_LOG_DEFAULT);
+		 prefs.setDefault(BuildConsoleManager.KEY_LOG_LOCATION, BuildConsoleManager.getDefaultConsoleLogLocation(null));
+	}
+}

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.java

@@ -149,6 +149,8 @@ public final class PreferencesMessages extends NLS {
 	public static String BuildLogPreferencePage_ChooseLogFile;
 	public static String BuildLogPreferencePage_EnableLogging;
 	public static String BuildLogPreferencePage_LogLocation;
+	public static String GlobalBuildLogPreferencePage_EnableLogging;
+	public static String GlobalBuildLogPreferencePage_LogLocation;
 	public static String CEditorPreferencePage_folding_title;
 	public static String FoldingConfigurationBlock_enable;
 	public static String FoldingConfigurationBlock_combo_caption;

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/PreferencesMessages.properties

@@ -171,6 +171,10 @@ BuildLogPreferencePage_ChooseLogFile=Choose Log File
 BuildLogPreferencePage_EnableLogging=Enable build &logging
 BuildLogPreferencePage_LogLocation=Log &file location:
 
+#Global build logging
+GlobalBuildLogPreferencePage_EnableLogging=Enable global build &logging
+GlobalBuildLogPreferencePage_LogLocation=Log &file location:
+
 #Folding
 CEditorPreferencePage_folding_title= &Folding
 

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/IBuildConsoleManager.java

@@ -7,6 +7,7 @@
  *
  * Contributors:
  * QNX Software Systems - Initial API and implementation
+ * Alex Collins (Broadcom Corp.) - Global console
  *******************************************************************************/
 package org.eclipse.cdt.ui;
 
@@ -18,9 +19,44 @@ import org.eclipse.jface.text.IDocument;
  * @noimplement This interface is not intended to be implemented by clients.
  */
 public interface IBuildConsoleManager {
+	/**
+	 * @return the console to which build output should be printed.
+	 *         This may be backed by two console documents: one for the Project
+	 *         and one Global
+	 */
 	IConsole getConsole(IProject project);
+	/**
+	 * @return the console associated with the specified project
+	 * @since 5.3
+	 */
+	IConsole getProjectConsole(IProject project);
+	/**
+	 * @return the global console
+	 * @since 5.3
+	 */
+	IConsole getGlobalConsole();
+	/**
+	 * @return the document backing the global console
+	 * @since 5.3
+	 */
+	IDocument getGlobalConsoleDocument();
+	/**
+	 * @param project
+	 * @return IDocument backing the console for the given project
+	 */
 	IDocument getConsoleDocument(IProject project);
 	IProject getLastBuiltProject();
 	void addConsoleListener(IBuildConsoleListener listener);
 	void removeConsoleListener(IBuildConsoleListener listener);
+
+	/**
+	 * Setup the the global console at the start of the build
+	 * @since 5.3
+	 */
+	void startGlobalConsole();
+	/**
+	 * Tear down the the global console at the start of the build
+	 * @since 5.3
+	 */
+	void stopGlobalConsole();
 }