Author: bayard Date: Mon May 14 17:02:01 2007 New Revision: 538025 URL: http://svn.apache.org/viewvc?view=rev&rev=538025 Log: Updating the build.xml with a new maven ant. This fixes the copying from a cli2 directory, the repository location, an unnecessary jdepend dependency and all importantly, the version number. Thanks to Brian Egge in CLI-129 for this, though I ended up using his patch as a pointer to the parts of project.xml that needed fixing rather than a fix for the build.xml.
Modified: jakarta/commons/proper/cli/branches/cli-1.0.x/build.xml Modified: jakarta/commons/proper/cli/branches/cli-1.0.x/build.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/cli/branches/cli-1.0.x/build.xml?view=diff&rev=538025&r1=538024&r2=538025 ============================================================================== --- jakarta/commons/proper/cli/branches/cli-1.0.x/build.xml (original) +++ jakarta/commons/proper/cli/branches/cli-1.0.x/build.xml Mon May 14 17:02:01 2007 @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!--build.xml generated by maven from project.xml version 2.0-SNAPSHOT - on date March 3 2006, time 1447--> +<!--build.xml generated by maven from project.xml version 1.1-SNAPSHOT + on date May 14 2007, time 1658--> <project default="jar" name="commons-cli" basedir="."> <!--Load local and user build preferences--> @@ -26,7 +26,7 @@ </property> <property name="javadocdir" value="${basedir}/dist/docs/api"> </property> - <property name="final.name" value="commons-cli-2.0-SNAPSHOT"> + <property name="final.name" value="commons-cli-1.1-SNAPSHOT"> </property> <property name="proxy.host" value=""> </property> @@ -41,8 +41,6 @@ </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}"> @@ -79,14 +77,6 @@ <classpath refid="build.classpath"> </classpath> </javac> - <mkdir dir="${classesdir}/org/apache/commons/cli2"> - </mkdir> - <copy todir="${classesdir}/org/apache/commons/cli2"> - <fileset dir="${basedir}/src/java/org/apache/commons/cli2"> - <include name="**/*.properties"> - </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}"> @@ -160,12 +150,6 @@ </pathelement> </classpath> </javac> - <copy todir="${testclassesdir}/org/apache/commons/cli2"> - <fileset dir="${basedir}/src/test/org/apache/commons/cli2"> - <include name="**/*.properties"> - </include> - </fileset> - </copy> </target> <target name="javadoc" description="o Generate javadoc" depends="get-deps"> <mkdir dir="${javadocdir}"> @@ -176,7 +160,7 @@ </tstamp> <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."> </property> - <property name="title" value="CLI 2.0-SNAPSHOT API"> + <property name="title" value="CLI 1.1-SNAPSHOT API"> </property> <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.commons.*"> <classpath> @@ -188,7 +172,7 @@ <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 dest="${libdir}/commons-lang/jars/commons-lang-2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/commons-lang/jars/commons-lang-2.1.jar"> </get> </target> <target name="get-custom-dep-commons-lang.jar" if="commons-lang.jar" depends="init,setProxy,noProxy"> @@ -200,7 +184,7 @@ <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 dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.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"> @@ -209,19 +193,7 @@ <get dest="${libdir}/junit/jars/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="${junit.jar}"> </get> </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> - </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 name="get-deps" unless="noget" depends="get-dep-commons-lang.jar,get-dep-junit.jar"> </target> <target name="setProxy" if="useProxy" depends="init"> <!--Proxy settings works only with a JDK 1.2 and higher.--> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]