commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "James Strachan" <james_strac...@yahoo.co.uk>
Subject Re: [PATCH] betwixt build.xml
Date Mon, 02 Sep 2002 16:53:34 GMT
Applied (actually I just regenned the build.xml too, it was quicker ;-).

James
-------
http://radio.weblogs.com/0112098/
----- Original Message -----
From: "Sam Ruby" <rubys@apache.org>
To: <commons-dev@jakarta.apache.org>
Sent: Monday, September 02, 2002 1:42 AM
Subject: [PATCH] betwixt build.xml


> Regenned using "maven ant" from maven-1.0-beta-6.  This should enable
> gump to control the name of the output jar using the "final.name"
property.
>
>


----------------------------------------------------------------------------
----


> ? build.diff
> Index: build.xml
> ===================================================================
> RCS file: /home/cvs/jakarta-commons/betwixt/build.xml,v
> retrieving revision 1.8
> diff -u -r1.8 build.xml
> --- build.xml 10 Jul 2002 11:35:58 -0000 1.8
> +++ build.xml 2 Sep 2002 00:37:09 -0000
> @@ -1,12 +1,27 @@
>  <?xml version="1.0" encoding="UTF-8"?>
>
>  <project default="jar" name="commons-betwixt" 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="commons-betwixt-1.0-beta-1"></property>
> +
> +  <target name="init" description="o Initializes some properties">
> +
> +    <condition property="noget">
> +      <equals arg2="only" arg1="${build.sysclasspath}"></equals>
> +    </condition>
> +  </target>
> +
> +  <target name="jar" description="o Create the jar" depends="get-deps">
>
> -  <target name="jar" depends="get-deps">
> -
> -    <mkdir dir="target/classes"></mkdir>
> +    <mkdir dir="${classesdir}"></mkdir>
>
> -    <javac destdir="target/classes" deprecation="false" debug="false"
optimize="false" excludes="**/package.html">
> +    <javac destdir="${classesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
>        <src>
>          <pathelement location="src/java"></pathelement>
>        </src>
> @@ -17,33 +32,127 @@
>        </classpath>
>      </javac>
>
> -    <jar jarfile="target/commons-betwixt-1.0-dev.jar"
excludes="**/package.html" basedir="target/classes"></jar>
> +
> +
> +
> +
> +    <copy todir="${classesdir}">
> +
> +
> +
> +      <fileset dir="${basedir}">
> +
> +
> +        <include name="**/*.properties"></include>
> +
> +
> +      </fileset>
> +    </copy>
> +
> +
> +    <jar jarfile="target/${final.name}.jar" excludes="**/package.html"
basedir="${classesdir}"></jar>
>
>    </target>
>
> -  <target name="clean">
> -    <delete dir="target"></delete>
> -    <delete dir="dist"></delete>
> +  <target name="clean" description="o Clean up the generated
directories">
> +    <delete dir="${defaulttargetdir}"></delete>
> +    <delete dir="${distdir}"></delete>
>    </target>
>
> -  <target name="dist" depends="jar">
> +  <target name="dist" description="o Create a distribution" depends="jar,
javadoc">
>      <mkdir dir="dist"></mkdir>
>      <copy todir="dist">
> -      <fileset dir="target"></fileset>
> +      <fileset dir="${defaulttargetdir}"></fileset>
> +    </copy>
> +  </target>
> +
> +  <target name="test" description="o Run the test cases"
depends="compile-tests">
> +    <mkdir dir="${testreportdir}"></mkdir>
> +    <junit dir="./" printSummary="yes" fork="true" haltonerror="true">
> +      <sysproperty key="basedir" value="src/test"></sysproperty>
> +      <formatter type="xml"></formatter>
> +      <formatter usefile="true" type="plain"></formatter>
> +      <classpath>
> +        <fileset dir="lib">
> +          <include name="*.jar"></include>
> +        </fileset>
> +        <pathelement location="target/${final.name}.jar"></pathelement>
> +        <pathelement path="${testclassesdir}"></pathelement>
> +      </classpath>
> +      <batchtest todir="${testreportdir}">
> +        <fileset dir="src/test">
> +
> +                <include name="**/Test*.java"></include>
> +
> +
> +        </fileset>
> +      </batchtest>
> +    </junit>
> +  </target>
> +
> +  <target name="compile-tests" depends="jar">
> +    <mkdir dir="${testclassesdir}"></mkdir>
> +    <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
> +      <src>
> +        <pathelement location="src/test"></pathelement>
> +      </src>
> +      <classpath>
> +        <fileset dir="lib">
> +          <include name="*.jar"></include>
> +        </fileset>
> +        <pathelement location="target/${final.name}.jar"></pathelement>
> +      </classpath>
> +    </javac>
> +
> +
> +
> +
> +
> +    <copy todir="${testclassesdir}">
> +      <fileset dir="src/test">
> +
> +
> +      </fileset>
>      </copy>
> +
> +  </target>
> +
> +  <target name="javadoc" description="o Generate javadoc" depends="jar">
> +
> +
> +    <mkdir dir="${javadocdir}"></mkdir>
> +
> +
> +    <tstamp>
> +      <format pattern="2002-yyyy" property="year"></format>
> +    </tstamp>
> +
> +    <property name="copyright" value="Copyright &amp;copy;  Apache
Software Foundation. All Rights Reserved."></property>
> +
> +    <property name="title" value="Betwixt 1.0-beta-1 API"></property>
> +
> +    <javadoc use="true" private="true" destdir="${javadocdir}"
author="true" version="true" sourcepath="src/java"
packagenames="org.apache.commons.*.*">
> +      <classpath>
> +        <fileset dir="lib">
> +          <include name="*.jar"></include>
> +        </fileset>
> +        <pathelement location="target/${final.name}.jar"></pathelement>
> +      </classpath>
> +    </javadoc>
> +
>    </target>
>
> -  <target name="get-deps">
> +  <target name="get-deps" unless="noget" depends="init">
>
>      <mkdir dir="lib"></mkdir>
>
> -    <get dest="lib/commons-logging-1.0.jar" usetimestamp="true"
src="http://jakarta.apache.org/turbine/jars2/commons-logging/jars/commons-lo
gging-1.0.jar"></get>
> -    <get dest="lib/commons-beanutils-1.3.jar" usetimestamp="true"
src="http://jakarta.apache.org/turbine/jars2/commons-beanutils/jars/commons-
beanutils-1.3.jar"></get>
> -    <get dest="lib/commons-collections-2.0.jar" usetimestamp="true"
src="http://jakarta.apache.org/turbine/jars2/commons-collections/jars/common
s-collections-2.0.jar"></get>
> -    <get dest="lib/commons-digester-1.2.jar" usetimestamp="true"
src="http://jakarta.apache.org/turbine/jars2/commons-digester/jars/commons-d
igester-1.2.jar"></get>
> -    <get dest="lib/xerces-2.0.0.jar" usetimestamp="true"
src="http://jakarta.apache.org/turbine/jars2/xerces/jars/xerces-2.0.0.jar"><
/get>
> -    <get dest="lib/xml-apis-2.0.2.jar" usetimestamp="true"
src="http://jakarta.apache.org/turbine/jars2/xml-apis/jars/xml-apis-2.0.2.ja
r"></get>
> -    <get dest="lib/junit-3.7.jar" usetimestamp="true"
src="http://jakarta.apache.org/turbine/jars2/junit/jars/junit-3.7.jar"></get
>
> +    <get dest="lib/commons-logging-1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.j
ar"></get>
> +    <get dest="lib/commons-beanutils-1.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1
.3.jar"></get>
> +    <get dest="lib/commons-collections-2.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collectio
ns-2.0.jar"></get>
> +    <get dest="lib/commons-digester-1.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.2
.jar"></get>
> +    <get dest="lib/xerces-2.0.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.0.0.jar"></get>
> +    <get dest="lib/xml-apis-2.0.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar"></get>
> +    <get dest="lib/junit-3.7.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.jar"></get>
>
>    </target>
>
> @@ -60,7 +169,7 @@
>
>
>
> -    <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true"
src="${maven.repo.remote}maven/maven-install-latest.jar"></get>
> +    <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>
>
>


