Update of /cvsroot/sheets/sheets
In directory sc8-pr-cvs1:/tmp/cvs-serv4000
Modified Files:
build.xml
Log Message:
1. Updated the Java grammar to handle byte[].class construct.
2. Fixed the build file to check before recompiling javacc
Index: build.xml
===================================================================
RCS file: /cvsroot/sheets/sheets/build.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** build.xml 30 May 2003 08:16:00 -0000 1.20
--- build.xml 30 May 2003 19:13:40 -0000 1.21
***************
*** 29,32 ****
--- 29,43 ----
</target>
+ <target name="javacc" unless="javacc.uptodate">
+ <java classname="jjtree" classpath="${javacc-jar}" fork="yes">
+ <arg value="-OUTPUT_DIRECTORY=${javadir}"/>
+ <arg value="${parsers}/JavaParser.jjt"/>
+ </java>
+ <java classname="javacc" classpath="${javacc-jar}" fork="yes">
+ <arg value="-OUTPUT_DIRECTORY=${javadir}"/>
+ <arg value="${javadir}/JavaParser.jj"/>
+ </java>
+ </target>
+
<target name="compile" depends="init"
description="Compiles the java code (automatically exports from Sheets)">
***************
*** 40,51 ****
<!-- Note: JavaCC 3.0 is not supported by ant, so we need to invoke it directly -->
! <java classname="jjtree" classpath="${javacc-jar}" fork="yes">
! <arg value="-OUTPUT_DIRECTORY=${javadir}"/>
! <arg value="${parsers}/JavaParser.jjt"/>
! </java>
! <java classname="javacc" classpath="${javacc-jar}" fork="yes">
! <arg value="-OUTPUT_DIRECTORY=${javadir}"/>
! <arg value="${javadir}/JavaParser.jj"/>
! </java>
<property name="xquerydir" value="${java}/org/browsecode/xquery"/>
--- 51,56 ----
<!-- Note: JavaCC 3.0 is not supported by ant, so we need to invoke it directly -->
! <uptodate property="javacc.uptodate" srcfile="${parsers}/JavaParser.jjt" targetfile="${javadir}/JavaParser.java"/>
! <antcall target="javacc"/>
<property name="xquerydir" value="${java}/org/browsecode/xquery"/>
|
