You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ps...@apache.org on 2004/08/15 22:23:33 UTC
cvs commit: jakarta-commons/math build.xml
psteitz 2004/08/15 13:23:33
Modified: math build.xml
Log:
Prepare for RC1.
Revision Changes Path
1.20 +34 -41 jakarta-commons/math/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/math/build.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- build.xml 11 Jul 2004 18:59:52 -0000 1.19
+++ build.xml 15 Aug 2004 20:23:33 -0000 1.20
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--build.xml generated by maven from project.xml version 1.0-dev
- on date June 24 2004, time 1543-->
+<!--build.xml generated by maven from project.xml version 1.0-RC1
+ on date August 15 2004, time 1249-->
<project default="jar" name="commons-math" basedir=".">
<property name="defaulttargetdir" value="target">
@@ -20,8 +20,14 @@
</property>
<property name="javadocdir" value="dist/docs/api">
</property>
- <property name="final.name" value="commons-math-1.0-dev">
+ <property name="final.name" value="commons-math-1.0-RC1">
</property>
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
+ </path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}">
</mkdir>
@@ -29,6 +35,10 @@
<equals arg2="only" arg1="${build.sysclasspath}">
</equals>
</condition>
+ <!--Test if JUNIT is present in ANT classpath-->
+
+ <available property="Junit.present" classname="junit.framework.Test">
+ </available>
</target>
<target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}">
@@ -38,21 +48,9 @@
<pathelement location="src/java">
</pathelement>
</src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <classpath refid="build.classpath">
</classpath>
</javac>
- <copy todir="${testclassesdir}">
- <fileset dir="src/test">
- <include name="**/*.xml">
- </include>
- <include name="**/*.txt">
- </include>
- </fileset>
- </copy>
</target>
<target name="jar" description="o Create the jar" depends="compile,test">
<jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
@@ -78,7 +76,7 @@
<fail message="There were test failures.">
</fail>
</target>
- <target name="internal-test" depends="compile-tests">
+ <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
<mkdir dir="${testreportdir}">
</mkdir>
<junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
@@ -89,10 +87,8 @@
<formatter usefile="false" type="plain">
</formatter>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${testclassesdir}">
</pathelement>
<pathelement path="${classesdir}">
@@ -108,7 +104,12 @@
</batchtest>
</junit>
</target>
- <target name="compile-tests" depends="compile">
+ <target name="junit-present" unless="Junit.present" depends="init">
+ <echo>================================= WARNING ================================</echo>
+ <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo>
+ <echo>==========================================================================</echo>
+ </target>
+ <target name="compile-tests" if="Junit.present" depends="junit-present,compile">
<mkdir dir="${testclassesdir}">
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
@@ -117,10 +118,8 @@
</pathelement>
</src>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${classesdir}">
</pathelement>
</classpath>
@@ -134,7 +133,7 @@
</fileset>
</copy>
</target>
- <target name="javadoc" description="o Generate javadoc">
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
<mkdir dir="${javadocdir}">
</mkdir>
<tstamp>
@@ -143,30 +142,24 @@
</tstamp>
<property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved.">
</property>
- <property name="title" value="Math 1.0-dev API">
+ <property name="title" value="Math 1.0-RC1 API">
</property>
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.math.*">
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
- <pathelement location="${defaulttargetdir}/${final.name}.jar">
- </pathelement>
+ <path refid="build.classpath">
+ </path>
</classpath>
</javadoc>
</target>
<target name="get-deps" unless="noget" depends="init">
+ <!--Proxy settings works only with a JDK 1.2 and higher.-->
+
+ <setproxy>
+ </setproxy>
<get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar">
</get>
<get dest="${libdir}/commons-discovery-0.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-discovery/jars/commons-discovery-0.2.jar">
</get>
- <get dest="${libdir}/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="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar">
- </get>
- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar">
- </get>
</target>
<target name="install-maven">
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
@@ -174,4 +167,4 @@
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
</unjar>
</target>
-</project>
+</project>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org