adammurdoch 2002/10/24 03:05:42 Modified: vfs build.xml gump.xml Log: Regenerated build.xml and gump.xml. Revision Changes Path 1.5 +59 -61 jakarta-commons-sandbox/vfs/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/vfs/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- build.xml 23 Oct 2002 01:46:06 -0000 1.4 +++ build.xml 24 Oct 2002 10:05:42 -0000 1.5 @@ -11,7 +11,7 @@ <property name="final.name" value="commons-vfs-1.0-dev"></property> <target name="init" description="o Initializes some properties"> - + <mkdir dir="lib"></mkdir> <condition property="noget"> <equals arg2="only" arg1="${build.sysclasspath}"></equals> </condition> @@ -33,27 +33,10 @@ </javac> - - - - <copy todir="${classesdir}"> - - - - <fileset dir="${basedir}"> - - - <include name="**/*.properties"></include> - - - </fileset> - </copy> - - </target> - <target name="jar" description="o Create the jar" depends="compile,compile-tests"> + <target name="jar" description="o Create the jar" depends="compile,test"> <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar> @@ -71,56 +54,71 @@ </copy> </target> - <target name="test" description="o Run the test cases" depends="compile-tests"> - <mkdir dir="${testreportdir}"></mkdir> - <junit dir="./" printSummary="yes" fork="true" haltonerror="true"> - <sysproperty key="basedir" value="src/test"></sysproperty> - <formatter type="xml"></formatter> - <formatter usefile="true" type="plain"></formatter> - <classpath> - <fileset dir="lib"> - <include name="*.jar"></include> - </fileset> - <pathelement location="${classesdir}"></pathelement> - <pathelement path="${testclassesdir}"></pathelement> - </classpath> - <batchtest todir="${testreportdir}"> - <fileset dir="src/test"> - - <include name="**/test/*TestCase.java"></include> + <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test"> + <fail message="There were test failures."></fail> + </target> + <target name="internal-test" depends="compile-tests"> + + <mkdir dir="${testreportdir}"></mkdir> + <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true"> + <sysproperty key="basedir" value="src/test"></sysproperty> + <formatter type="xml"></formatter> + <formatter usefile="true" type="plain"></formatter> + <classpath> + <fileset dir="lib"> + <include name="*.jar"></include> + </fileset> + <pathelement path="${testclassesdir}"></pathelement> + <pathelement path="${classesdir}"></pathelement> + </classpath> + <batchtest todir="${testreportdir}"> + <fileset dir="src/test"> + + <include name="**/test/*TestCase.java"></include> + + + <exclude name="**/test/Abstract*TestCase.java"></exclude> + + + + - <exclude name="**/test/Abstract*TestCase.java"></exclude> + <exclude name="**/*.java"></exclude> - </fileset> - </batchtest> - </junit> + + </fileset> + </batchtest> + </junit> + </target> <target name="compile-tests" depends="compile"> - <mkdir dir="${testclassesdir}"></mkdir> - <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> - <src> - <pathelement location="src/test"></pathelement> - </src> - <classpath> - <fileset dir="lib"> - <include name="*.jar"></include> - </fileset> - <pathelement location="${classesdir}"></pathelement> - </classpath> - </javac> - + <mkdir dir="${testclassesdir}"></mkdir> + <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> + <src> + <pathelement location="src/test"></pathelement> + </src> + <classpath> + <fileset dir="lib"> + <include name="*.jar"></include> + </fileset> + <pathelement path="${classesdir}"></pathelement> + </classpath> + </javac> + + - - - <copy todir="${testclassesdir}"> - <fileset dir="src/test"> + + <copy todir="${testclassesdir}"> + <fileset dir="src/test"> + + + </fileset> + </copy> - </fileset> - </copy> </target> @@ -151,7 +149,6 @@ <target name="get-deps" unless="noget" depends="init"> - <mkdir dir="lib"></mkdir> <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get> <get dest="lib/junit-3.7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.jar"></get> @@ -160,7 +157,8 @@ <get dest="lib/jcifs-0.6.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/jcifs/jars/jcifs-0.6.5.jar"></get> <get dest="lib/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"></get> - + <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get> + <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"></get> </target> 1.2 +29 -40 jakarta-commons-sandbox/vfs/gump.xml Index: gump.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/vfs/gump.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gump.xml 23 Oct 2002 01:46:06 -0000 1.1 +++ gump.xml 24 Oct 2002 10:05:42 -0000 1.2 @@ -1,49 +1,38 @@ <?xml version="1.0" encoding="UTF-8"?> <module name="commons-vfs"> - <description>Commons CFS</description> - <url href="http://jakarta.apache.org/commons/sandbox/vfs/"></url> - - <cvs repository="jakarta"></cvs> - - - - + <url href="http://jakarta.apache.org/commons/sandbox/vfs/"> + </url> + <cvs module="jakarta-commons-sandbox/vfs" repository="jakarta"> + </cvs> <project name="commons-vfs"> - - - <ant buildfile="build.xml" target="dist"> - <property name="maven.final.name" value="commons-vfs-@@DATE@@"></property> + <property name="final.name" value="commons-vfs-@@DATE@@"> + </property> </ant> - <package>org.apache.commons.vfs</package> - - - <depend project="jakarta-ant"></depend> - <depend project="xml-xerces"></depend> - - - <depend project="ant"></depend> - - <depend project="junit"></depend> - - <depend project="commons-net"></depend> - - <depend project="commons-logging"></depend> - - <depend project="jcifs"></depend> - - - <work nested="target/classes"></work> - <home nested="target"></home> - <jar name="commons-vfs-@@DATE@@.jar"></jar> - <javadoc nested="docs/apidocs"></javadoc> - - <nag to="[EMAIL PROTECTED]" from="Adam Murdoch <[EMAIL PROTECTED]>"></nag> - + <depend project="commons-logging"> + </depend> + <depend project="commons-net"> + </depend> + <depend project="jakarta-ant"> + </depend> + <depend project="jcifs"> + </depend> + <depend project="junit"> + </depend> + <depend project="xml-xerces"> + </depend> + <work nested="target/classes"> + </work> + <home nested="target"> + </home> + <jar name="commons-vfs-@@DATE@@.jar"> + </jar> + <javadoc module="jakarta-commons-sandbox" nested="target/docs/apidocs"> + </javadoc> + <nag to="[EMAIL PROTECTED]" from="commons-vfs development <[EMAIL PROTECTED]>"> + </nag> </project> - -</module> - \ No newline at end of file +</module> \ No newline at end of file
-- To unsubscribe, e-mail: <mailto:commons-dev-unsubscribe@;jakarta.apache.org> For additional commands, e-mail: <mailto:commons-dev-help@;jakarta.apache.org>