Bug 28809 - ANT_HOME not set on first run of Ant tool

2 files changed, 17 insertions, 0 deletions

diff --git a/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntLaunchDelegate.java b/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntLaunchDelegate.java
index ee7044258..06e564ad5 100644
--- a/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntLaunchDelegate.java
+++ b/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/launchConfigurations/AntLaunchDelegate.java
@@ -135,6 +135,11 @@ public class AntLaunchDelegate implements ILaunchConfigurationDelegate {
 			runner.setCustomClasspath(customClasspath);
 		}
 		
+		String antHome= AntUtil.getAntHome(configuration);
+		if (antHome != null) {
+			runner.setAntHome(antHome);
+		}
+		
 		monitor.worked(1);
 								
 		if (monitor.isCanceled()) {
diff --git a/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/model/AntUtil.java b/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/model/AntUtil.java
index 717d63312..c30e790dd 100644
--- a/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/model/AntUtil.java
+++ b/org.eclipse.ui.externaltools/Ant Tools Support/org/eclipse/ui/externaltools/internal/ant/model/AntUtil.java
@@ -93,6 +93,18 @@ public final class AntUtil {
 		Map map = configuration.getAttribute(IExternalToolConstants.ATTR_ANT_PROPERTIES, (Map) null);
 		return map;
 	}
+	
+	/**
+	 * Returns a String specifying the ant home to use for the build, or
+	 * <code>null</code> if none is specified.
+	 *
+	 * @param configuration launch configuration
+	 * @return String specifying ant home to use, or <code>null</code>
+	 * @throws CoreException if unable to access the associated attribute
+	 */
+	public static String getAntHome(ILaunchConfiguration configuration) throws CoreException {
+		return configuration.getAttribute(IExternalToolConstants.ATTR_ANT_HOME, (String) null);
+	}
 
 	/**
 	 * Returns an array of property files to be used for the build, or