From: Steve F. <sm...@us...> - 2002-10-21 22:56:22
|
Update of /cvsroot/mockobjects/mockobjects-java In directory usw-pr-cvs1:/tmp/cvs-serv16265 Modified Files: build.xml Log Message: version to 0.6 reorganised tests Index: build.xml =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- build.xml 15 Oct 2002 13:53:11 -0000 1.26 +++ build.xml 21 Oct 2002 22:56:19 -0000 1.27 @@ -18,7 +18,7 @@ <target name="project-properties"> <property name="project.fullname" value="Mock Objects" /> - <property name="project.version" value="0.5" /> + <property name="project.version" value="0.6" /> <property name="project.name" value="mockobjects" /> <property name="year" value="2002" /> <property name="debug" value="on" /> @@ -41,7 +41,8 @@ <property name="j2ee.lib" value="lib/j2ee.jar" /> </target> - <target name="deliverable-names" depends="project-properties"> + <target name="deliverable-names" + depends="project-properties"> <property name="dist.dir" value="dist" /> <property name="jar.base.name" value="mockobjects-${project.version}" /> <property name="alt.jar.base.name" value="alt-${project.version}" /> @@ -57,7 +58,8 @@ </patternset> </target> - <target name="check-availabilities" depends="source-locations"> + <target name="check-availabilities" + depends="source-locations"> <path id="lib.classpath"> <fileset dir="${lib.dir}"> <include name="*.jar" /> @@ -92,8 +94,7 @@ <tstamp /> - <echo - message="--------- ${project.fullname} ${project.version} ---------" /> + <echo message="--------- ${project.fullname} ${project.version} ---------" /> <echo message="" /> <echo message="java.class.path = ${java.class.path}" /> <echo message="" /> @@ -114,48 +115,32 @@ <mkdir dir="${flush.dir}" /> </target> - <target name="compile-core" depends="call-me-first" - description="Compile mock objects core"> + <target name="compile-core" + depends="call-me-first" + description="Compile mock objects core"> <mkdir dir="${core.classes}" /> - <javac destdir="${core.classes}" debug="${debug}" - deprecation="${deprecation}" verbose="false" - optimize="${optimize}" srcdir="${src.core.dir}"> - <exclude name="com/mockobjects/test/**" /> - - <classpath> - <path refid="lib.classpath" /> - <pathelement path="${java.class.path}" /> - </classpath> - </javac> - </target> - - <target name="compile-test" depends="call-me-first, compile-j2ee" - description="Compile mock objects core"> - - <mkdir dir="${core.classes}" /> - - <javac destdir="${core.classes}" debug="${debug}" - deprecation="${deprecation}" verbose="false" - optimize="${optimize}" srcdir="${src.core.dir}"> - <include name="com/mockobjects/test/**" /> + <javac destdir="${core.classes}" + debug="${debug}" + verbose="false" + optimize="${optimize}" + srcdir="${src.core.dir}"> <classpath> <path refid="lib.classpath" /> <pathelement path="${java.class.path}" /> - <pathelement path="${jdk.classes}" /> - <pathelement path="${java.class.path}" /> </classpath> </javac> </target> - <target name="compile-jdk" depends="compile-core" - description="Compile all the java files for included libraries"> + <target name="compile-jdk" + depends="compile-core" + description="Compile all the java files for included libraries"> <mkdir dir="${jdk.classes}" /> <javac destdir="${jdk.classes}" debug="${debug}" - deprecation="${deprecation}" verbose="false" - optimize="${optimize}"> + verbose="false" + optimize="${optimize}"> <src path="${src.jdk.dir}/${jdk.version}" /> <src path="${src.jdk.dir}/common" /> @@ -167,8 +152,10 @@ </javac> </target> - <target name="compile-j2ee" depends="compile-jdk" if="j2ee.version" - description="Compile all the java files for included libraries"> + <target name="compile-j2ee" + depends="compile-jdk" + if="j2ee.version" + description="Compile all the java files for included libraries"> <mkdir dir="${j2ee.classes}" /> @@ -190,59 +177,65 @@ </javac> </target> - <target name="compile-ext-httpclient" depends="compile-jdk" if="httpclient" - description="Compile all the java files for included libraries"> - - <mkdir dir="${httpclient.classes}" /> - - <javac destdir="${httpclient.classes}" debug="${debug}" - deprecation="${deprecation}" verbose="false" - optimize="${optimize}"> - - <src path="${src.httpclient.dir}"/> - <include name="com/mockobjects/apache/**"/> - <include name="alt/org/apache/**"/> - - <classpath> - <path refid="lib.classpath" /> - <pathelement path="${java.class.path}" /> - <pathelement path="${core.classes}" /> - <pathelement path="${jdk.classes}" /> - </classpath> - </javac> - </target> - - <target name="test" depends="call-me-first, compile-test" - description="run the junit tests"> + <target name="junit" + depends="call-me-first, compile-j2ee" + description="run the junit tests"> <junit fork="yes" haltonfailure="yes"> <classpath> <path refid="lib.classpath" /> - + <pathelement location="${j2ee.classes}" /> <pathelement location="${jdk.classes}" /> - <pathelement location="${core.classes}" /> - <pathelement path="${java.class.path}" /> </classpath> <formatter type="plain" usefile="false" /> <batchtest> - <fileset dir="${jdk.classes}"> - <include name="**/*Test.class" /> - - <include name="**/AllTests.class" /> + <fileset dir="${core.classes}"> + <include name="test/**Test*.class" /> + <exclude name="test/**Test*$*.class" /> + <exclude name="**/AllTests.class" /> </fileset> - <fileset dir="${core.classes}"> - <include name="**/*Test.class" /> + <fileset dir="${jdk.classes}"> + <include name="test/**Test*.class" /> + <exclude name="test/**Test*$*.class" /> + <exclude name="**/AllTests.class" /> + </fileset> - <include name="**/AllTests.class" /> + <fileset dir="${j2ee.classes}"> + <include name="test/**Test*.class" /> + <exclude name="test/**Test*$*.class" /> + <exclude name="**/AllTests.class" /> </fileset> </batchtest> </junit> </target> + <target name="compile-ext-httpclient" + depends="compile-jdk" + if="httpclient" + description="Compile all the java files for included libraries"> + <mkdir dir="${httpclient.classes}" /> + + <javac destdir="${httpclient.classes}" debug="${debug}" + deprecation="${deprecation}" verbose="false" + optimize="${optimize}"> + + <src path="${src.httpclient.dir}"/> + <include name="com/mockobjects/apache/**"/> + <include name="alt/org/apache/**"/> + + <classpath> + <path refid="lib.classpath" /> + <pathelement path="${java.class.path}" /> + <pathelement path="${core.classes}" /> + <pathelement path="${jdk.classes}" /> + </classpath> + </javac> + </target> + <target name="copy-nonjava-files" depends="source-locations, check-availabilities, call-me-first"> </target> @@ -251,54 +244,63 @@ depends="jar-core, jar-jdk, jar-j2ee"/> <target name="jar-core" - depends="deliverable-names, test" + depends="deliverable-names, junit" description="Generate core mockobjects jar"> <jar jarfile="${out.dir}/${jar.base.name}-core.jar" manifest="${conf.dir}/manifest"> - <fileset dir="${core.classes}" /> + <fileset dir="${core.classes}"> + <exclude name="test/**"/> + </fileset> </jar> </target> <target name="jar-jdk" - depends="deliverable-names, test" + depends="deliverable-names, junit" description="Generate jdk mockobjects jar"> <antcall target="_inner-jar"> - <param name="jarfile.name" value="${out.dir}/${jar.base.name}-jdk${jdk.version}.jar" /> - <param name="alt.jarfile.name" value="${out.dir}/${alt.jar.base.name}-jdk${jdk.version}.jar" /> + <param name="jarfile.name" + value="${out.dir}/${jar.base.name}-jdk${jdk.version}.jar" /> + <param name="alt.jarfile.name" + value="${out.dir}/${alt.jar.base.name}-jdk${jdk.version}.jar" /> <param name="classes.dir" value="${jdk.classes}" /> </antcall> </target> <target name="jar-j2ee" - depends="deliverable-names, test" + depends="deliverable-names, junit" if="j2ee.version" description="Generate j2ee mockobjects jar"> <antcall target="_inner-jar"> - <param name="jarfile.name" value="${out.dir}/${jar.base.name}-j${jdk.version}-j2ee${j2ee.version}.jar" /> - <param name="alt.jarfile.name" value="${out.dir}/${alt.jar.base.name}-j${jdk.version}-j2ee${j2ee.version}.jar" /> + <param name="jarfile.name" + value="${out.dir}/${jar.base.name}-j${jdk.version}-j2ee${j2ee.version}.jar" /> + <param name="alt.jarfile.name" + value="${out.dir}/${alt.jar.base.name}-j${jdk.version}-j2ee${j2ee.version}.jar" /> <param name="classes.dir" value="${j2ee.classes}" /> </antcall> </target> <target name="_inner-jar" - depends="deliverable-names, test" > + depends="deliverable-names, junit" > <!-- requires jarfile.name, alt.jarfile.name, classes.dir --> <jar jarfile="${jarfile.name}" manifest="${conf.dir}/manifest"> <fileset dir="${classes.dir}"> <exclude name="alt/**"/> + <exclude name="test/**"/> </fileset> </jar> <jar jarfile="${alt.jarfile.name}" manifest="${conf.dir}/manifest"> <fileset dir="${classes.dir}"> <include name="alt/**"/> + <exclude name="test/**"/> </fileset> </jar> </target> - <target name="jar-ext-httpclient" depends="test, compile-ext-httpclient" - description="Generate extention mockobjects jar"> + <target name="jar-ext-httpclient" + depends="junit, compile-ext-httpclient" + description="Generate extension mockobjects jar"> <jar jarfile="${out.dir}/mockobjects-httpclient.jar" manifest="${conf.dir}/manifest"> <fileset dir="${httpclient.classes}"> @@ -314,15 +316,16 @@ </target> <target name="javadoc" - depends="call-me-first, deliverable-names" - unless="javadoc.notrequired" - description="Generate the javadoc for the current version"> - <javadoc - packagenames="com.mockobjects.*,alt.*" destdir="${out.javadoc.dir}" - author="true" public="true" version="true" use="true" - windowtitle="${project.fullname} ${project.version}" - doctitle="${project.fullname} ${project.version}" - bottom="Copyright &copy; ${year} Mock Objects. All Rights Reserved."> + depends="call-me-first, deliverable-names" + unless="javadoc.notrequired" + description="Generate the javadoc for the current version"> + <javadoc packagenames="com.mockobjects.*,alt.*" + destdir="${out.javadoc.dir}" + author="true" + public="true" version="true" use="true" + windowtitle="${project.fullname} ${project.version}" + doctitle="${project.fullname} ${project.version}" + bottom="Copyright &copy; ${year} Mock Objects. All Rights Reserved."> <classpath> <path refid="lib.classpath" /> @@ -344,7 +347,7 @@ </group> <group title="Utils" packages="com.mockobjects.util"/> <group title="Alternative" packages="alt.*"/> - <group title="Tests" packages="com.mockobjects.test"/> + <group title="Tests" packages="test.mockobjects"/> </javadoc> </target> @@ -523,8 +526,8 @@ ======================================================================== --> <target name="all" - depends="clean, test, jar, doc, dist" - description="do it all (clean, jar, doc, test)"> + depends="clean, junit, jar, doc, dist" + description="do it all (clean, jar, doc, junit, dist)"> </target> <!-- |