----------------------------------------------------------------------------
----


> <?xml version="1.0" encoding="UTF-8"?>
>
> <project default="jar" name="commons-betwixt" 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="commons-betwixt-1.0-beta-1"></property>
>
>   <target name="init" description="o Initializes some properties">
>
>     <condition property="noget">
>       <equals arg2="only" arg1="${build.sysclasspath}"></equals>
>     </condition>
>   </target>
>
>   <target name="jar" description="o Create the jar" 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>
>       </src>
>       <classpath>
>         <fileset dir="lib">
>           <include name="*.jar"></include>
>         </fileset>
>       </classpath>
>     </javac>
>
>
>
>
>
>     <copy todir="${classesdir}">
>
>
>
>       <fileset dir="${basedir}">
>
>
>         <include name="**/*.properties"></include>
>
>
>       </fileset>
>     </copy>
>
>
>     <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>
>   </target>
>
>   <target name="dist" description="o Create a distribution" depends="jar,
javadoc">
>     <mkdir dir="dist"></mkdir>
>     <copy todir="dist">
>       <fileset dir="${defaulttargetdir}"></fileset>
>     </copy>
>   </target>
>
>   <target name="test" description="o Run the test cases"
depends="compile-tests">
>     <mkdir dir="${testreportdir}"></mkdir>
>     <junit dir="./" printSummary="yes" fork="true" haltonerror="true">
>       <sysproperty key="basedir" value="src/test"></sysproperty>
>       <formatter type="xml"></formatter>
>       <formatter usefile="true" type="plain"></formatter>
>       <classpath>
>         <fileset dir="lib">
>           <include name="*.jar"></include>
>         </fileset>
>         <pathelement location="target/${final.name}.jar"></pathelement>
>         <pathelement path="${testclassesdir}"></pathelement>
>       </classpath>
>       <batchtest todir="${testreportdir}">
>         <fileset dir="src/test">
>
>                 <include name="**/Test*.java"></include>
>
>
>         </fileset>
>       </batchtest>
>     </junit>
>   </target>
>
>   <target name="compile-tests" depends="jar">
>     <mkdir dir="${testclassesdir}"></mkdir>
>     <javac destdir="${testclassesdir}" deprecation="true" debug="true"
optimize="false" excludes="**/package.html">
>       <src>
>         <pathelement location="src/test"></pathelement>
>       </src>
>       <classpath>
>         <fileset dir="lib">
>           <include name="*.jar"></include>
>         </fileset>
>         <pathelement location="target/${final.name}.jar"></pathelement>
>       </classpath>
>     </javac>
>
>
>
>
>
>     <copy todir="${testclassesdir}">
>       <fileset dir="src/test">
>
>
>       </fileset>
>     </copy>
>
>   </target>
>
>   <target name="javadoc" description="o Generate javadoc" depends="jar">
>
>
>     <mkdir dir="${javadocdir}"></mkdir>
>
>
>     <tstamp>
>       <format pattern="2002-yyyy" property="year"></format>
>     </tstamp>
>
>     <property name="copyright" value="Copyright &amp;copy;  Apache
Software Foundation. All Rights Reserved."></property>
>
>     <property name="title" value="Betwixt 1.0-beta-1 API"></property>
>
>     <javadoc use="true" private="true" destdir="${javadocdir}"
author="true" version="true" sourcepath="src/java"
packagenames="org.apache.commons.*.*">
>       <classpath>
>         <fileset dir="lib">
>           <include name="*.jar"></include>
>         </fileset>
>         <pathelement location="target/${final.name}.jar"></pathelement>
>       </classpath>
>     </javadoc>
>
>   </target>
>
>   <target name="get-deps" unless="noget" depends="init">
>
>     <mkdir dir="lib"></mkdir>
>
>     <get dest="lib/commons-logging-1.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.j
ar"></get>
>     <get dest="lib/commons-beanutils-1.3.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-beanutils/jars/commons-beanutils-1
.3.jar"></get>
>     <get dest="lib/commons-collections-2.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-collections/jars/commons-collectio
ns-2.0.jar"></get>
>     <get dest="lib/commons-digester-1.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-digester/jars/commons-digester-1.2
.jar"></get>
>     <get dest="lib/xerces-2.0.0.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.0.0.jar"></get>
>     <get dest="lib/xml-apis-2.0.2.jar" usetimestamp="true"
ignoreerrors="true"
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-2.0.2.jar"></get>
>     <get dest="lib/junit-3.7.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/junit/jars/junit-3.7.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>
>
>


----------------------------------------------------------------------------
----


> --
> To unsubscribe, e-mail:
<mailto:commons-dev-unsubscribe@jakarta.apache.org>
> For additional commands, e-mail:
<mailto:commons-dev-help@jakarta.apache.org>

__________________________________________________
Do You Yahoo!?
Everything you'll ever need on one web page
from News and Sport to Email and Music Charts
http://uk.my.yahoo.com

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message