Attachment 209428 Details for Bug 352131 – Proposed patch

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

[patch] Proposed patch

patch.txt (text/plain), 3.70 KB, created by Satyam Kandula

on 2012-01-13 01:26:31 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Satyam Kandula

Created: 2012-01-13 01:26:31 EST

Size: 3.70 KB

patch

obsolete

>diff --git a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/BuilderCoreUtils.java b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/BuilderCoreUtils.java
>index d8e7d75..2cac59b 100644
>--- a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/BuilderCoreUtils.java
>+++ b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/BuilderCoreUtils.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -45,6 +45,7 @@
> 	 * @since 3.7
> 	 */
> 	public static final String INC_CLEAN = "incclean"; //$NON-NLS-1$
>+	public static final String NOT_REAL_AUTO  = "notrealauto";//$NON-NLS-1$
> 
> 	/**
> 	 * Constant used to find a builder using the 3.0-interim format
>@@ -126,7 +127,7 @@
> 		newCommand.setBuilding(IncrementalProjectBuilder.CLEAN_BUILD, false);
> 		String buildKinds = config.getAttribute(IExternalToolConstants.ATTR_RUN_BUILD_KINDS, (String) null);
> 		int[] triggers = buildTypesToArray(buildKinds);
>-		boolean isfull = false, isinc = false;
>+		boolean isfull = false, isinc = false, isauto = false;
> 		for (int i = 0; i < triggers.length; i++) {
> 			switch (triggers[i]) {
> 				case IncrementalProjectBuilder.FULL_BUILD:
>@@ -139,12 +140,23 @@
> 					break;
> 				case IncrementalProjectBuilder.AUTO_BUILD:
> 					newCommand.setBuilding(IncrementalProjectBuilder.AUTO_BUILD, true);
>+					isauto = true;
> 					break;
> 				case IncrementalProjectBuilder.CLEAN_BUILD:
> 					newCommand.setBuilding(IncrementalProjectBuilder.CLEAN_BUILD, true);
> 					break;
> 			}
> 		}
>+		if ((isfull || isinc) && !isauto) {
>+			// target should execute after clean
>+			Map args = newCommand.getArguments();
>+			if(args == null) {
>+				args = new HashMap();
>+			}
>+			newCommand.setBuilding(IncrementalProjectBuilder.AUTO_BUILD, true);
>+			args.put(NOT_REAL_AUTO, Boolean.TRUE.toString());
>+			newCommand.setArguments(args);
>+		}
> 		if(!isfull && isinc) {
> 			Map args = newCommand.getArguments();
> 			if(args == null) {
>diff --git a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java
>index dd809de..b6cad05 100644
>--- a/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java
>+++ b/org.eclipse.core.externaltools/src/org/eclipse/core/externaltools/internal/model/ExternalToolBuilder.java
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2011 IBM Corporation and others.
>+ * Copyright (c) 2000, 2012 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
>@@ -70,7 +70,9 @@
> 		if (ExternalToolsCore.getDefault().getBundle().getState() != Bundle.ACTIVE) {
> 			return null;
> 		}
>-		
>+	    if (kind == IncrementalProjectBuilder.AUTO_BUILD && args.get(BuilderCoreUtils.NOT_REAL_AUTO) != null) {
>+	    		return null;
>+	    }
> 		ILaunchConfiguration config= BuilderCoreUtils.configFromBuildCommandArgs(getProject(), args, new String[1]);
>         if (config == null) {
>             throw ExternalToolsCore.newError(ExternalToolsModelMessages.ExternalToolBuilder_0, null);

Actions: View | Diff

Attachments on bug 352131: 199681 | 209428 | 209568