moparisthebest/beehive
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Fix AptTask where the proper apt isn't first on the PATH (ubuntu), and allow it to be set manually if needed as well

Browse Source
This commit is contained in:
moparisthebest 2014-06-25 12:33:52 -04:00
parent 2dec1ea7cf
commit ff95f2d559
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
beehive-controls/src/main/java/org/apache/beehive/controls/runtime/generator/AptTask.java
View File

@ -25,6 +25,7 @@ import org.apache.tools.ant.types.Commandline;
import org.apache.tools.ant.types.Path; import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.util.FileUtils; import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.GlobPatternMapper; import org.apache.tools.ant.util.GlobPatternMapper;
import org.apache.tools.ant.util.JavaEnvUtils;
import org.apache.tools.ant.util.SourceFileScanner; import org.apache.tools.ant.util.SourceFileScanner;
import java.io.File; import java.io.File;
@ -214,7 +215,8 @@ public class AptTask extends Javac
} }
// Select the executable (apt) and set fork = true // Select the executable (apt) and set fork = true
setExecutable("apt"); if(getExecutable() == null)
setExecutable(JavaEnvUtils.getJdkExecutable("apt"));
setFork(true); setFork(true);
// Specify the code generation output directory to APT // Specify the code generation output directory to APT