Browse Source

make the executable attribute of apt inherited from javac work as expected. PR 46230

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@792967 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 16 years ago
parent
commit
a9c576b742
2 changed files with 7 additions and 1 deletions
  1. +4
    -0
      WHATSNEW
  2. +3
    -1
      src/main/org/apache/tools/ant/taskdefs/Apt.java

+ 4
- 0
WHATSNEW View File

@@ -753,6 +753,10 @@ Other changes:
directories which is desabled for backwards compatibility reasons. directories which is desabled for backwards compatibility reasons.
Bugzilla Report 47457 Bugzilla Report 47457


* <apt>'s executable attribute can be used to specify a different
executable.
Bugzilla Report 46230.

Changes from Ant 1.7.0 TO Ant 1.7.1 Changes from Ant 1.7.0 TO Ant 1.7.1
============================================= =============================================




+ 3
- 1
src/main/org/apache/tools/ant/taskdefs/Apt.java View File

@@ -119,7 +119,9 @@ public class Apt
* @return the name of the executable. * @return the name of the executable.
*/ */
public String getAptExecutable() { public String getAptExecutable() {
return JavaEnvUtils.getJdkExecutable(EXECUTABLE_NAME);
String exe = getExecutable();
return exe != null ? exe :
JavaEnvUtils.getJdkExecutable(EXECUTABLE_NAME);
} }


/** /**


Loading…
Cancel
Save