mdiggory 2004/06/01 16:55:31
Modified: math project.xml build.xml
Log:
Removed Dependency on BeanUtils and regenereated build.xml to reflect changes.
Revision Changes Path
1.45 +1 -5 jakarta-commons/math/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/math/project.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- project.xml 24 Apr 2004 18:40:22 -0000 1.44
+++ project.xml 1 Jun 2004 23:55:31 -0000 1.45
@@ -121,10 +121,6 @@
</contributors>
<dependencies>
<dependency>
- <id>commons-beanutils</id>
- <version>1.6.1</version>
- </dependency>
- <dependency>
<id>commons-collections</id>
<version>3.0</version>
</dependency>
1.15 +98 -76 jakarta-commons/math/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/math/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 24 Apr 2004 18:40:22 -0000 1.14
+++ build.xml 1 Jun 2004 23:55:31 -0000 1.15
@@ -1,48 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright 2003-2004 The Apache Software Foundation
+<!--build.xml generated by maven from project.xml version 1.0-dev
+ on date June 1 2004, time 1737-->
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
<project default="jar" name="commons-math" basedir=".">
- <property name="defaulttargetdir" value="target"/>
- <property name="libdir" value="target/lib"/>
- <property name="classesdir" value="target/classes"/>
- <property name="testclassesdir" value="target/test-classes"/>
- <property name="testreportdir" value="target/test-reports"/>
- <property name="distdir" value="dist"/>
- <property name="javadocdir" value="dist/docs/api"/>
- <property name="final.name" value="commons-math-1.0-dev"/>
-
+ <property name="defaulttargetdir" value="target">
+ </property>
+ <property name="libdir" value="target/lib">
+ </property>
+ <property name="classesdir" value="target/classes">
+ </property>
+ <property name="testclassesdir" value="target/test-classes">
+ </property>
+ <property name="testreportdir" value="target/test-reports">
+ </property>
+ <property name="distdir" value="dist">
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+ <property name="final.name" value="commons-math-1.0-dev">
+ </property>
<target name="init" description="o Initializes some properties">
- <mkdir dir="${libdir}"/>
+ <mkdir dir="${libdir}">
+ </mkdir>
<condition property="noget">
<equals arg2="only" arg1="${build.sysclasspath}">
</equals>
</condition>
</target>
-
<target name="compile" description="o Compile the code" depends="get-deps">
- <mkdir dir="${classesdir}"/>
+ <mkdir dir="${classesdir}">
+ </mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false"
excludes="**/package.html">
<src>
<pathelement location="src/java"/>
</src>
<classpath>
<fileset dir="${libdir}">
- <include name="*.jar"/>
+ <include name="*.jar">
+ </include>
</fileset>
</classpath>
</javac>
@@ -53,93 +49,119 @@
</fileset>
</copy>
</target>
-
- <target name="jar" description="Create the jar" depends="compile,test">
- <mkdir dir="${classesdir}/META-INF"/>
- <copy file="LICENSE.txt" tofile="${classesdir}/META-INF/LICENSE.txt"/>
- <copy file="NOTICE.txt" tofile="${classesdir}/META-INF/NOTICE.txt"/>
- <jar jarfile="target/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}"/>
+ <target name="jar" description="o Create the jar" depends="compile,test">
+ <jar jarfile="target/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}">
+ </jar>
</target>
-
<target name="clean" description="o Clean up the generated directories">
- <delete dir="${defaulttargetdir}"/>
- <delete dir="${distdir}"/>
+ <delete dir="${defaulttargetdir}">
+ </delete>
+ <delete dir="${distdir}">
+ </delete>
</target>
-
<target name="dist" description="o Create a distribution" depends="jar, javadoc">
- <mkdir dir="dist"/>
+ <mkdir dir="dist">
+ </mkdir>
<copy todir="dist">
- <fileset dir="${defaulttargetdir}" includes="*.jar"/>
- <fileset dir="${basedir}" includes="LICENSE*, README*"/>
+ <fileset dir="${defaulttargetdir}" includes="*.jar">
+ </fileset>
+ <fileset dir="${basedir}" includes="LICENSE*, README*">
+ </fileset>
</copy>
</target>
-
<target name="test" description="o Run the test cases" if="test.failure"
depends="internal-test">
- <fail message="There were test failures."/>
+ <fail message="There were test failures.">
+ </fail>
</target>
-
<target name="internal-test" depends="compile-tests">
- <mkdir dir="${testreportdir}"/>
+ <mkdir dir="${testreportdir}">
+ </mkdir>
<junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true"
haltonerror="true">
- <sysproperty key="basedir" value="."/>
- <formatter type="xml"/>
- <formatter usefile="false" type="plain"/>
+ <sysproperty key="basedir" value=".">
+ </sysproperty>
+ <formatter type="xml">
+ </formatter>
+ <formatter usefile="false" type="plain">
+ </formatter>
<classpath>
<fileset dir="${libdir}">
- <include name="*.jar"/>
+ <include name="*.jar">
+ </include>
</fileset>
- <pathelement path="${testclassesdir}"/>
- <pathelement path="${classesdir}"/>
+ <pathelement path="${testclassesdir}">
+ </pathelement>
+ <pathelement path="${classesdir}">
+ </pathelement>
</classpath>
<batchtest todir="${testreportdir}">
<fileset dir="src/test">
- <include name="**/*Test.java"/>
- <exclude name="**/*AbstractTest.java"/>
+ <include name="**/*Test.java">
+ </include>
+ <exclude name="**/*AbstractTest.java">
+ </exclude>
</fileset>
</batchtest>
</junit>
</target>
-
<target name="compile-tests" depends="compile">
- <mkdir dir="${testclassesdir}"/>
+ <mkdir dir="${testclassesdir}">
+ </mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
<src>
<pathelement location="src/test"/>
</src>
<classpath>
<fileset dir="${libdir}">
- <include name="*.jar"/>
+ <include name="*.jar">
+ </include>
</fileset>
- <pathelement path="${classesdir}"/>
+ <pathelement path="${classesdir}">
+ </pathelement>
</classpath>
</javac>
</target>
-
- <target name="javadoc" description="Generate javadoc" depends="jar">
- <mkdir dir="${javadocdir}"/>
+ <target name="javadoc" description="o Generate javadoc" depends="jar">
+ <mkdir dir="${javadocdir}">
+ </mkdir>
<tstamp>
- <format pattern="2003-yyyy" property="year"/>
+ <format pattern="2003-yyyy" property="year">
+ </format>
</tstamp>
- <property name="copyright" value="Copyright &copy; 2003-2004 The Apache
Software Foundation. All Rights Reserved."/>
- <property name="title" value="Math 0.1 API"/>
- <javadoc bottom="Copyright &copy; 2003-2004 The Apache Software Foundation.
All Rights Reserved." windowtitle="Math 0.1 API" use="true" private="true"
destdir="${javadocdir}" author="true" doctitle="Math 0.1 API" version="true"
sourcepath="src/java" packagenames="org.apache.commons.*.*">
+ <property name="copyright" value="Copyright &copy; The Apache Software
Foundation. All Rights Reserved.">
+ </property>
+ <property name="title" value="Math 1.0-dev API">
+ </property>
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="/home/mdiggory/workspace/jakarta-commons/math/src/java"
packagenames="org.apache.commons.math.*">
<classpath>
<fileset dir="${libdir}">
- <include name="*.jar"/>
+ <include name="*.jar">
+ </include>
</fileset>
- <pathelement location="target/${final.name}.jar"/>
+ <pathelement location="target/${final.name}.jar">
+ </pathelement>
</classpath>
</javadoc>
</target>
-
<target name="get-deps" unless="noget" depends="init">
- <get dest="${libdir}/commons-beanutils-1.6.1.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/commons-beanutils/jars/commons-beanutils-1.6.1.jar"/>
- <get dest="${libdir}/commons-collections-3.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/commons-collections/jars/commons-collections-3.0.jar"/>
- <get dest="${libdir}/commons-lang-2.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/commons-lang/jars/commons-lang-2.0.jar"/>
- <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/commons-logging/jars/commons-logging-1.0.3.jar"/>
- <get dest="${libdir}/commons-discovery-0.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/commons-discovery/jars/commons-discovery-0.2.jar"/>
- <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 dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/ant/jars/ant-1.5.jar"/>
- <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/ant/jars/ant-optional-1.5.jar"/>
+ <get dest="${libdir}/commons-collections-3.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/commons-collections/jars/commons-collections-3.0.jar";>
+ </get>
+ <get dest="${libdir}/commons-lang-2.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/commons-lang/jars/commons-lang-2.0.jar";>
+ </get>
+ <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/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.apache.org/dist/java-repository/commons-discovery/jars/commons-discovery-0.2.jar";>
+ </get>
+ <get dest="${libdir}/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/junit/jars/junit-3.8.1.jar";>
+ </get>
+ <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/ant/jars/ant-1.5.jar";>
+ </get>
+ <get dest="${libdir}/ant-optional-1.5.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.apache.org/dist/java-repository/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">
+ </get>
+ <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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
