svn commit: r654837 - in /lenya/branches/branch_1_2_x_shibboleth/src: java/org/apache/lenya/ac/impl/antlr/ targets/

Author: andreas
Date: Fri May  9 07:56:47 2008
New Revision: 654837

URL: http://svn.apache.org/viewvc?rev=654837&view=rev
Log:
Compile ANTLR grammar during build process, don't include the parser and lexer Java files in the SVN repository.

Removed:
    lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/impl/antlr/Expressions.tokens
    lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/impl/antlr/ExpressionsLexer.java
    lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/impl/antlr/ExpressionsParser.java
    lenya/branches/branch_1_2_x_shibboleth/src/java/org/apache/lenya/ac/impl/antlr/expressions__.g
Modified:
    lenya/branches/branch_1_2_x_shibboleth/src/targets/antlr-build.xml
    lenya/branches/branch_1_2_x_shibboleth/src/targets/compile-build.xml

Modified: lenya/branches/branch_1_2_x_shibboleth/src/targets/antlr-build.xml
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/targets/antlr-build.xml?rev=654837&r1=654836&r2=654837&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/targets/antlr-build.xml (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/targets/antlr-build.xml Fri May  9 07:56:47 2008
@@ -21,14 +21,13 @@
 <project name="antlr">
   
   <target name="antlr.compile" description="Generate the ANTLR parser for attribute rule evaluation">
-    <property name="antlr.build" value="src/java/org/apache/lenya/ac/impl/antlr"/>
-    <mkdir dir="${antlr.build}"/>
+    <property name="antlr.package" value="org/apache/lenya/ac/impl/antlr"/>
+    <mkdir dir="${build.src}/${antlr.package}"/>
     <antlr:antlr3 xmlns:antlr="antlib:org/apache/tools/ant/antlr"
-      target="src/java/org/apache/lenya/ac/impl/antlr/Expressions.g"
-      outputdirectory="${antlr.build}">
+      target="src/java/${antlr.package}/Expressions.g"
+      outputdirectory="${build.src}/${antlr.package}">
       <jvmarg value="-Djava.compiler=NONE"/>
     </antlr:antlr3>
-    <antcall target="compile"/>
   </target>
   
 </project>
\ No newline at end of file

Modified: lenya/branches/branch_1_2_x_shibboleth/src/targets/compile-build.xml
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/targets/compile-build.xml?rev=654837&r1=654836&r2=654837&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/targets/compile-build.xml (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/targets/compile-build.xml Fri May  9 07:56:47 2008
@@ -27,7 +27,7 @@
   <!-- ============================================================ -->
   <!-- The main compilation target                                  -->
   <!-- ============================================================ -->
-  <target name="compile" depends="prepare-src" description="Compile the sources">
+  <target name="compile" depends="prepare-src, antlr.compile" description="Compile the sources">
     <mkdir dir="${build.dest}"/>
     <javac srcdir="${build.src}"
            destdir="${build.dest}"