User: rinkrank
Date: 02/03/01 02:46:26
Modified: . build.xml build.sh build.bat
Log:
Automatic JUnit test generation
Various bug fixes and optimisations
Deadlock! FIXME
Revision Changes Path
1.26 +30 -4 xjavadoc/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/xdoclet/xjavadoc/build.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -w -r1.25 -r1.26
--- build.xml 25 Feb 2002 00:06:02 -0000 1.25
+++ build.xml 1 Mar 2002 10:46:26 -0000 1.26
@@ -6,7 +6,7 @@
<property name="name" value="xjavadoc"/>
<property name="version" value="0.1.beta"/>
<property name="name.version" value="${basedir}/${name}.${version}"/>
- <property name="jar.file" value="${name}.jar"/>
+ <property name="jar.file" value="${basedir}/${name}.jar"/>
<!--property name="build.compiler" value="jikes"/-->
<property name="lib.dir" value="${basedir}/lib"/>
@@ -30,7 +30,7 @@
<property name="javaparser.grammar" value="Java1.2-b"/>
<property name="javaparser.dir" value="${build.java.src.dir}/xjavadoc"/>
- <property name="dump.dir" value="${basedir}/../xdoclet/core/src"/>
+ <property name="dump.dir" value="${build.java.src.dir}"/>
<!-- =================================================================== -->
<!-- Initialization target. -->
@@ -80,6 +80,7 @@
srcdir="${build.java.src.dir}"
destdir="${build.classes.dir}"
classpathref="classpath"
+ deprecation="true"
optimize="false"
debug="true"
/>
@@ -142,7 +143,7 @@
</target>
<!-- =================================================================== -->
- <!-- Creates the API documentation with iDoclet -->
+ <!-- Creates the API documentation with -->
<!-- =================================================================== -->
<target name="javadocs" depends="javacc,delete-tests" description="Generates the
API documentation">
<mkdir dir="${build.javadocs.dir}"/>
@@ -154,6 +155,7 @@
use="true"
version="true"
author="yes"
+ private="true"
doctitle="${ant.project.name} API"
windowtitle="${ant.project.name} API"
/>
@@ -180,9 +182,33 @@
</target>
<!-- =================================================================== -->
+ <!-- Generates JUnit tests -->
+ <!-- =================================================================== -->
+ <target name="generate-tests" depends="clean,javacc" description="Generates
JUnit tests">
+ <taskdef
+ name="xdoclet"
+ classname="xdoclet.DocletTask"
+ />
+
+ <xdoclet
+ sourcepath="${build.java.src.dir}"
+ destdir="${build.java.src.dir}"
+ >
+ <fileset dir="${build.java.src.dir}">
+ <!--include name="xjavadoc/JavaParserConstants.java"/-->
+ </fileset>
+ <template
+ templateFile="${basedir}/etc/xjavadoctest.j"
+ destinationFile="{0}__GENERATED__Test.java"
+ subTaskClassName="xdoclet.NoInnerClassSubTask"
+ />
+ </xdoclet>
+ </target>
+
+ <!-- =================================================================== -->
<!-- Runs JUnit tests -->
<!-- =================================================================== -->
- <target name="junit" depends="compile" description="Runs All JUnit tests">
+ <target name="junit" depends="generate-tests,compile" description="Runs All
JUnit tests">
<mkdir dir="${build.reports.xml.dir}"/>
<echo message="Using log4j config from ${log4j.properties.file}"/>
<junit fork="yes">
1.3 +1 -1 xjavadoc/build.sh
Index: build.sh
===================================================================
RCS file: /cvsroot/xdoclet/xjavadoc/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- build.sh 17 Feb 2002 19:43:43 -0000 1.2
+++ build.sh 1 Mar 2002 10:46:26 -0000 1.3
@@ -16,7 +16,7 @@
:./lib/optional.jar\
:./lib/saxpath.jar\
:./lib/xalan_1_2_2_D9.jar\
-:./lib/xdoclet.jar\
+:../xdoclet/core/dist/lib/xdoclet.jar\
:$JAVA_HOME/lib/tools.jar
$JAVA_HOME/bin/java -classpath $CP org.apache.tools.ant.Main $*
1.4 +1 -1 xjavadoc/build.bat
Index: build.bat
===================================================================
RCS file: /cvsroot/xdoclet/xjavadoc/build.bat,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -r1.3 -r1.4
--- build.bat 19 Feb 2002 19:14:49 -0000 1.3
+++ build.bat 1 Mar 2002 10:46:26 -0000 1.4
@@ -11,7 +11,7 @@
set CLASSPATH=.\lib\JavaCC.jar
for %%i in (.\lib\*.jar) do call appendcp.bat %%i
for %%i in (.\lib\*.zip) do call appendcp.bat %%i
-
+call appendcp ..\xdoclet\core\dist\lib\xdoclet.jar
echo %CP%
"%JAVA_HOME%\bin\java.exe" %ANT_OPTS% -classpath
"%JAVA_HOME%\lib\tools.jar;%CP%;%CLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
_______________________________________________
Xdoclet-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
