Author: stevel
Date: Wed Jul 5 05:35:49 2006
New Revision: 419220
URL: http://svn.apache.org/viewvc?rev=419220&view=rev
Log:
bugzilla report 38175; javacc needs a jdk version attribute for java1.5 support.
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/docs/manual/OptionalTasks/javacc.html
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=419220&r1=419219&r2=419220&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Wed Jul 5 05:35:49 2006
@@ -444,6 +444,8 @@
* Minor performance updates. Bugzilla report 39565.
* New deleteonexit attribute for the <tempfile> task. Bugzilla report 39842.
+ Remember that the exit of the JVM can be a long time coming, especially
under an
+ IDE. Don't rely on this being called.
* <scriptdef>-created scripts have support for nested text. All text
passed to a scripted task can be accessed via self.text.
@@ -451,6 +453,9 @@
* <fixcrlf> now supports an outputencoding attribute. Bugzilla report 39697.
* <junitreport> now supports nested XSL parameters. Bugzilla report 39708.
+
+* <javacc> has a jdkversion attribute to pass the desired JDK version down to
javacc.
+ Bugzilla report 38715.
Changes from Ant 1.6.4 to Ant 1.6.5
===================================
Modified: ant/core/trunk/docs/manual/OptionalTasks/javacc.html
URL:
http://svn.apache.org/viewvc/ant/core/trunk/docs/manual/OptionalTasks/javacc.html?rev=419220&r1=419219&r2=419220&view=diff
==============================================================================
--- ant/core/trunk/docs/manual/OptionalTasks/javacc.html (original)
+++ ant/core/trunk/docs/manual/OptionalTasks/javacc.html Wed Jul 5 05:35:49
2006
@@ -117,6 +117,10 @@
<td valign="top" align="center">No</td>
</tr>
<tr>
+ <td valign="top">jdkversion</td>
+ <td valign="top">Sets the JDK_VERSION option. This is a string option.</td>
+ <td valign="top" align="center">No</td>
+ </tr> <tr>
<td valign="top">keeplinecolumn</td>
<td valign="top">Sets the KEEP_LINE_COLUMN grammar option. This is a
boolean option.</td>
<td valign="top" align="center">No</td>
@@ -178,7 +182,7 @@
</p>
<hr>
-<p align="center">Copyright © 2000-2001,2003,2005 Apache Software
Foundation.
+<p align="center">Copyright © 2000-2001,2003,2006 Apache Software
Foundation.
All rights
Reserved.</p>
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java?rev=419220&r1=419219&r2=419220&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JavaCC.java
Wed Jul 5 05:35:49 2006
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 The Apache Software Foundation
+ * Copyright 2000-2006 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -61,6 +61,7 @@
private static final String FORCE_LA_CHECK = "FORCE_LA_CHECK";
private static final String CACHE_TOKENS = "CACHE_TOKENS";
private static final String KEEP_LINE_COLUMN = "KEEP_LINE_COLUMN";
+ private static final String JDK_VERSION = "JDK_VERSION";
private final Hashtable optionalAttrs = new Hashtable();
@@ -247,6 +248,14 @@
*/
public void setKeeplinecolumn(boolean keepLineColumn) {
optionalAttrs.put(KEEP_LINE_COLUMN, new Boolean(keepLineColumn));
+ }
+
+ /**
+ * Sets the JDK_VERSION option.
+ * @since Ant1.7
+ */
+ public void setJDKversion(String jdkVersion) {
+ optionalAttrs.put(JDK_VERSION, jdkVersion);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
