User: rinkrank
Date: 02/03/10 09:56:13
Modified: . build.xml
Log:
-Modified grammar and core, so both plain JavaCC and JJTree is supported.
JavaCC is faster, and will be used by XDoclet. The sources will be read-only. JJTree
is slower,
but enables svaing of (modified) sources.
-Removed XTagParameter class for the sake of simpler API and implementation
-Removed old benchmark tests
-Fixed some more deadlock issues
-Implemented wait/notify in interfaces too
-And some more tests (I think)
Revision Changes Path
1.27 +45 -60 xjavadoc/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/xdoclet/xjavadoc/build.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -w -r1.26 -r1.27
--- build.xml 1 Mar 2002 10:46:26 -0000 1.26
+++ build.xml 10 Mar 2002 17:56:13 -0000 1.27
@@ -29,9 +29,10 @@
<property name="tgz.file" value="${name.version}.tar.gz"/>
<property name="javaparser.grammar" value="Java1.2-b"/>
- <property name="javaparser.dir" value="${build.java.src.dir}/xjavadoc"/>
<property name="dump.dir" value="${build.java.src.dir}"/>
+ <property name="parser.dir" value="${build.java.src.dir}/xjavadoc"/>
+
<!-- =================================================================== -->
<!-- Initialization target. -->
<!-- =================================================================== -->
@@ -75,7 +76,7 @@
<!-- =================================================================== -->
<!-- Compiles the source code -->
<!-- =================================================================== -->
- <target name="compile" depends="pretty,javacc" description="Compiles the source
code">
+ <target name="compile" depends="pretty,generate-parsers" description="Compiles
the source code">
<javac
srcdir="${build.java.src.dir}"
destdir="${build.classes.dir}"
@@ -145,7 +146,7 @@
<!-- =================================================================== -->
<!-- Creates the API documentation with -->
<!-- =================================================================== -->
- <target name="javadocs" depends="javacc,delete-tests" description="Generates the
API documentation">
+ <target name="javadocs" depends="generate-parsers,delete-tests"
description="Generates the API documentation">
<mkdir dir="${build.javadocs.dir}"/>
<javadoc
packagenames="*.*"
@@ -164,7 +165,7 @@
<!-- =================================================================== -->
<!-- Configures ConfigLog4J -->
<!-- =================================================================== -->
- <target name="configlog4j" depends="javacc" description="Configures Log4J">
+ <target name="configlog4j" depends="generate-parsers" description="Configures
Log4J">
<java classname="de.japhy.tools.configLog4j.ConfigLog4j" fork="yes">
<classpath refid="classpath"/>
<arg value="etc/log4j/configLog4j.properties"/>
@@ -184,7 +185,7 @@
<!-- =================================================================== -->
<!-- Generates JUnit tests -->
<!-- =================================================================== -->
- <target name="generate-tests" depends="clean,javacc" description="Generates
JUnit tests">
+ <target name="generate-tests" depends="clean,generate-parsers"
description="Generates JUnit tests">
<taskdef
name="xdoclet"
classname="xdoclet.DocletTask"
@@ -296,11 +297,40 @@
</target>
<!-- =================================================================== -->
+ <!-- Define the xdoclet replacecopy task -->
+ <!-- =================================================================== -->
+ <taskdef name="replacecopy" classname="xdoclet.ant.ReplaceCopy"/>
+
+ <target name="copy-grammar">
+ <replacecopy
+ file="${basedir}/javacc/${javaparser.grammar}.jjt"
+ tofile="${parser.dir}/${destination-grammar}"
+ />
+ </target>
+
+ <target name="generate-parsers"
depends="generate-node-parser,generate-simple-parser"/>
+
+ <!-- =================================================================== -->
<!-- JavaCC -->
<!-- =================================================================== -->
- <target name="javacc" depends="jjtree">
+ <target name="generate-simple-parser" depends="prepare">
+ <antcall target="copy-grammar">
+ <param name="destination-grammar" value="simpleparser.jj"/>
+ <param name="parser-class" value="SimpleParser"/>
+ <param name="set-compilation-unit" value="// In SimpleParser we can't use
nodes"/>
+ </antcall>
<javacc
- target="${javaparser.dir}/${javaparser.grammar}.jj"
+ target="${parser.dir}/simpleparser.jj"
+ javacchome="${lib.dir}"
+ />
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- JavaCC -->
+ <!-- =================================================================== -->
+ <target name="generate-node-parser" depends="jjtree">
+ <javacc
+ target="${parser.dir}/nodeparser.jj"
javacchome="${lib.dir}"
/>
</target>
@@ -309,9 +339,14 @@
<!-- JJTree -->
<!-- =================================================================== -->
<target name="jjtree" depends="prepare">
+ <antcall target="copy-grammar">
+ <param name="destination-grammar" value="nodeparser.jjt"/>
+ <param name="parser-class" value="NodeParser"/>
+ <param name="set-compilation-unit" value="sourceClass.setCompilationUnit(
jjtThis );"/>
+ </antcall>
<jjtree
- target="${basedir}/javacc/${javaparser.grammar}.jjt"
- outputdirectory="${javaparser.dir}"
+ target="${parser.dir}/nodeparser.jjt"
+ outputdirectory="${parser.dir}"
javacchome="${lib.dir}"
/>
</target>
@@ -319,7 +354,7 @@
<!-- =================================================================== -->
<!-- Runs Classic and XJavaDoc on the same sources. For benchmarking -->
<!-- =================================================================== -->
- <target name="benchmark"
depends="benchmark-classic,benchmark-xjavadoc,benchmark-jjtree,benchmark-javacc"/>
+ <target name="benchmark" depends="benchmark-classic,benchmark-xjavadoc"/>
<!-- =================================================================== -->
<!-- Test target that runs xjavadoc on some sources -->
@@ -354,56 +389,6 @@
<param name="-dummy"/>
</doclet>
</javadoc>
- </target>
-
- <!-- =================================================================== -->
- <!-- Generates JJTree benchmark sources -->
- <!-- =================================================================== -->
- <target name="generate-benchmark-jjtree" depends="prepare">
- <mkdir dir="${build.java.src.dir}/xjavadoc/benchmark/jjtree"/>
- <antcall target="javacc">
- <param name="javaparser.grammar" value="Java1.2-b-benchmark"/>
- <param name="javaparser.dir"
value="${build.java.src.dir}/xjavadoc/benchmark/jjtree"/>
- </antcall>
- </target>
-
- <!-- =================================================================== -->
- <!-- Runs JJTree benchmark -->
- <!-- =================================================================== -->
- <target name="benchmark-jjtree" depends="generate-benchmark-jjtree,jar">
- <echo message="Running simple jjtree parser"/>
- <java
- classname="xjavadoc.benchmark.jjtree.JavaParser"
- fork="yes"
- classpath="${java.class.path};${jar.file}"
- >
- <arg value="${dump.dir}"/>
- </java>
- </target>
-
- <!-- =================================================================== -->
- <!-- Generates JavaCC benchmark sources -->
- <!-- =================================================================== -->
- <target name="generate-benchmark-javacc" depends="prepare">
- <copy file="${basedir}/javacc/Java1.2-a-benchmark.jj"
todir="${build.java.src.dir}/xjavadoc/benchmark/javacc"/>
- <javacc
-
target="${build.java.src.dir}/xjavadoc/benchmark/javacc/Java1.2-a-benchmark.jj"
- javacchome="${lib.dir}"
- />
- </target>
-
- <!-- =================================================================== -->
- <!-- Runs JavaCC benchmark -->
- <!-- =================================================================== -->
- <target name="benchmark-javacc" depends="generate-benchmark-javacc,jar">
- <echo message="Running simple javacc parser"/>
- <java
- classname="xjavadoc.benchmark.javacc.JavaParser"
- fork="yes"
- classpath="${java.class.path};${jar.file}"
- >
- <arg value="${dump.dir}"/>
- </java>
</target>
<!-- =================================================================== -->
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
