Author: bayard
Date: Fri Mar 3 15:00:49 2006
New Revision: 382955
URL: http://svn.apache.org/viewcvs?rev=382955&view=rev
Log:
Updating the build file
Modified:
jakarta/commons/proper/cli/trunk/build.xml
Modified: jakarta/commons/proper/cli/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/cli/trunk/build.xml?rev=382955&r1=382954&r2=382955&view=diff
==============================================================================
--- jakarta/commons/proper/cli/trunk/build.xml (original)
+++ jakarta/commons/proper/cli/trunk/build.xml Fri Mar 3 15:00:49 2006
@@ -1,27 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--build.xml generated by maven from project.xml version 2.0
- on date August 18 2004, time 1029-->
+<!--build.xml generated by maven from project.xml version 2.0-SNAPSHOT
+ on date March 3 2006, time 1447-->
<project default="jar" name="commons-cli" basedir=".">
- <property name="defaulttargetdir" value="target">
+ <!--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="libdir" value="${defaulttargetdir}/lib">
+ <property name="classesdir" value="${basedir}/target/classes">
</property>
- <property name="classesdir" value="${defaulttargetdir}/classes">
+ <property name="testclassesdir" value="${basedir}/target/test-classes">
</property>
- <property name="testclassesdir" value="${defaulttargetdir}/test-classes">
+ <property name="testreportdir" value="${basedir}/target/test-reports">
</property>
- <property name="testclassesdir" value="${defaulttargetdir}/test-classes">
+ <property name="distdir" value="${basedir}/dist">
</property>
- <property name="testreportdir" value="${defaulttargetdir}/test-reports">
+ <property name="javadocdir" value="${basedir}/dist/docs/api">
</property>
- <property name="distdir" value="dist">
+ <property name="final.name" value="commons-cli-2.0-SNAPSHOT">
</property>
- <property name="javadocdir" value="dist/docs/api">
+ <property name="proxy.host" value="">
</property>
- <property name="final.name" value="commons-cli-2.0">
+ <property name="proxy.port" value="">
</property>
+ <property name="proxy.username" value="">
+ </property>
+ <property name="proxy.password" value="">
+ </property>
+ <path id="build.classpath">
+ <pathelement location="${libdir}/commons-lang/jars/commons-lang-2.1.jar">
+ </pathelement>
+ <pathelement location="${libdir}/junit/jars/junit-3.8.1.jar">
+ </pathelement>
+ <pathelement location="${libdir}/jdepend/jars/jdepend-2.5.jar">
+ </pathelement>
+ </path>
<target name="init" description="o Initializes some properties">
<mkdir dir="${libdir}">
</mkdir>
@@ -29,26 +51,38 @@
<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>
+ <!--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="src/java">
+ <pathelement location="${basedir}/src/java">
</pathelement>
</src>
- <classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <classpath refid="build.classpath">
</classpath>
</javac>
<mkdir dir="${classesdir}/org/apache/commons/cli2">
</mkdir>
<copy todir="${classesdir}/org/apache/commons/cli2">
- <fileset dir="src/java/org/apache/commons/cli2">
+ <fileset dir="${basedir}/src/java/org/apache/commons/cli2">
<include name="**/*.properties">
</include>
</fileset>
@@ -78,10 +112,10 @@
<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">
+ <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes"
fork="true" haltonerror="true">
<sysproperty key="basedir" value=".">
</sysproperty>
<formatter type="xml">
@@ -89,17 +123,15 @@
<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}">
</pathelement>
</classpath>
<batchtest todir="${testreportdir}">
- <fileset dir="src/test">
+ <fileset dir="${basedir}/src/test">
<include name="**/Test*.java">
</include>
<include name="**/*Test.java">
@@ -108,25 +140,28 @@
</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">
<src>
- <pathelement location="src/test">
+ <pathelement location="${basedir}/src/test">
</pathelement>
</src>
<classpath>
- <fileset dir="${libdir}">
- <include name="*.jar">
- </include>
- </fileset>
+ <path refid="build.classpath">
+ </path>
<pathelement path="${classesdir}">
</pathelement>
</classpath>
</javac>
</target>
- <target name="javadoc" description="o Generate javadoc">
+ <target name="javadoc" description="o Generate javadoc" depends="get-deps">
<mkdir dir="${javadocdir}">
</mkdir>
<tstamp>
@@ -135,32 +170,65 @@
</tstamp>
<property name="copyright" value="Copyright &copy; Apache Software
Foundation. All Rights Reserved.">
</property>
- <property name="title" value="CLI 2.0 API">
+ <property name="title" value="CLI 2.0-SNAPSHOT API">
</property>
- <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="src/java" packagenames="org.apache.commons.cli.*">
+ <javadoc use="true" private="true" destdir="${javadocdir}" author="true"
version="true" sourcepath="${basedir}/src/java"
packagenames="org.apache.commons.*">
<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">
- <get dest="${libdir}/commons-lang-1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-1.0.jar";>
+ <target name="get-dep-commons-lang.jar" description="o Download the
dependency : commons-lang.jar" unless="commons-lang.jar"
depends="init,setProxy,noProxy,get-custom-dep-commons-lang.jar">
+ <mkdir dir="${libdir}/commons-lang/jars/">
+ </mkdir>
+ <get dest="${libdir}/commons-lang/jars/commons-lang-2.1.jar"
usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-lang/jars/commons-lang-2.1.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";>
+ </target>
+ <target name="get-custom-dep-commons-lang.jar" if="commons-lang.jar"
depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/commons-lang/jars/">
+ </mkdir>
+ <get dest="${libdir}/commons-lang/jars/commons-lang-2.1.jar"
usetimestamp="true" ignoreerrors="true" src="${commons-lang.jar}">
</get>
- <get dest="${libdir}/jdepend-2.5.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/jdepend/jars/jdepend-2.5.jar";>
+ </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>
- <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";>
+ </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>
- <get dest="${libdir}/ant-1.5.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar";>
+ </target>
+ <target name="get-dep-jdepend.jar" description="o Download the dependency :
jdepend.jar" unless="jdepend.jar"
depends="init,setProxy,noProxy,get-custom-dep-jdepend.jar">
+ <mkdir dir="${libdir}/jdepend/jars/">
+ </mkdir>
+ <get dest="${libdir}/jdepend/jars/jdepend-2.5.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/jdepend/jars/jdepend-2.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";>
+ </target>
+ <target name="get-custom-dep-jdepend.jar" if="jdepend.jar"
depends="init,setProxy,noProxy">
+ <mkdir dir="${libdir}/jdepend/jars/">
+ </mkdir>
+ <get dest="${libdir}/jdepend/jars/jdepend-2.5.jar" usetimestamp="true"
ignoreerrors="true" src="${jdepend.jar}">
</get>
+ </target>
+ <target name="get-deps" unless="noget"
depends="get-dep-commons-lang.jar,get-dep-junit.jar,get-dep-jdepend.jar">
+ </target>
+ <target name="setProxy" if="useProxy" 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>
+ </target>
+ <target name="noProxy" unless="useProxy" depends="init">
+ <echo>Proxy not used.</echo>
</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: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
