From ff95f2d5597876da67cde4152a4cd55553c67c32 Mon Sep 17 00:00:00 2001 From: moparisthebest Date: Wed, 25 Jun 2014 12:33:52 -0400 Subject: [PATCH] Fix AptTask where the proper apt isn't first on the PATH (ubuntu), and allow it to be set manually if needed as well --- .../apache/beehive/controls/runtime/generator/AptTask.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/beehive-controls/src/main/java/org/apache/beehive/controls/runtime/generator/AptTask.java b/beehive-controls/src/main/java/org/apache/beehive/controls/runtime/generator/AptTask.java index e094f6d..a26c73f 100644 --- a/beehive-controls/src/main/java/org/apache/beehive/controls/runtime/generator/AptTask.java +++ b/beehive-controls/src/main/java/org/apache/beehive/controls/runtime/generator/AptTask.java @@ -25,6 +25,7 @@ import org.apache.tools.ant.types.Commandline; import org.apache.tools.ant.types.Path; import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.GlobPatternMapper; +import org.apache.tools.ant.util.JavaEnvUtils; import org.apache.tools.ant.util.SourceFileScanner; import java.io.File; @@ -214,7 +215,8 @@ public class AptTask extends Javac } // Select the executable (apt) and set fork = true - setExecutable("apt"); + if(getExecutable() == null) + setExecutable(JavaEnvUtils.getJdkExecutable("apt")); setFork(true); // Specify the code generation output directory to APT