svn commit: r1171876 - in /zookeeper/trunk: CHANGES.txt build.xml

[ph...@apache.org]

Author: phunt
Date: Sat Sep 17 00:24:55 2011
New Revision: 1171876

URL: http://svn.apache.org/viewvc?rev=1171876&view=rev
Log:
ZOOKEEPER-1184. jute generated files are not being cleaned up via 'ant clean' (Thomas Koch via phunt)

Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/build.xml

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1171876&r1=1171875&r2=1171876&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sat Sep 17 00:24:55 2011
@@ -27,6 +27,9 @@ IMPROVEMENTS:
 
   ZOOKEEPER-1182. Make findbugs usable in Eclipse (Thomas Koch via phunt)
 
+  ZOOKEEPER-1184. jute generated files are not being cleaned up via "ant clean"
+  (Thomas Koch via phunt)
+
 Release 3.4.0 - 
 
 Non-backward compatible changes:

Modified: zookeeper/trunk/build.xml
URL: http://svn.apache.org/viewvc/zookeeper/trunk/build.xml?rev=1171876&r1=1171875&r2=1171876&view=diff
==============================================================================
--- zookeeper/trunk/build.xml (original)
+++ zookeeper/trunk/build.xml Sat Sep 17 00:24:55 2011
@@ -236,21 +236,27 @@
     
 	
     <target name="generate_jute_parser" depends="init,ivy-retrieve">
-      <property name="jute_javacc.dir" value="${java.src.dir}/org/apache/jute/compiler/generated" />
+      <property name="jute_javacc.dir" value="${build.dir}/jute_compiler" />
+      <property name="jute_javacc.packagedir" value="/org/apache/jute/compiler/generated" />
+      <mkdir dir="${jute_javacc.dir}${jute_javacc.packagedir}"/>
       <!-- the javacc task expects a "javacc.jar" file... -->
       <ivy:artifactproperty name="[artifact].revision" value="[revision]" />
       <move file="${ivy.lib}/javacc-${javacc.revision}.jar" tofile="${ivy.lib}/javacc.jar" failonerror="false"/>
       <javacc
-          target="${jute_javacc.dir}/rcc.jj"
-          outputdirectory="${jute_javacc.dir}/"
+          target="${java.src.dir}${jute_javacc.packagedir}/rcc.jj"
+          outputdirectory="${jute_javacc.dir}${jute_javacc.packagedir}/"
           javacchome="${ivy.lib}"
           />
     </target>
      
     <target name="jute" depends="generate_jute_parser">
-        <javac srcdir="${java.src.dir}" destdir="${build.classes}" includeantruntime="false"
+        <javac srcdir="${jute_javacc.dir}" destdir="${build.classes}" includeantruntime="false"
             target="${javac.target}" source="${javac.source}"
-            includes="org/apache/jute/**" debug="on" />
+            includes="org/apache/jute/**" debug="on" 
+        >
+          <src path="${java.src.dir}" />
+          <src path="${jute_javacc.dir}" />
+        </javac>
     </target>
 
     <target name="compile_jute_uptodate">
@@ -268,6 +274,7 @@
             <arg value="../../zookeeper.jute" /> 
             <classpath>
                 <pathelement path="${build.classes}" />
+                <pathelement path="${jute_javacc.dir}" />
             </classpath>
         </java>