Menu
▾
▴
[CDChamber-cvscommit] CDChamber build.xml,1.37,1.38
|
From: <cry...@us...> - 2002-08-07 03:28:57
|
Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv28552
Modified Files:
build.xml
Log Message:
refactoring aspect's usage structure
Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** build.xml 31 Jul 2002 06:49:03 -0000 1.37
--- build.xml 7 Aug 2002 03:28:54 -0000 1.38
***************
*** 14,21 ****
<property name="test.src" value="${test.dir}/src"/>
<property name="aspect.gen" value="${aspect.dir}/gen"/>
! <property name="aspect.src" value="${aspect.dir}/src"/>
<property name="build.dest" value="${build.dir}/classes"/>
<property name="test.classes" value="${build.dir}/test"/>
! <property name="aspect.classes" value="${build.dir}/aspect"/>
<property name="jar.dir" value="${build.dir}/lib"/>
--- 14,24 ----
<property name="test.src" value="${test.dir}/src"/>
<property name="aspect.gen" value="${aspect.dir}/gen"/>
! <property name="aspect.debug" value="${aspect.dir}/debug"/>
! <property name="aspect.unittest" value="${aspect.dir}/unittest"/>
<property name="build.dest" value="${build.dir}/classes"/>
<property name="test.classes" value="${build.dir}/test"/>
! <property name="build.aspect" value="${build.dir}/aspect"/>
! <property name="build.aspect.debug" value="${build.aspect}/debug"/>
! <property name="build.aspect.unittest" value="${build.aspect}/unittest"/>
<property name="jar.dir" value="${build.dir}/lib"/>
***************
*** 25,29 ****
<path id="classpath">
<pathelement path="${basedir}/lib" />
- <pathelement path="${test.classes}" />
<pathelement path="${build.dest}" />
<fileset dir="${basedir}/lib">
--- 28,31 ----
***************
*** 39,43 ****
<mkdir dir="${build.dest}"/>
<mkdir dir="${test.classes}"/>
! <mkdir dir="${aspect.classes}"/>
<mkdir dir="${logdir}"/>
<mkdir dir="${jar.dir}"/>
--- 41,47 ----
<mkdir dir="${build.dest}"/>
<mkdir dir="${test.classes}"/>
! <mkdir dir="${build.aspect}"/>
! <mkdir dir="${build.aspect.debug}"/>
! <mkdir dir="${build.aspect.unittest}"/>
<mkdir dir="${logdir}"/>
<mkdir dir="${jar.dir}"/>
***************
*** 53,65 ****
</and>
</condition>
! <condition property="ajc_gen.notRequired">
<uptodate targetfile="${src.dir}/org/cdchamber/elements/FileType.java">
<srcfiles dir="${aspect.gen}" includes="**/*.*"/>
</uptodate>
</condition>
! <condition property="ajc.notRequired">
! <uptodate targetfile="${aspect.classes}/AspectCDCMainFrameControllerTest.class">
! <srcfiles dir="${aspect.src}" includes="**/*.*"/>
! <srcfiles dir="${aspect.dir}" includes="file.lst"/>
</uptodate>
</condition>
--- 57,75 ----
</and>
</condition>
! <condition property="ajc.gen.notRequired">
<uptodate targetfile="${src.dir}/org/cdchamber/elements/FileType.java">
<srcfiles dir="${aspect.gen}" includes="**/*.*"/>
</uptodate>
</condition>
! <condition property="ajc.debug.notRequired">
! <uptodate targetfile="${build.aspect.debug}/AspectCDCMainFrameControllerTest.class">
! <srcfiles dir="${aspect.debug}" includes="**/*.*"/>
! <srcfiles dir="${aspect.debug}" includes="file.lst"/>
! </uptodate>
! </condition>
! <condition property="ajc.unittest.notRequired">
! <uptodate targetfile="${build.aspect.unittest}/org/cdchamber/elements/EntryParserWrapper.class">
! <srcfiles dir="${aspect.unittest}" includes="**/*.*"/>
! <srcfiles dir="${aspect.unittest}" includes="file.lst"/>
</uptodate>
</condition>
***************
*** 71,75 ****
</target>
! <target name="castor_gen" depends="init" description="Generate src files from xsd files" unless="xmlBuild.notRequired">
<java classname="org.exolab.castor.builder.SourceGenerator" fork="true">
<arg line="-i ${src.dir}/cdchamber.xsd -dest ${aspect.gen} -package org.cdchamber.elements -verbose -types j2 -nodesc -f"/>
--- 81,85 ----
</target>
! <target name="castor.gen" depends="init" description="Generate src files from xsd files" unless="xmlBuild.notRequired">
<java classname="org.exolab.castor.builder.SourceGenerator" fork="true">
<arg line="-i ${src.dir}/cdchamber.xsd -dest ${aspect.gen} -package org.cdchamber.elements -verbose -types j2 -nodesc -f"/>
***************
*** 81,85 ****
! <target name="ajc_gen" depends="castor_gen" unless="ajc_gen.notRequired">
<ajc preprocess="yes" workingdir="${src.dir}" nocomments="yes">
<classpath>
--- 91,95 ----
! <target name="ajc.gen" depends="castor.gen" unless="ajc.gen.notRequired">
<ajc preprocess="yes" workingdir="${src.dir}" nocomments="yes">
<classpath>
***************
*** 92,96 ****
</target>
! <target name="compile" depends="ajc_gen" description="Compile application without aspectj">
<javac srcdir="${src.dir}" destdir="${build.dest}" classpathref="classpath"
includes="**/*.java" debug="true" deprecation="true" />
--- 102,106 ----
</target>
! <target name="compile" depends="ajc.gen" description="Compile application without aspectj">
<javac srcdir="${src.dir}" destdir="${build.dest}" classpathref="classpath"
includes="**/*.java" debug="true" deprecation="true" />
***************
*** 105,111 ****
</target>
! <target name="test.compile" depends="testsuite.gen">
<javac srcdir="${test.src}" destdir="${test.classes}">
<classpath>
<path refid="classpath" />
</classpath>
--- 115,130 ----
</target>
! <target name="ajc.unittest" depends="compile" unless="ajc.unittest.notRequired">
! <ajc destdir="${build.aspect.unittest}" argfiles="${aspect.unittest}/file.lst">
! <classpath>
! <path refid="classpath" />
! </classpath>
! </ajc>
! </target>
!
! <target name="test.compile" depends="testsuite.gen,ajc.unittest">
<javac srcdir="${test.src}" destdir="${test.classes}">
<classpath>
+ <pathelement location="${build.aspect.unittest}" />
<path refid="classpath" />
</classpath>
***************
*** 114,119 ****
</target>
! <target name="ajc" depends="test.compile" unless="ajc.notRequired">
! <ajc destdir="${aspect.classes}" argfiles="${aspect.dir}/file.lst">
<classpath>
<path refid="classpath" />
--- 133,138 ----
</target>
! <target name="ajc.debug" depends="test.compile" unless="ajc.debug.notRequired">
! <ajc destdir="${build.aspect.debug}" argfiles="${aspect.debug}/file.lst">
<classpath>
<path refid="classpath" />
***************
*** 122,129 ****
</target>
! <target name="ajrun" depends="ajc" description="Run debugging unit tests">
<junit fork="yes" haltonfailure="yes" dir=".">
<classpath>
! <pathelement location="${aspect.classes}" />
<path refid="classpath" />
</classpath>
--- 141,150 ----
</target>
!
! <target name="ajrun.debug" depends="ajc.debug" description="Run debugging unit tests">
<junit fork="yes" haltonfailure="yes" dir=".">
<classpath>
! <pathelement location="${build.aspect.debug}" />
! <pathelement path="${test.classes}" />
<path refid="classpath" />
</classpath>
***************
*** 138,149 ****
<junit fork="true" haltonfailure="yes" dir=".">
<classpath>
<path refid="classpath" />
</classpath>
<formatter type="plain" usefile="false"/>
<test name="AllTests"/>
-
- <!-- <batchtest todir="${junit.results}"> -->
- <!-- <fileset dir="${test.classes}" includes="**/*Test.class"/> -->
- <!-- </batchtest> -->
</junit>
</target>
--- 159,168 ----
<junit fork="true" haltonfailure="yes" dir=".">
<classpath>
+ <pathelement location="${build.aspect.unittest}" />
+ <pathelement path="${test.classes}" />
<path refid="classpath" />
</classpath>
<formatter type="plain" usefile="false"/>
<test name="AllTests"/>
</junit>
</target>
***************
*** 152,156 ****
<jar jarfile="${jar.dir}/CDChamber.jar">
<fileset dir="${build.dest}"/>
- <fileset dir="${aspect.classes}"/>
</jar>
</target>
--- 171,174 ----
|