ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bode...@apache.org
Subject svn commit: r792967 - in /ant/core/trunk: WHATSNEW src/main/org/apache/tools/ant/taskdefs/Apt.java
Date Fri, 10 Jul 2009 15:02:08 GMT
Author: bodewig
Date: Fri Jul 10 15:02:08 2009
New Revision: 792967

URL: http://svn.apache.org/viewvc?rev=792967&view=rev
Log:
make the executable attribute of apt inherited from javac work as expected.  PR 46230

Modified:
    ant/core/trunk/WHATSNEW
    ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Apt.java

Modified: ant/core/trunk/WHATSNEW
URL: http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=792967&r1=792966&r2=792967&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Fri Jul 10 15:02:08 2009
@@ -753,6 +753,10 @@
    directories which is desabled for backwards compatibility reasons.
    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
 =============================================
 

Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Apt.java
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Apt.java?rev=792967&r1=792966&r2=792967&view=diff
==============================================================================
--- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Apt.java (original)
+++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/Apt.java Fri Jul 10 15:02:08 2009
@@ -119,7 +119,9 @@
      * @return the name of the executable.
      */
     public String getAptExecutable() {
-        return JavaEnvUtils.getJdkExecutable(EXECUTABLE_NAME);
+        String exe = getExecutable();
+        return exe != null ? exe :
+            JavaEnvUtils.getJdkExecutable(EXECUTABLE_NAME);
     }
 
     /**



Mime
View raw message