antlets/junit/src xbuild.xml,1.5,1.6 tasks.properties,1.1,NONE
[email protected] Fri, 05 Mar 2004 08:59:53 -0800
| Newsgroups | gmane.comp.krysalis.metamorphosis.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/metamorphosis/antlets/junit/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10376/junit/src
Modified Files:
xbuild.xml
Removed Files:
tasks.properties
Log Message:
antlet standardisation
Index: xbuild.xml
===================================================================
RCS file: /cvsroot/metamorphosis/antlets/junit/src/xbuild.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xbuild.xml 4 Mar 2004 12:51:48 -0000 1.5
--- xbuild.xml 5 Mar 2004 16:59:38 -0000 1.6
***************
*** 5,40 ****
</description>
<import file="usage.xml"/>
! <!-- =================================================================== -->
! <!-- ================ Properties for this antlet ===================== -->
! <!-- ============== build the environment for jUnit ==================== -->
! <!-- =================================================================== -->
! <target name="-junit.set-props">
<property name="junit-antlet:junitjar" value="junit-3.8.1.jar"/>
<dirname property="junit-antlet:dir" file="${ant.file.junit.antlet}"/>
<property name="junit-antlet:build.dir" value="${project.build.dir}/junit"/>
- <property name="junit-antlet:repository" value="http://www.ibiblio.org/maven/junit/jars/"/>
<property name="junit-antlet:docs.dir" value="${build.dir}/documentation/content/junit"/>
- <!-- property name="junit-antlet:build.dir.passdown" value="${junit-antlet:build.dir}"/ -->
<property name="junit-antlet:work.dir" value="${work.dir}/junit"/>
- <!-- build the directories -->
- <mkdir dir="${junit-antlet:docs.dir}"/>
- <mkdir dir="${junit-antlet:build.dir}"/>
- <mkdir dir="${junit-antlet:work.dir}"/>
- <mkdir dir="${junit-antlet:dir}/lib"/>
- <mkdir dir="${junit-antlet:build.dir}/results"/>
- <mkdir dir="${junit-antlet:build.dir}/classes"/>
</target>
<!-- =================================================================== -->
! <!-- ============ Compiles the jUnit sourcecode ======================== -->
! <!-- =================================================================== -->
! <target name="junit.compile" description="Compiles the jUnit sourcecode"
! depends="-junit.init, -junit.compile" />
!
! <!-- =================================================================== -->
! <!-- Performs jUnit tests. -->
<!-- =================================================================== -->
! <target name="junit.test" description="Performs jUnit tests."
! depends="-junit.init, -junit.test"/>
<!-- =================================================================== -->
--- 5,67 ----
</description>
<import file="usage.xml"/>
!
! <!-- ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -->
! <!-- Sets the properties for this antlet -->
! <!-- ''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -->
! <target name="-junit.init" description="Sets the properties for this antlet">
<property name="junit-antlet:junitjar" value="junit-3.8.1.jar"/>
+ <property name="junit-antlet:repository" value="http://www.ibiblio.org/maven/junit/jars/"/>
<dirname property="junit-antlet:dir" file="${ant.file.junit.antlet}"/>
<property name="junit-antlet:build.dir" value="${project.build.dir}/junit"/>
<property name="junit-antlet:docs.dir" value="${build.dir}/documentation/content/junit"/>
<property name="junit-antlet:work.dir" value="${work.dir}/junit"/>
</target>
<!-- =================================================================== -->
! <!-- Add the sysproperty elements in properties.xml to the properties. -->
! <!-- Compile the source code -->
! <!-- Compile the jUnit test source code -->
! <!-- Perform jUnit tests. -->
<!-- =================================================================== -->
! <target name="junit.test"
! description="Perform jUnit tests."
! depends="-junit.init, -junit.check-env, -junit.mkdir, compile">
!
! <!-- Initialising -->
! <echo message="Testing..."/>
! <property name="junit.test.haltonfailure" value="yes"/>
! <property name="testcase" value=""/>
!
! <!-- Compile tests -->
! <copy todir="${junit-antlet:build.dir}/classes">
! <fileset dir="${project.test.dir}">
! <exclude name="**/*.java"/> <!-- was include *.properties -->
! </fileset>
! </copy>
!
! <javac srcdir="${project.test.dir}"
! destdir="${junit-antlet:build.dir}/classes"
! debug= "${build.compiler.debug}"
! optimize= "${build.compiler.optimize}"
! deprecation="${build.compiler.deprecation}"
! target= "${build.compiler.vm}"
! source= "${build.compiler.source}"
! nowarn= "false">
! <classpath>
! <pathelement location="${project.build.dir}/classes/" />
! <path refid="${project.name}.classpath"/>
! </classpath>
! </javac>
!
! <!-- create property file to be used by junit antlet -->
! <xslt in="properties.xml" out="${junit-antlet:work.dir}/test.xml"
! style="${junit-antlet:dir}/resources/stylesheets/test.xsl"
! force="true">
! <param name="testcase" expression="${testcase}"/>
! <param name="projectName" expression="${project.name}"/>
! </xslt>
! <ant antfile="${junit-antlet:work.dir}/test.xml" inheritRefs="true"/>
! </target>
!
<!-- =================================================================== -->
***************
*** 42,47 ****
<!-- =================================================================== -->
<target name="junit.report" description="Performs jUnit tests and generates reports"
! depends="-junit.init, -junit.failsafe-test, -junit.test">
!
<junitreport todir="${junit-antlet:work.dir}">
--- 69,73 ----
<!-- =================================================================== -->
<target name="junit.report" description="Performs jUnit tests and generates reports"
! depends="-junit.failsafe-test, junit.test">
<junitreport todir="${junit-antlet:work.dir}">
***************
*** 53,95 ****
</target>
- <!-- =================================================================== -->
- <!-- Prints a list of possible tasks for this antlet -->
- <!-- =================================================================== -->
- <target name="junit.list" description="Prints a list of possible tasks for this antlet">
- <echo>
- ------------------------------------------------------------------
- -------- List of possible targets for junit antlet ----------
- ------------------------------------------------------------------
- - junit.report - Perform jUnit tests and generate reports
- - junit.list - Print this list
- - junit.test - Perform jUnit tests
- - junit.compile - Compile the test sources
- ------------------------------------------------------------------
- </echo>
- </target>
-
- <!-- =================================================================== -->
- <!-- ========= Initialise jUnit environment ============================ -->
- <!-- =================================================================== -->
- <target name="-junit.init" depends="-junit.set-props, -junit.check-env">
- <!-- Classpath for my jars -->
- <path id="junit.classpath">
- <fileset dir="${junit-antlet:dir}/lib/">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <taskdef file="${junit-antlet:dir}/tasks.properties" classpathref="junit.classpath"/>
- </target>
-
<!-- =================================================================== -->
! <!-- Checks the envoironment for this antlet -->
<!-- =================================================================== -->
! <target name="-junit.check-env" description="Checks the envoironment for this antlet"
! depends="-junit.check-not-present-in-ant-lib
! , -junit.check-fail
! " />
!
! <target name="-junit.check-not-present-in-ant-lib">
<condition property="junit-antlet:check-fail" value="true">
<not>
--- 79,110 ----
</target>
<!-- =================================================================== -->
! <!-- Clean up for this antlet. -->
<!-- =================================================================== -->
! <target name="junit.clean" description="Clean up for this antlet."
! depends="-junit.init">
! <!-- clean up the directories -->
! <delete dir="${junit-antlet:docs.dir}"/>
! <delete dir="${junit-antlet:build.dir}"/>
! <delete dir="${junit-antlet:work.dir}"/>
! <delete dir="${junit-antlet:build.dir}/results"/>
! <delete dir="${junit-antlet:build.dir}/classes"/>
! </target>
!
! <!-- '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -->
! <!-- Initialise jUnit environment -->
! <!-- '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -->
! <target name="-junit.mkdir" depends="-junit.init">
! <mkdir dir="${junit-antlet:docs.dir}"/>
! <mkdir dir="${junit-antlet:build.dir}"/>
! <mkdir dir="${junit-antlet:work.dir}"/>
! <mkdir dir="${junit-antlet:build.dir}/results"/>
! <mkdir dir="${junit-antlet:build.dir}/classes"/>
! </target>
!
! <!-- '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -->
! <!-- Checks the environment for this antlet -->
! <!-- '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -->
! <target name="-junit.check-env" description="Checks the environment for this antlet">
<condition property="junit-antlet:check-fail" value="true">
<not>
***************
*** 97,107 ****
</not>
</condition>
! </target>
!
! <!-- =================================================================== -->
! <!-- Print the FAIL message and fail -->
! <!-- =================================================================== -->
! <target name="-junit.check-fail" if="junit-antlet:check-fail">
! <fail>
*******************************************************************************
--- 112,117 ----
</not>
</condition>
!
! <fail if="junit-antlet:check-fail">
*******************************************************************************
***************
*** 116,215 ****
*
*******************************************************************************
! </fail>
! </target>
!
! <!-- =================================================================== -->
! <!-- Download the jar if necessary -->
! <!-- Not used anymore. There are too many dependencies on jars in the anthome/lib directory -->
! <target name="-junit.getjar" description="download the jar if necessary">
! <get
! src="${junit-antlet:repository}${junit-antlet:junitjar}"
! dest="${junit-antlet:dir}/lib/${junit-antlet:junitjar}"
! verbose="true" usetimestamp="true"/>
</target>
!
! <!-- ===================================================================
! Turn off halt-on-failure to perform jUnit tests without failing;
! important to make it possible to generate a report on the failings
! -->
! <target name="-junit.failsafe-test"
! description="Perform jUnit tests without failing; important to make it possible to generate a report on the failings">
<property name="junit.test.haltonfailure" value="no"/>
- <!-- antcall target="junit.test"/-->
- </target>
-
- <!-- =================================================================== -->
- <!-- Perform jUnit tests. Add the junit-antlet:extra.sysproperty elements in
- properties.xml to add sys properties. -->
- <!-- =================================================================== -->
- <target name="-junit.test"
- description="Perform jUnit tests. Add the junit-antlet:extra.sysproperty
- elements in properties.xml to add sys properties."
- depends=" compile, -junit.compile">
- <!-- Initialising -->
- <echo message="Testing..."/>
- <property name="junit.test.haltonfailure" value="yes"/>
- <property name="testcase" value=""/>
-
- <!-- create property file to be used by junit antlet -->
- <xslt in="properties.xml" out="${junit-antlet:work.dir}/test.xml"
- style="${junit-antlet:dir}/resources/stylesheets/test.xsl"
- force="true">
- <param name="testcase" expression="${testcase}"/>
- <param name="projectName" expression="${project.name}"/>
- </xslt>
-
- <ant antfile="${junit-antlet:work.dir}/test.xml" inheritRefs="true"/>
-
- </target>
-
- <!-- ===================================================================
- Compile the source code of the test files
- -->
- <target name="-junit.compile" description="Compile tests" depends="-junit.init">
- <!-- Compile tests -->
- <copy todir="${junit-antlet:build.dir}/classes">
- <fileset dir="${project.test.dir}">
- <exclude name="**/*.java"/> <!-- was include *.properties -->
- </fileset>
- </copy>
-
- <javac srcdir="${project.test.dir}"
- destdir="${junit-antlet:build.dir}/classes"
- debug= "${build.compiler.debug}"
- optimize= "${build.compiler.optimize}"
- deprecation="${build.compiler.deprecation}"
- target= "${build.compiler.vm}"
- source= "${build.compiler.source}"
- nowarn= "false">
- <classpath>
- <pathelement location="${project.build.dir}/classes/" />
- <path refid="${project.name}.classpath"/>
- <path refid="junit.classpath"/>
- </classpath>
- </javac>
</target>
! <!-- =================================================================== -->
! <!-- =========== prints the settings of used properties ================ -->
! <!-- =================================================================== -->
! <!-- target name="junit-check" description="prints the settings of used properties"
! depends="-junit.init">
! <echo>
! ant.home ${ant.home}
! ant.lib.dir ${ant.lib.dir}
! antlets.dir ${antlets.dir}
! project.test.dir ${project.test.dir}
! junit-antlet:dir ${junit-antlet:dir}
! junit-antlet:build.dir ${junit-antlet:build.dir}
! junit-antlet:docs.dir ${junit-antlet:docs.dir}
! junit-antlet:work.dir ${junit-antlet:work.dir}
! build.compiler.debug ${build.compiler.debug}
! build.compiler.optimize ${build.compiler.optimize}
! build.compiler.vm ${build.compiler.vm}
! basedir ${basedir}
! </echo>
!
</target -->
!
</project>
--- 126,146 ----
*
*******************************************************************************
! </fail>
!
</target>
!
! <!-- '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -->
! <!-- Turn off halt-on-failure to perform jUnit tests without failing. -->
! <!-- Important to enable generating a report on the failed tests -->
! <!-- '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -->
! <target name="-junit.failsafe-test" >
<property name="junit.test.haltonfailure" value="no"/>
</target>
! <!-- '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -->
! <!-- Compile the source code of the test files -->
! <!-- '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' -->
! <!--target name="-junit.compile" description="Compile test sources" >
</target -->
!
</project>
--- tasks.properties DELETED ---
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click