martinc 2004/10/10 20:50:19 Modified: fileupload build.xml Log: Regenerate Ant build file to pick up dependency changes. Revision Changes Path 1.10 +48 -54 jakarta-commons/fileupload/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons/fileupload/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- build.xml 27 Feb 2004 23:19:04 -0000 1.9 +++ build.xml 11 Oct 2004 03:50:19 -0000 1.10 @@ -1,24 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2002-2004 The Apache Software Foundation - 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. ---> - -<!-- - build.xml generated by maven from project.xml version 1.0 - on date June 24 2003, time 2141 ---> +<!--build.xml generated by maven from project.xml version 1.1-dev + on date October 10 2004, time 2045--> <project default="jar" name="commons-fileupload" basedir="."> <property name="defaulttargetdir" value="target"> @@ -29,14 +12,22 @@ </property> <property name="testclassesdir" value="target/test-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-fileupload-1.0"> + <property name="final.name" value="commons-fileupload-1.1-dev"> </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> @@ -44,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}"> @@ -53,16 +48,12 @@ <pathelement location="src/java"> </pathelement> </src> - <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> + <classpath refid="build.classpath"> </classpath> </javac> </target> <target name="jar" description="o Create the jar" depends="compile,test"> - <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> + <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> </jar> </target> <target name="clean" description="o Clean up the generated directories"> @@ -77,7 +68,7 @@ <copy todir="dist"> <fileset dir="${defaulttargetdir}" includes="*.jar"> </fileset> - <fileset dir="${basedir}" includes="LICENSE*, NOTICE*, README*"> + <fileset dir="${basedir}" includes="LICENSE*, README*"> </fileset> </copy> </target> @@ -85,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"> @@ -96,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}"> @@ -107,13 +96,18 @@ </classpath> <batchtest todir="${testreportdir}"> <fileset dir="src/test"> - <include name="**/Test*.java"> + <include name="**/*Test.java"> </include> </fileset> </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"> @@ -122,47 +116,47 @@ </pathelement> </src> <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> + <path refid="build.classpath"> + </path> <pathelement path="${classesdir}"> </pathelement> </classpath> </javac> + <copy todir="${testclassesdir}"> + <fileset dir="src/test"> + <include name="**/*.xml"> + </include> + </fileset> + </copy> </target> - <target name="javadoc" description="o Generate javadoc" depends="jar"> + <target name="javadoc" description="o Generate javadoc" depends="get-deps"> <mkdir dir="${javadocdir}"> </mkdir> <tstamp> <format pattern="2002-yyyy" property="year"> </format> </tstamp> - <property name="copyright" value="Copyright &copy; 2002-2003 Apache Software Foundation. All Rights Reserved."> + <property name="copyright" value="Copyright &copy; The Apache Software Foundation. All Rights Reserved."> </property> - <property name="title" value="FileUpload 1.0 API"> + <property name="title" value="FileUpload 1.1-dev API"> </property> - <javadoc bottom="Copyright &copy; 2002-2003 Apache Software Foundation. All Rights Reserved." windowtitle="FileUpload 1.0 API" use="true" private="true" destdir="${javadocdir}" author="true" doctitle="FileUpload 1.0 API" version="true" sourcepath="src/java" packagenames="org.apache.commons.fileupload.*"> + <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.fileupload.*"> <classpath> - <fileset dir="${libdir}"> - <include name="*.jar"> - </include> - </fileset> - <pathelement location="target/${final.name}.jar"> - </pathelement> + <path refid="build.classpath"> + </path> </classpath> </javadoc> </target> <target name="get-deps" unless="noget" depends="init"> - <get dest="${libdir}/servletapi-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.3.jar";> + <!--Proxy settings works only with a JDK 1.2 and higher.--> + + <setproxy> + </setproxy> + <get dest="${libdir}/commons-io-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-io/jars/commons-io-1.0.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 dest="${libdir}/servletapi-2.3.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/servletapi/jars/servletapi-2.3.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">
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
