morgand 2003/01/26 09:56:47 Modified: grant build.xml Log: updating ant script for grant Revision Changes Path 1.5 +73 -83 jakarta-commons-sandbox/grant/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/grant/build.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- build.xml 23 Oct 2002 14:52:04 -0000 1.4 +++ build.xml 26 Jan 2003 17:56:47 -0000 1.5 @@ -1,124 +1,114 @@ <?xml version="1.0" encoding="UTF-8"?> <project default="jar" name="commons-grant" basedir="."> - - <property name="defaulttargetdir" value="target"></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="target/docs/apidocs"></property> - <property name="final.name" value="${maven.final.name}"></property> - + <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-grant-1.0-beta-4"> + </property> <target name="init" description="o Initializes some properties"> - <mkdir dir="lib"></mkdir> + <mkdir dir="${libdir}"> + </mkdir> <condition property="noget"> - <equals arg2="only" arg1="${build.sysclasspath}"></equals> + <equals arg2="only" arg1="${build.sysclasspath}"> + </equals> </condition> </target> - <target name="compile" description="o Compile the code" depends="get-deps"> - - <mkdir dir="${classesdir}"></mkdir> - + <mkdir dir="${classesdir}"> + </mkdir> <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> <src> - <pathelement location="src/java"></pathelement> + <pathelement location="src/java"> + </pathelement> </src> <classpath> - <fileset dir="lib"> - <include name="*.jar"></include> + <fileset dir="${libdir}"> + <include name="*.jar"> + </include> </fileset> </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> - + <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> - <delete dir="${distdir}"></delete> + <delete dir="${defaulttargetdir}"> + </delete> + <delete dir="${distdir}"> + </delete> </target> - <target name="dist" description="o Create a distribution" depends="jar, javadoc"> - <mkdir dir="dist"></mkdir> + <mkdir dir="dist"> + </mkdir> <copy todir="dist"> - <fileset dir="${defaulttargetdir}"></fileset> + <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> + <fail message="There were test failures."> + </fail> </target> <target name="internal-test" depends="compile-tests"> - </target> - <target name="compile-tests" depends="compile"> - </target> - <target name="javadoc" description="o Generate javadoc" depends="jar"> - - - <mkdir dir="${javadocdir}"></mkdir> - - + <mkdir dir="${javadocdir}"> + </mkdir> <tstamp> - <format pattern="2002-yyyy" property="year"></format> + <format pattern="2002-yyyy" property="year"> + </format> </tstamp> - - <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."></property> - - <property name="title" value="commons-grant 1.0-beta-4 API"></property> - + <property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."> + </property> + <property name="title" value="commons-grant 1.0-beta-4 API"> + </property> <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.commons.grant.*"> <classpath> - <fileset dir="lib"> - <include name="*.jar"></include> + <fileset dir="${libdir}"> + <include name="*.jar"> + </include> </fileset> - <pathelement location="target/${final.name}.jar"></pathelement> + <pathelement location="target/${final.name}.jar"> + </pathelement> </classpath> </javadoc> - </target> - <target name="get-deps" unless="noget" depends="init"> - - - <get dest="lib/junit-3.7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.jar"></get> - <get dest="lib/ant-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"></get> - <get dest="lib/ant-optional-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"></get> - - <get dest="lib/junit-3.8.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"></get> - - </target> - - - - - - - - - - + <get dest="${libdir}/junit-3.7.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.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> + <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"> - - - - <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"></get> - - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar> - - </target> - -</project> - \ No newline at end of file + <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${maven.repo.remote}/maven/maven-install-latest.jar"> + </get> + <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> + </unjar> + </target> +</project> \ No newline at end of file
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>