mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Bug 291751 Build project action causes referenced projects to be built twice.

Browse source
This commit is contained in:
James Blackburn 2009-10-09 12:08:51 +00:00
parent 16944a0de7
commit f9aa9d90d7
3 changed files with 54 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2008 IBM Corporation and others. * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -29,12 +29,33 @@ import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.actions.BuildAction; import org.eclipse.ui.actions.BuildAction;
import org.eclipse.ui.ide.IDEActionFactory; import org.eclipse.ui.ide.IDEActionFactory;
import org.eclipse.cdt.core.CCorePlugin;
/** /**
* This is the action group for workspace actions such as Build * This is the action group for workspace actions such as Build
*/ */
public class BuildGroup extends CViewActionGroup { public class BuildGroup extends CViewActionGroup {
private class RebuildAction extends BuildAction { /**
* An internal class which overrides the 'shouldPerformResourcePruning'
* method so that referenced projects aren't build twice
*/
public static class CDTBuildAction extends BuildAction {
public CDTBuildAction(IShellProvider shell, int kind) {
super(shell, kind);
}
@Override
protected boolean shouldPerformResourcePruning() {
// If the selected resources aren't new-style CDT projects, then
// fall-back to parent behaviour
for (Object res : getSelectedResources())
if (!(res instanceof IProject) || !CCorePlugin.getDefault().isNewStyleProject((IProject)res))
return super.shouldPerformResourcePruning();
return false;
}
}
private static class RebuildAction extends CDTBuildAction {
public RebuildAction(IShellProvider shell) { public RebuildAction(IShellProvider shell) {
super(shell, IncrementalProjectBuilder.FULL_BUILD); super(shell, IncrementalProjectBuilder.FULL_BUILD);
} }
@ -157,10 +178,10 @@ public class BuildGroup extends CViewActionGroup {
protected void makeActions() { protected void makeActions() {
final IWorkbenchPartSite site = getCView().getSite(); final IWorkbenchPartSite site = getCView().getSite();
buildAction = new BuildAction(site, IncrementalProjectBuilder.INCREMENTAL_BUILD); buildAction = new CDTBuildAction(site, IncrementalProjectBuilder.INCREMENTAL_BUILD);
buildAction.setText(CViewMessages.BuildAction_label); buildAction.setText(CViewMessages.BuildAction_label);
cleanAction = new BuildAction(site, IncrementalProjectBuilder.CLEAN_BUILD); cleanAction = new CDTBuildAction(site, IncrementalProjectBuilder.CLEAN_BUILD);
cleanAction.setText(CViewMessages.CleanAction_label); cleanAction.setText(CViewMessages.CleanAction_label);
rebuildAction = new RebuildAction(site); rebuildAction = new RebuildAction(site);

32
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/CNavigatorBuildActionGroup.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2008 IBM Corporation and others. * Copyright (c) 2000, 2009 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -19,15 +19,19 @@ import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.resources.IncrementalProjectBuilder;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable; import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.jface.action.ActionContributionItem;
import org.eclipse.jface.action.GroupMarker; import org.eclipse.jface.action.GroupMarker;
import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.IMenuManager; import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.action.Separator; import org.eclipse.jface.action.Separator;
import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IActionBars; import org.eclipse.ui.IActionBars;
import org.eclipse.ui.IViewPart; import org.eclipse.ui.IViewPart;
import org.eclipse.ui.actions.BuildAction; import org.eclipse.ui.actions.BuildAction;
import org.eclipse.ui.ide.IDEActionFactory;
import org.eclipse.ui.navigator.ICommonMenuConstants; import org.eclipse.ui.navigator.ICommonMenuConstants;
import org.eclipse.cdt.internal.ui.cview.BuildGroup;
import org.eclipse.cdt.internal.ui.cview.CViewMessages; import org.eclipse.cdt.internal.ui.cview.CViewMessages;
/** /**
@ -40,6 +44,7 @@ import org.eclipse.cdt.internal.ui.cview.CViewMessages;
*/ */
public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup { public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup {
private BuildAction fBuildAction;
private BuildAction fCleanAction; private BuildAction fCleanAction;
// Menu tags for the build // Menu tags for the build
@ -56,6 +61,9 @@ public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup {
@Override @Override
public void fillActionBars(IActionBars actionBars) { public void fillActionBars(IActionBars actionBars) {
// register a CDT Build project action which prevents projects with refs from being built twice
actionBars.setGlobalActionHandler(IDEActionFactory.BUILD_PROJECT.getId(), fBuildAction);
updateActionBars();
} }
/** /**
@ -67,7 +75,7 @@ public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup {
* <p> * <p>
* No disabled action should be on the context menu. * No disabled action should be on the context menu.
* </p> * </p>
* *
* @param menu * @param menu
* context menu to add actions to * context menu to add actions to
*/ */
@ -112,10 +120,18 @@ public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup {
if (!selection.isEmpty() && isProjectSelection && hasBuilder) { if (!selection.isEmpty() && isProjectSelection && hasBuilder) {
fCleanAction.selectionChanged(selection); fCleanAction.selectionChanged(selection);
if (fCleanAction.isEnabled()) { if (fCleanAction.isEnabled()) {
if (menu.find(BuildAction.ID_BUILD) != null) { IContributionItem oldBuild = menu.find(BuildAction.ID_BUILD);
if (oldBuild != null) {
menu.insertAfter(BuildAction.ID_BUILD, fCleanAction); menu.insertAfter(BuildAction.ID_BUILD, fCleanAction);
// Replace ResourceMgmtActionProvier's build action with our own
if (oldBuild instanceof ActionContributionItem &&
((ActionContributionItem)oldBuild).getAction() instanceof BuildAction) {
menu.remove(oldBuild);
menu.insertBefore(fCleanAction.getId(), fBuildAction);
}
} else { } else {
menu.insertAfter(ICommonMenuConstants.GROUP_BUILD, fCleanAction); menu.insertAfter(ICommonMenuConstants.GROUP_BUILD, fCleanAction);
menu.insertAfter(ICommonMenuConstants.GROUP_BUILD, fBuildAction);
} }
} }
} }
@ -125,7 +141,7 @@ public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup {
/** /**
* Returns whether there are builders configured on the given project. * Returns whether there are builders configured on the given project.
* *
* @return <code>true</code> if it has builders, <code>false</code> if * @return <code>true</code> if it has builders, <code>false</code> if
* not, or if this could not be determined * not, or if this could not be determined
*/ */
@ -142,11 +158,15 @@ public class CNavigatorBuildActionGroup extends AbstractCNavigatorActionGroup {
@Override @Override
protected void makeActions() { protected void makeActions() {
fCleanAction= new BuildAction(getViewPart().getSite(), IncrementalProjectBuilder.CLEAN_BUILD); fBuildAction = new BuildGroup.CDTBuildAction(getViewPart().getSite(), IncrementalProjectBuilder.INCREMENTAL_BUILD);
fCleanAction.setText(CViewMessages.CleanAction_label); fCleanAction= new BuildGroup.CDTBuildAction(getViewPart().getSite(), IncrementalProjectBuilder.CLEAN_BUILD);
fCleanAction.setText(CViewMessages.CleanAction_label);
} }
@Override @Override
public void updateActionBars() { public void updateActionBars() {
IStructuredSelection selection = (IStructuredSelection) getContext().getSelection();
fBuildAction.selectionChanged(selection);
fCleanAction.selectionChanged(selection);
} }
} }

5
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/actions/BuildActiveConfigMenuAction.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007, 2008 Nokia and others. * Copyright (c) 2007, 2009 Nokia and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -30,6 +30,7 @@ import org.eclipse.cdt.core.settings.model.ICProjectDescriptionListener;
import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager; import org.eclipse.cdt.core.settings.model.ICProjectDescriptionManager;
import org.eclipse.cdt.internal.ui.actions.ActionMessages; import org.eclipse.cdt.internal.ui.actions.ActionMessages;
import org.eclipse.cdt.internal.ui.cview.BuildGroup;
/** /**
* Implements a toolbar button that builds the active configuration * Implements a toolbar button that builds the active configuration
@ -73,7 +74,7 @@ public class BuildActiveConfigMenuAction extends ChangeBuildConfigActionBase
* @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
*/ */
public void init(IWorkbenchWindow window) { public void init(IWorkbenchWindow window) {
buildaction = new BuildAction(window, IncrementalProjectBuilder.INCREMENTAL_BUILD); buildaction = new BuildGroup.CDTBuildAction(window, IncrementalProjectBuilder.INCREMENTAL_BUILD);
ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager(); ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
mngr.addCProjectDescriptionListener(this, CProjectDescriptionEvent.DATA_APPLIED); mngr.addCProjectDescriptionListener(this, CProjectDescriptionEvent.DATA_APPLIED);
} }