Update of /cvsroot/xdoclet/xjavadoc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31488/xjavadoc
Modified Files:
build.xml
Log Message:
Support Java5. From Anton Adamansky in XJD-41.
Index: build.xml
===================================================================
RCS file: /cvsroot/xdoclet/xjavadoc/build.xml,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** build.xml 22 Nov 2004 12:11:12 -0000 1.56
--- build.xml 10 Jun 2005 12:00:06 -0000 1.57
***************
*** 2,6 ****
<project name="XJavaDoc" default="jar" basedir=".">
! <property name="version" value="1.1"/>
<property name="build.dir" location="${basedir}/target"/>
<property name="jardir" location="${build.dir}"/>
--- 2,6 ----
<project name="XJavaDoc" default="jar" basedir=".">
! <property name="version" value="1.5-snapshot"/>
<property name="build.dir" location="${basedir}/target"/>
<property name="jardir" location="${build.dir}"/>
***************
*** 50,60 ****
<!-- Compiles the source code
-->
<!-- ===================================================================
-->
- <!-- The 'source="1.4"' is necessary, because JavaCC uses 'enum' as
variable
- name, which is a keyword in java 1.5.
- => JavaCC should be changed not to use 'enum' as variable anymore! -->
<target name="compile" depends="generate-parsers" description="Compiles
the source code">
! <javac
! source="1.4"
! encoding="ISO-8859-1"
srcdir="${build.dir}/src"
destdir="${build.dir}/classes"
--- 50,61 ----
<!-- Compiles the source code
-->
<!-- ===================================================================
-->
<target name="compile" depends="generate-parsers" description="Compiles
the source code">
!
! <!-- Replace the parser generated token class with ours custom -->
! <copy todir="${build.dir}/src/xjavadoc" overwrite="true">
! <fileset dir="${basedir}/javacc" includes="Token.java"/>
! </copy>
!
! <javac
srcdir="${build.dir}/src"
destdir="${build.dir}/classes"
***************
*** 71,75 ****
<!-- ===================================================================
-->
<target name="jar" depends="junit">
! <jar jarfile="${jardir}/xjavadoc-${version}.jar">
<fileset dir="${build.dir}/classes">
<exclude name="**/*Test.class"/>
--- 72,76 ----
<!-- ===================================================================
-->
<target name="jar" depends="junit">
! <jar jarfile="${jardir}/xjavadoc-${version}.jar" compress="true">
<fileset dir="${build.dir}/classes">
<exclude name="**/*Test.class"/>
***************
*** 119,128 ****
<mkdir dir="${build.dir}/test-classes"/>
- <!-- The 'source="1.4"' is necessary, because JavaCC uses 'enum' as
variable
- name, which is a keyword in java 1.5.
- => JavaCC should be changed not to use 'enum' as variable anymore!
-->
<javac
- source="1.4"
- encoding="ISO-8859-1"
srcdir="${build.dir}/junit"
destdir="${build.dir}/test-classes"
--- 120,124 ----
***************
*** 151,155 ****
<fileset dir="${build.dir}/test-classes"/>
! <formatter type="xml"/>
</batchtest>
</junit>
--- 147,151 ----
<fileset dir="${build.dir}/test-classes"/>
! <formatter type="plain"/>
</batchtest>
</junit>
***************
*** 182,186 ****
<target name="copy-grammar">
<copy
! file="${basedir}/javacc/Java1.2-b.jjt"
tofile="${build.dir}/src/xjavadoc/${destination-grammar}"
>
--- 178,182 ----
<target name="copy-grammar">
<copy
! file="${basedir}/javacc/Java1.5x.jjt"
tofile="${build.dir}/src/xjavadoc/${destination-grammar}"
>
-------------------------------------------------------
This SF.Net email is sponsored by: NEC IT Guy Games. How far can you shotput
a projector? How fast can you ride your desk chair down the office luge track?
If you want to score the big prize, get to know the little guy.
Play to win an NEC 61" plasma display: http://www.necitguy.com/?r=20
_______________________________________________
xdoclet-devel mailing list
xdoclet-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xdoclet-devel
