bodewig 01/07/04 03:33:38
Modified: . WHATSNEW
src/main/org/apache/tools/ant/taskdefs/optional/javacc
JJTree.java
Log:
Search for the generated file in the "right" directory in <jjtree>.
PR: 1652
Revision Changes Path
1.117 +3 -0 jakarta-ant/WHATSNEW
Index: WHATSNEW
===================================================================
RCS file: /home/cvs/jakarta-ant/WHATSNEW,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- WHATSNEW 2001/07/04 10:07:54 1.116
+++ WHATSNEW 2001/07/04 10:33:23 1.117
@@ -136,6 +136,9 @@
* perform proper uptodate check in <rmic> when compiling for IIOP.
+* <jjtree>'s uptodate test works even if outputdirectory is not the
+ parent dir of target
+
Changes from Ant 1.2 to Ant 1.3
===========================================
1.4 +3 -2
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java
Index: JJTree.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/javacc/JJTree.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JJTree.java 2001/03/02 15:59:05 1.3
+++ JJTree.java 2001/07/04 10:33:33 1.4
@@ -187,8 +187,9 @@
cmdl.createArgument().setValue(
"-OUTPUT_DIRECTORY:"+outputDirectory.getAbsolutePath().replace('\\', '/'));
- final File javaFile = new File(
- target.toString().substring(0,
target.toString().indexOf(".jjt")) + ".jj");
+ String targetName = target.getName();
+ final File javaFile = new File(outputDirectory,
+ targetName.substring(0, targetName.indexOf(".jjt")) + ".jj");
if (javaFile.exists() && target.lastModified() <
javaFile.lastModified()) {
project.log("Target is already built - skipping (" + target +
")");
return;
