commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject cvs commit: jakarta-commons/jelly/jelly-tags/jsl build.xml
Date Tue, 21 Dec 2004 11:08:09 GMT
brett       2004/12/21 03:08:08

  Modified:    jelly/jelly-tags/jsl build.xml
  Log:
  regenerate build file to see if this helps gump in the interim
  will switch to Maven gump definitions later
  
  Revision  Changes    Path
  1.6       +65 -61    jakarta-commons/jelly/jelly-tags/jsl/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/jsl/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	24 May 2004 21:39:36 -0000	1.5
  +++ build.xml	21 Dec 2004 11:08:08 -0000	1.6
  @@ -1,7 +1,8 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
  -<!--build.xml generated by maven from project.xml version 1.0-SNAPSHOT
  -  on date May 24 2004, time 2301-->
  +<!--build.xml generated by maven from project.xml version 1.1-SNAPSHOT
  +  on date December 21 2004, time 2157-->
  +
   <project default="jar" name="commons-jelly-tags-jsl" basedir=".">
     <property name="defaulttargetdir" value="target">
     </property>
  @@ -11,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-jelly-tags-jsl-1.0-SNAPSHOT">
  +  <property name="final.name" value="commons-jelly-tags-jsl-1.1-SNAPSHOT">
     </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>
  @@ -26,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}">
  @@ -35,11 +48,7 @@
           <pathelement location="src/java">
           </pathelement>
         </src>
  -      <classpath>
  -        <fileset dir="${libdir}">
  -          <include name="*.jar">
  -          </include>
  -        </fileset>
  +      <classpath refid="build.classpath">
         </classpath>
       </javac>
       <copy todir="${classesdir}">
  @@ -48,27 +57,9 @@
           </include>
         </fileset>
       </copy>
  -    <copy todir="${testclassesdir}">
  -      <fileset dir="src/test">
  -        <include name="**/*.jelly">
  -        </include>
  -        <include name="**/*.xml">
  -        </include>
  -        <include name="**/*.xsl">
  -        </include>
  -        <include name="**/*.rng">
  -        </include>
  -        <include name="**/*.dtd">
  -        </include>
  -        <include name="**/*.properties">
  -        </include>
  -        <include name="**/*.html">
  -        </include>
  -      </fileset>
  -    </copy>
     </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">
  @@ -91,7 +82,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">
  @@ -102,10 +93,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}">
  @@ -119,7 +108,12 @@
         </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">
  @@ -128,16 +122,32 @@
           </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="**/*.jelly">
  +        </include>
  +        <include name="**/*.xml">
  +        </include>
  +        <include name="**/*.xsl">
  +        </include>
  +        <include name="**/*.rng">
  +        </include>
  +        <include name="**/*.dtd">
  +        </include>
  +        <include name="**/*.properties">
  +        </include>
  +        <include name="**/*.html">
  +        </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>
  @@ -146,39 +156,39 @@
       </tstamp>
       <property name="copyright" value="Copyright &amp;copy;  Apache Software Foundation.
All Rights Reserved.">
       </property>
  -    <property name="title" value="commons-jelly-tags-jsl 1.0-SNAPSHOT API">
  +    <property name="title" value="commons-jelly-tags-jsl 1.1-SNAPSHOT API">
       </property>
       <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true"
sourcepath="src/java" packagenames="org.apache.commons.jelly.tags.jsl.*">
         <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}/commons-jelly-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-SNAPSHOT.jar">
  +    <!--Proxy settings works only with a JDK 1.2 and higher.-->
  +
  +    <setproxy>
  +    </setproxy>
  +    <get dest="${libdir}/commons-jelly-1.0-beta-4.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-1.0-beta-4.jar">
       </get>
  -    <get dest="${libdir}/commons-jelly-tags-xml-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-xml-SNAPSHOT.jar">
  +    <get dest="${libdir}/commons-jelly-tags-xml-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-xml-1.0.jar">
       </get>
  -    <get dest="${libdir}/commons-jelly-tags-ant-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-ant-SNAPSHOT.jar">
  +    <get dest="${libdir}/commons-jelly-tags-ant-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-ant-1.0.jar">
       </get>
  -    <get dest="${libdir}/commons-jelly-tags-junit-SNAPSHOT.jar" usetimestamp="true"
ignoreerrors="true" src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-junit-SNAPSHOT.jar">
  +    <get dest="${libdir}/commons-jelly-tags-junit-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-junit-1.0.jar">
       </get>
  -    <get dest="${libdir}/commons-jelly-tags-log-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-log-SNAPSHOT.jar">
  +    <get dest="${libdir}/commons-jelly-tags-log-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jelly/jars/commons-jelly-tags-log-1.0.jar">
       </get>
  -    <get dest="${libdir}/ant-1.5.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.1.jar">
  +    <get dest="${libdir}/ant-1.5.3-1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.3-1.jar">
       </get>
  -    <get dest="${libdir}/ant-optional-1.5.1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.1.jar">
  +    <get dest="${libdir}/ant-optional-1.5.3-1.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.3-1.jar">
       </get>
       <get dest="${libdir}/commons-grant-1.0-beta-4.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-grant/jars/commons-grant-1.0-beta-4.jar">
       </get>
  -    <get dest="${libdir}/commons-cli-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-cli/jars/commons-cli-SNAPSHOT.jar">
  +    <get dest="${libdir}/commons-cli-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-cli/jars/commons-cli-1.0.jar">
       </get>
  -    <get dest="${libdir}/commons-jexl-SNAPSHOT.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-SNAPSHOT.jar">
  +    <get dest="${libdir}/commons-jexl-1.0.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-jexl/jars/commons-jexl-1.0.jar">
       </get>
       <get dest="${libdir}/xml-apis-1.0.b2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/xml-apis/jars/xml-apis-1.0.b2.jar">
       </get>
  @@ -188,17 +198,11 @@
       </get>
       <get dest="${libdir}/commons-logging-1.0.3.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/commons-logging/jars/commons-logging-1.0.3.jar">
       </get>
  -    <get dest="${libdir}/dom4j-1.5-beta-2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.5-beta-2.jar">
  +    <get dest="${libdir}/dom4j-1.5.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/dom4j/jars/dom4j-1.5.jar">
       </get>
       <get dest="${libdir}/jaxen-1.1-beta-2.jar" usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/jaxen/jars/jaxen-1.1-beta-2.jar">
       </get>
       <get dest="${libdir}/xerces-2.2.1.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/xerces/jars/xerces-2.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">
  -    </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: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message