You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ba...@apache.org on 2006/09/19 07:26:21 UTC
svn commit: r447743 - /jakarta/commons/sandbox/csv/trunk/build.xml
Author: bayard
Date: Mon Sep 18 22:26:20 2006
New Revision: 447743
URL: http://svn.apache.org/viewvc?view=rev&rev=447743
Log:
Regenerated the ant file using 'maven ant' to fix #SANDBOX-172
Modified:
jakarta/commons/sandbox/csv/trunk/build.xml
Modified: jakarta/commons/sandbox/csv/trunk/build.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/sandbox/csv/trunk/build.xml?view=diff&rev=447743&r1=447742&r2=447743
==============================================================================
--- jakarta/commons/sandbox/csv/trunk/build.xml (original)
+++ jakarta/commons/sandbox/csv/trunk/build.xml Mon Sep 18 22:26:20 2006
@@ -1,44 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--build.xml generated by maven from project.xml version 0.1-dev
- on date May 4 2006, time 2356-->
+<!--build.xml generated by maven from project.xml version 0.1-SNAPSHOT
+ on date September 18 2006, time 2225-->
<project default="jar" name="commons-csv" basedir=".">
- <!--Load local and user build preferences-->
-
- <property file="build.properties">
- </property>
- <property file="${user.home}/build.properties">
- </property>
- <!--Build properties-->
-
- <property name="defaulttargetdir" value="${basedir}/target">
- </property>
- <property name="libdir" value="${user.home}/.maven/repository">
- </property>
- <property name="classesdir" value="${basedir}/target/classes">
+ <property name="defaulttargetdir" value="target">
</property>
- <property name="testclassesdir" value="${basedir}/target/test-classes">
+ <property name="libdir" value="target/lib">
</property>
- <property name="testreportdir" value="${basedir}/target/test-reports">
+ <property name="classesdir" value="target/classes">
</property>
- <property name="distdir" value="${basedir}/dist">
+ <property name="testclassesdir" value="target/test-classes">
</property>
- <property name="javadocdir" value="${basedir}/dist/docs/api">
+ <property name="testclassesdir" value="target/test-classes">
</property>
- <property name="final.name" value="commons-csv-0.1-dev">
+ <property name="testreportdir" value="target/test-reports">
</property>
- <property name="proxy.host" value="">
+ <property name="distdir" value="dist">
</property>
- <property name="proxy.port" value="">
+ <property name="javadocdir" value="dist/docs/api">
</property>
- <property name="proxy.username" value="">
- </property>
- <property name="proxy.password" value="">
+ <property name="final.name" value="commons-csv-0.1-SNAPSHOT">
</property>
<path id="build.classpath">
- <pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
- </pathelement>
+ <fileset dir="${libdir}">
+ <include name="**/*.jar">
+ </include>
+ </fileset>
</path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}">
@@ -51,30 +39,26 @@
<available property="Junit.present" classname="junit.framework.Test">
</available>
- <!--Test if user defined a proxy-->
-
- <condition property="useProxy">
- <and>
- <isset property="proxy.host">
- </isset>
- <not>
- <equals trim="true" arg2="" arg1="${proxy.host}">
- </equals>
- </not>
- </and>
- </condition>
</target>
<target name="compile" description="o Compile the code" depends="get-deps">
<mkdir dir="${classesdir}">
</mkdir>
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
- <pathelement location="${basedir}/src/java">
+ <pathelement location="src/java">
</pathelement>
</src>
<classpath refid="build.classpath">
</classpath>
</javac>
+ <mkdir dir="${classesdir}/META-INF">
+ </mkdir>
+ <copy todir="${classesdir}/META-INF">
+ <fileset dir=".">
+ <include name="NOTICE.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}">
@@ -103,7 +87,7 @@
<target name="internal-test" if="Junit.present" depends="junit-present,compile-tests">
<mkdir dir="${testreportdir}">
</mkdir>
- <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
+ <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true">
<sysproperty key="basedir" value=".">
</sysproperty>
<formatter type="xml">
@@ -119,8 +103,8 @@
</pathelement>
</classpath>
<batchtest todir="${testreportdir}">
- <fileset dir="${basedir}/src/test">
- <include name="**/*Test*">
+ <fileset dir="src/test">
+ <include name="**/*Test.java">
</include>
</fileset>
</batchtest>
@@ -136,7 +120,7 @@
</mkdir>
<javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
<src>
- <pathelement location="${basedir}/src/test">
+ <pathelement location="src/test">
</pathelement>
</src>
<classpath>
@@ -154,43 +138,26 @@
<format pattern="2005-yyyy" property="year">
</format>
</tstamp>
- <property name="copyright" value="Copyright &copy; . All Rights Reserved.">
+ <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved.">
</property>
- <property name="title" value="Commons CSV 0.1-dev API">
+ <property name="title" value="Commons CSV 0.1-SNAPSHOT API">
</property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames=".*">
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.csv.*">
<classpath>
<path refid="build.classpath">
</path>
</classpath>
</javadoc>
</target>
- <target name="get-dep-junit.jar" description="o Download the dependency : junit.jar" unless="junit.jar" depends="init,setProxy,noProxy,get-custom-dep-junit.jar">
- <mkdir dir="${libdir}/junit/jars/">
- </mkdir>
- <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar">
- </get>
- </target>
- <target name="get-custom-dep-junit.jar" if="junit.jar" depends="init,setProxy,noProxy">
- <mkdir dir="${libdir}/junit/jars/">
- </mkdir>
- <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="${junit.jar}">
- </get>
- </target>
- <target name="get-deps" unless="noget" depends="get-dep-junit.jar">
- </target>
- <target name="setProxy" if="useProxy" depends="init">
+ <target name="get-deps" unless="noget" depends="init">
<!--Proxy settings works only with a JDK 1.2 and higher.-->
- <echo>Proxy used :</echo>
- <echo>Proxy host [${proxy.host}]</echo>
- <echo>Proxy port [${proxy.port}]</echo>
- <echo>Proxy user [${proxy.username}]</echo>
- <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}">
+ <setproxy>
</setproxy>
- </target>
- <target name="noProxy" unless="useProxy" depends="init">
- <echo>Proxy not used.</echo>
+ <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}/maven-xdoc-plugin-1.9.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/maven/plugins/maven-xdoc-plugin-1.9.2.jar">
+ </get>
</target>
<target name="install-maven">
<get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar">
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org