Attachment 5394 Details for Bug 39713 – Patch file on ExternalToolBuilder.java

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch file on ExternalToolBuilder.java

external-build.diff (text/plain), 3.48 KB, created by John Arthorne

on 2003-07-08 11:03:45 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Arthorne

Created: 2003-07-08 11:03:45 EDT

Size: 3.48 KB

patch

obsolete

>Index: ExternalToolBuilder.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.externaltools/External Tools Base/org/eclipse/ui/externaltools/internal/model/ExternalToolBuilder.java,v
>retrieving revision 1.20
>diff -u -r1.20 ExternalToolBuilder.java
>--- ExternalToolBuilder.java	10 Jun 2003 21:29:14 -0000	1.20
>+++ ExternalToolBuilder.java	8 Jul 2003 14:56:13 -0000
>@@ -15,6 +15,7 @@
> import java.util.Map;
> import java.util.StringTokenizer;
> 
>+import org.eclipse.core.resources.*;
> import org.eclipse.core.resources.IProject;
> import org.eclipse.core.resources.IResource;
> import org.eclipse.core.resources.IResourceDelta;
>@@ -48,40 +49,45 @@
> 	 * Method declared on IncrementalProjectBuilder.
> 	 */
> 	protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
>-		ILaunchConfiguration config= ExternalToolsUtil.configFromBuildCommandArgs(args);
>-		if (config == null) {
>-			return null;
>-		}
>-		boolean runTool = false;
>-		int[] buildKinds = buildTypesToArray((String)config.getAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, "")); //$NON-NLS-1$
>-		for (int i = 0; i < buildKinds.length; i++) {
>-			if (kind == buildKinds[i]) {
>-				runTool = true;
>-				break;
>+		//need to build all external tools from one builder (see bug 39713)
>+		ICommand[] commands = getProject().getDescription().getBuildSpec();
>+		for (int i = 0; i < commands.length; i++) 
>+			if (ExternalToolBuilder.ID.equals(commands[i].getBuilderName()))
>+				doBuild(kind, commands[i].getArguments(), monitor);
>+		return null;
>+	}
>+		protected void doBuild(int kind, Map args, IProgressMonitor monitor) throws CoreException {
>+			ILaunchConfiguration config = ExternalToolsUtil.configFromBuildCommandArgs(args);
>+			if (config == null) {
>+				return;
> 			}
>-		}
>-		if (!runTool) {
>-			return null;
>-		}
>-		
>-		boolean buildForChange= true;
>-		if (kind != FULL_BUILD) {
>-			IResource[] resources= ExternalToolsUtil.getResourcesForBuildScope(config, monitor);
>-			if (resources != null && resources.length > 0) {
>-				buildForChange= buildScopeIndicatesBuild(resources);
>+			boolean runTool = false;
>+			int[] buildKinds = buildTypesToArray((String) config.getAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, "")); //$NON-NLS-1$
>+			for (int i = 0; i < buildKinds.length; i++) {
>+				if (kind == buildKinds[i]) {
>+					runTool = true;
>+					break;
>+				}
>+			}
>+			if (!runTool) {
>+				return;
>+			}
>+
>+			boolean buildForChange = true;
>+			if (kind != FULL_BUILD) {
>+				IResource[] resources = ExternalToolsUtil.getResourcesForBuildScope(config, monitor);
>+				if (resources != null && resources.length > 0) {
>+					buildForChange = buildScopeIndicatesBuild(resources);
>+				}
>+			}
>+
>+			if (buildForChange) {
>+				monitor.subTask(MessageFormat.format(ExternalToolsModelMessages.getString("ExternalToolBuilder.Running_{0}..._1"), new String[] { config.getName()})); //$NON-NLS-1$
>+				buildStarted(kind);
>+				config.launch(ILaunchManager.RUN_MODE, monitor);
>+				buildEnded();
> 			}
> 		}
>-		
>-		if (buildForChange) {
>-			monitor.subTask(MessageFormat.format(ExternalToolsModelMessages.getString("ExternalToolBuilder.Running_{0}..._1"), new String[]{config.getName()})); //$NON-NLS-1$
>-			buildStarted(kind);
>-			config.launch(ILaunchManager.RUN_MODE, monitor);
>-			buildEnded();
>-			forgetLastBuiltState();
>-		}
>-				
>-		return null;
>-	}
> 	
> 	/**
> 	 * Returns the build type being performed if the

Actions: View | Diff

Attachments on bug 39713: 5394