commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject cvs commit: jakarta-commons/latka build.xml
Date Fri, 25 Jan 2002 00:01:22 GMT
dion        02/01/24 16:01:22

  Modified:    latka    build.xml
  Log:
  Formatting changes
  
  Revision  Changes    Path
  1.18      +213 -210  jakarta-commons/latka/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/latka/build.xml,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- build.xml	23 Jan 2002 03:20:03 -0000	1.17
  +++ build.xml	25 Jan 2002 00:01:22 -0000	1.18
  @@ -1,86 +1,86 @@
  -<!-- $Id: build.xml,v 1.17 2002/01/23 03:20:03 dion Exp $ -->
  +<!-- $Id: build.xml,v 1.18 2002/01/25 00:01:22 dion Exp $ -->
   <project name="commons-latka" default="build-java" basedir=".">
   
  -   <!-- patternset describing files to be copied from the doc directory -->
  -   <patternset id="patternset-doc">
  +    <!-- patternset describing files to be copied from the doc directory -->
  +    <patternset id="patternset-doc">
           <exclude name="*.xml"/>
  -   </patternset>
  +    </patternset>
   
  -   <!-- patternset describing test classes -->
  -   <patternset id="patternset-test-classes">
  -      <include name="**/Test*.class"/>
  -   </patternset>
  -
  -   <!-- patternset describing non test classes -->
  -   <patternset id="patternset-non-test-classes">
  -      <exclude name="**/Test*.class"/>
  -   </patternset>
  +    <!-- patternset describing test classes -->
  +    <patternset id="patternset-test-classes">
  +        <include name="**/Test*.class"/>
  +    </patternset>
  +
  +    <!-- patternset describing non test classes -->
  +    <patternset id="patternset-non-test-classes">
  +        <exclude name="**/Test*.class"/>
  +    </patternset>
   
      <!-- patternset describing non test source files (*.java, *html, etc.) -->
  -   <patternset id="patternset-javadocable-sources">
  -      <include name="**/*"/>
  -      <exclude name="**/Test*.java"/>
  -   </patternset>
  -
  -   <!-- ######################################################### -->
  -
  -   <target name="init">
  -      <tstamp/>
  -
  -      <!-- read properties from the build.properties, if any -->
  -      <property name="component-propfile" value="${basedir}/build.properties"/>
  -      <property file="${component-propfile}"/>
  -
  -      <!-- read properties from the commons build.properties, if any -->
  -      <property name="commons-propfile" value="${basedir}/../build.properties"/>
  -      <property file="${commons-propfile}"/>
  -
  -      <!-- read properties from the ${user.home}/propfile, if any -->
  -      <property name="user-propfile" value="${user.home}/build.properties"/>
  -      <property file="${user-propfile}"/>
  -
  -      <!-- command line classpath, if any -->
  -      <property name="cp" value=""/>
  -
  -
  -      <property name="name" value="commons-latka"/>
  -      <property name="Name" value="Commons-Latka"/>
  -      <property name="Name-Long" value="Jakarta Commons Latka Functional Testing Suite"/>
  -
  -      <property name="test.entry" value="org.apache.commons.latka.TestAll"/>
  -      <property name="test.failonerror" value="true" /> 
  -      <property name="test.runner" value="junit.textui.TestRunner" /> 
  -      
  -      <property name="workdir" value="${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}"/>
  -      <property name="source" value="${basedir}"/>
  -      <property name="source.props" value="${source}/lib"/> <!-- properties files
-->
  -      <property name="source.src" value="${basedir}/src"/>
  -      <property name="source.src.java" value="${source.src}/java"/>
  -      <property name="source.src.test" value="${source.src}/test"/>
  -      <property name="source.doc" value="${basedir}/doc"/>
  -      <property name="source.doc.xsl" value="${basedir}/xsl/docbook/html/docbook.xsl"/>
  -      <property name="dest" value="${basedir}/build"/>
  -      <property name="dest.classes" value="${dest}/classes"/>
  -      <property name="dest.doc" value="${dest}/docs"/>
  -      <property name="dest.doc.api" value="${dest.doc}/api"/>
  -      <property name="dist" value="${basedir}/dist"/>
  -      <property name="dist.jar" value="${dist}/${name}.jar"/>
  -      <property name="resource" value="${basedir}/resource"/>
  -
  -      <available property="available-doc" file="${source.doc}"/> <!-- does this
module have docs? -->
  -      <available property="available-src-java" file="${source.src.java}"/> <!--
does this module have java src? -->      
  -      <available property="available-src-test" file="${source.src.test}"/> <!--
does this module have test src? -->      
  -
  -      <!-- properties for xdocs creation -->
  -      <property name="dest.xdocs" value="${dest}/xdocs" />
  -      <property name="source.xdocs" value="${source}/xdocs"/>
  -      <property name="source.xsl.converter.docbook"
  +    <patternset id="patternset-javadocable-sources">
  +        <include name="**/*"/>
  +        <exclude name="**/Test*.java"/>
  +    </patternset>
  +
  +    <!-- ######################################################### -->
  +
  +    <target name="init">
  +        <tstamp/>
  +
  +        <!-- read properties from the build.properties, if any -->
  +        <property name="component-propfile" value="${basedir}/build.properties"/>
  +        <property file="${component-propfile}"/>
  +
  +        <!-- read properties from the commons build.properties, if any -->
  +        <property name="commons-propfile" value="${basedir}/../build.properties"/>
  +        <property file="${commons-propfile}"/>
  +
  +        <!-- read properties from the ${user.home}/propfile, if any -->
  +        <property name="user-propfile" value="${user.home}/build.properties"/>
  +        <property file="${user-propfile}"/>
  +
  +        <!-- command line classpath, if any -->
  +        <property name="cp" value=""/>
  +
  +
  +        <property name="name" value="commons-latka"/>
  +        <property name="Name" value="Commons-Latka"/>
  +        <property name="Name-Long" value="Jakarta Commons Latka Functional Testing Suite"/>
  +
  +        <property name="test.entry" value="org.apache.commons.latka.TestAll"/>
  +        <property name="test.failonerror" value="true" /> 
  +        <property name="test.runner" value="junit.textui.TestRunner" /> 
  +
  +        <property name="workdir" value="${java.io.tmpdir}/buildtemp_${DSTAMP}${TSTAMP}"/>
  +        <property name="source" value="${basedir}"/>
  +        <property name="source.props" value="${source}/lib"/> <!-- properties
files -->
  +        <property name="source.src" value="${basedir}/src"/>
  +        <property name="source.src.java" value="${source.src}/java"/>
  +        <property name="source.src.test" value="${source.src}/test"/>
  +        <property name="source.doc" value="${basedir}/doc"/>
  +        <property name="source.doc.xsl" value="${basedir}/xsl/docbook/html/docbook.xsl"/>
  +        <property name="dest" value="${basedir}/build"/>
  +        <property name="dest.classes" value="${dest}/classes"/>
  +        <property name="dest.doc" value="${dest}/docs"/>
  +        <property name="dest.doc.api" value="${dest.doc}/api"/>
  +        <property name="dist" value="${basedir}/dist"/>
  +        <property name="dist.jar" value="${dist}/${name}.jar"/>
  +        <property name="resource" value="${basedir}/resource"/>
  +
  +        <available property="available-doc" file="${source.doc}"/> <!-- does this
module have docs? -->
  +        <available property="available-src-java" file="${source.src.java}"/> <!--
does this module have java src? -->      
  +        <available property="available-src-test" file="${source.src.test}"/> <!--
does this module have test src? -->      
  +
  +        <!-- properties for xdocs creation -->
  +        <property name="dest.xdocs" value="${dest}/xdocs" />
  +        <property name="source.xdocs" value="${source}/xdocs"/>
  +        <property name="source.xsl.converter.docbook"
                     value="${basedir}/xsl/site/docbook2document.xsl"/>
  -      <property name="source.xsl.converter.site"
  +        <property name="source.xsl.converter.site"
                     value="${basedir}/xsl/site/site.xsl"/>
   
  -      <!-- now combine the classpaths -->
  -      <path id="classpath">
  +        <!-- now combine the classpaths -->
  +        <path id="classpath">
             <pathelement path="${cp}"/>
             <pathelement location="${regexp.jar}"/>
             <pathelement location="${jaxp.jar}"/>
  @@ -95,15 +95,15 @@
             <pathelement location="${jcert.jar}"/>
             <pathelement location="${junit.jar}"/>
             <pathelement location="${source.props}"/>
  -      </path>
  +        </path>
   
  -      <available property="jaxen.present" 
  +        <available property="jaxen.present" 
             classname="org.jaxen.jdom.XPath">
             <!-- We need a jaxen with JDOM support -->
             <classpath refid="classpath"/>
  -      </available>
  +        </available>
   
  -   </target>
  +    </target>
   
      <!-- ######################################################### -->
   
  @@ -127,74 +127,75 @@
   
      <!-- ######################################################### -->
   
  -   <target name="clean" depends="init,clean-dist" description="removes generated files">
  -      <delete dir="${dest}"/>
  -   </target>
  -
  -   <target name="clean-doc" depends="init,clean-javadoc">
  -      <delete dir="${dest.doc}"/>
  -   </target>
  -
  -   <target name="clean-javadoc" depends="init">
  -      <delete dir="${dest.doc.api}"/>
  -   </target>
  -
  -   <target name="clean-build" depends="init">
  -      <delete dir="${dest.classes}"/>
  -   </target>
  -
  -   <target name="clean-dist" depends="init">
  -      <delete dir="${dist}"/>
  -   </target>
  -
  -   <!-- ######################################################### -->
  -
  -   <target name="doc" depends="init,doc-top,doc-copy,doc-javadoc,doc-xslt" description="generates
javadocs and other documentation">
  -   </target>
  -
  -   <target name="doc-top" depends="init">
  -      <mkdir  dir="${dest}"/>
  -      <copy todir="${dest}" file="../LICENSE"/>
  -   </target>
  -
  -   <target name="doc-copy" depends="init" if="available-doc">
  -      <mkdir dir="${dest.doc}"/>
  -      <copy todir="${dest.doc}">
  -      <fileset dir="${source.doc}">
  -         <patternset refid="patternset-doc"/>
  -      </fileset>
  -      </copy>
  +    <target name="clean" depends="init,clean-dist" description="removes generated files">
  +        <delete dir="${dest}"/>
  +    </target>
  +
  +    <target name="clean-doc" depends="init,clean-javadoc">
  +        <delete dir="${dest.doc}"/>
  +    </target>
  +
  +    <target name="clean-javadoc" depends="init">
  +        <delete dir="${dest.doc.api}"/>
  +    </target>
  +
  +    <target name="clean-build" depends="init">
  +        <delete dir="${dest.classes}"/>
  +    </target>
  +
  +    <target name="clean-dist" depends="init">
  +        <delete dir="${dist}"/>
  +    </target>
  +
  +    <!-- ######################################################### -->
  +
  +    <target name="doc" depends="init,doc-top,doc-copy,doc-javadoc,doc-xslt"
  +            description="generates javadocs and other documentation">
  +    </target>
  +
  +    <target name="doc-top" depends="init">
  +        <mkdir  dir="${dest}"/>
  +        <copy todir="${dest}" file="../LICENSE"/>
  +    </target>
  +
  +    <target name="doc-copy" depends="init" if="available-doc">
  +        <mkdir dir="${dest.doc}"/>
  +        <copy todir="${dest.doc}">
  +            <fileset dir="${source.doc}">
  +                <patternset refid="patternset-doc"/>
  +            </fileset>
  +        </copy>
      </target>
   
      <target name="doc-javadoc" depends="init" if="available-src-java">
  -      <!-- copy all the non-test sources out to the work directory and javadoc that
-->
  -      <mkdir dir="${workdir}"/>
  -      <copy todir="${workdir}">
  -        <fileset dir="${source.src.java}">
  -          <patternset refid="patternset-javadocable-sources"/>
  -        </fileset>
  -      </copy>
  -      <mkdir dir="${dest.doc.api}"/>
  -      <javadoc packagenames="org.*"
  -               sourcepath="${workdir}"
  -               classpathref="classpath"
  -               destdir="${dest.doc.api}"
  -               windowtitle="${Name-Long}"
  -               doctitle="${Name-Long}"
  -               bottom="&lt;small&gt;Copyright &amp;copy; 2001 Apache Software
Foundation. Documenation generated ${TODAY}&lt;/small&gt;."
  -               protected="true"
  -               version="true"
  -               author="true"
  -               splitindex="false"
  -               nodeprecated="true"
  -               nodeprecatedlist="true"
  -               notree="true"
  -               noindex="false"
  -               nohelp="true"
  -               nonavbar="false"
  -               serialwarn="false">
  -      </javadoc>
  -      <delete dir="${workdir}"/>
  +        <!-- copy all the non-test sources out to the work directory and javadoc that
-->
  +        <mkdir dir="${workdir}"/>
  +        <copy todir="${workdir}">
  +            <fileset dir="${source.src.java}">
  +                <patternset refid="patternset-javadocable-sources"/>
  +            </fileset>
  +        </copy>
  +        <mkdir dir="${dest.doc.api}"/>
  +        <javadoc packagenames="org.*"
  +                 sourcepath="${workdir}"
  +                 classpathref="classpath"
  +                 destdir="${dest.doc.api}"
  +                 windowtitle="${Name-Long}"
  +                 doctitle="${Name-Long}"
  +                 bottom="&lt;small&gt;Copyright &amp;copy; 2001 Apache Software
Foundation. Documenation generated ${TODAY}&lt;/small&gt;."
  +                 protected="true"
  +                 version="true"
  +                 author="true"
  +                 splitindex="false"
  +                 nodeprecated="true"
  +                 nodeprecatedlist="true"
  +                 notree="true"
  +                 noindex="false"
  +                 nohelp="true"
  +                 nonavbar="false"
  +                 serialwarn="false">
  +        </javadoc>
  +        <delete dir="${workdir}"/>
      </target>
      
      <target name="doc-xslt" depends="init">
  @@ -232,56 +233,58 @@
                  style="${dest.xdocs}/stylesheets/site.xsl"
                  includes="*.xml"/>
   
  -   </target>
  +    </target>
   
  -   <!-- ######################################################### -->
  +    <!-- ######################################################### -->
   
  -   <target name="build" depends="init,build-java" description="compiles source files"/>
  +    <target name="build" depends="init,build-java"
  +            description="compiles source files"/>
   
  -   <!-- Parametrize these ala Cocoon if we get any more validators with jar
  -   deps -->
  -   <target name="jaxen-warn" unless="jaxen.present">
  -       <echo>
  -           ***************************************************
  +    <!-- Parametrize these ala Cocoon if we get any more validators with jar
  +         deps
  +      -->
  +    <target name="jaxen-warn" unless="jaxen.present">
  +        <echo>
  +            ***************************************************
                     WARNING: XPath validator not built        
   
  -           Property: $${jaxen.jar}
  -           Current value: ${jaxen.jar}
  +            Property: $${jaxen.jar}
  +            Current value: ${jaxen.jar}
   
  -           If you wish to build this validator, please fix the 
  -           above property in your build.properties file
  +            If you wish to build this validator, please fix the 
  +            above property in your build.properties file
              ***************************************************
  -       </echo>
  -   </target>
  +        </echo>
  +    </target>
   
  -   <target name="build-java" depends="init, jaxen-warn" if="available-src-java">
  -      <mkdir dir="${dest.classes}"/>
  -      <javac destdir="${dest.classes}"
  -             srcdir="${source.src.java}"
  -             classpathref="classpath"
  -             debug="false"
  -             deprecation="true"
  -             optimize="true">
  -             <exclude name="**/XPath*.java" unless="jaxen.present"/>
  -     </javac>
  -     <copy todir="${dest.classes}">
  -        <fileset dir="${resource}"/>
  -     </copy>
  -   </target>
  +    <target name="build-java" depends="init, jaxen-warn" if="available-src-java">
  +        <mkdir dir="${dest.classes}"/>
  +        <javac destdir="${dest.classes}"
  +               srcdir="${source.src.java}"
  +               classpathref="classpath"
  +               debug="false"
  +               deprecation="true"
  +               optimize="true">
  +            <exclude name="**/XPath*.java" unless="jaxen.present"/>
  +        </javac>
  +        <copy todir="${dest.classes}">
  +            <fileset dir="${resource}"/>
  +        </copy>
  +    </target>
   
  -   <target name="build-test" depends="init,build-java" if="available-src-test">
  -      <mkdir dir="${dest.classes}"/>
  -      <javac destdir="${dest.classes}"
  -             srcdir="${source.src.test}"
  -             classpathref="classpath"
  -             debug="false"
  -             deprecation="true"
  -             optimize="true"/>
  -   </target>
  +    <target name="build-test" depends="init,build-java" if="available-src-test">
  +        <mkdir dir="${dest.classes}"/>
  +        <javac destdir="${dest.classes}"
  +               srcdir="${source.src.test}"
  +               classpathref="classpath"
  +               debug="false"
  +               deprecation="true"
  +               optimize="true"/>
  +    </target>
   
  -   <!-- ######################################################### -->
  +    <!-- ######################################################### -->
   
  -   <target name="test" depends="build-test" if="test.entry" description="runs (junit)
unit tests">
  +    <target name="test" depends="build-test" if="test.entry" description="runs (junit)
unit tests">
         <!--
         <junit printsummary="yes" fork="on" haltonfailure="yes">
           <formatter type="plain" usefile="false"/>
  @@ -294,34 +297,34 @@
         </junit>
         -->
   
  -      <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
  -        <arg value="${test.entry}"/> 
  -        <classpath>
  -          <pathelement location="${dest.classes}" /> 
  -          <path refid="classpath"/>
  -          <pathelement path="${java.class.path}" /> 
  -        </classpath>
  -      </java>
  -   </target>
  -
  -   <!-- ######################################################### -->
  -
  -   <target name="dist" depends="dist-jar,doc" description="builds binary distribution"/>
  -
  -   <target name="dist-jar" depends="build">
  -      <mkdir dir="${dist}"/>
  -      <mkdir dir="${workdir}"/>
  -      <copy todir="${workdir}">
  -         <fileset dir="${dest.classes}">
  -            <patternset refid="patternset-non-test-classes"/>
  -         </fileset>
  -      </copy>
  -      <jar jarfile="${dist.jar}">
  -         <fileset dir="${workdir}"/>
  -      </jar>
  -      <delete dir="${workdir}"/>
  -   </target>     
  +        <java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}">
  +            <arg value="${test.entry}"/> 
  +            <classpath>
  +                <pathelement location="${dest.classes}" /> 
  +                <path refid="classpath"/>
  +                <pathelement path="${java.class.path}" /> 
  +            </classpath>
  +        </java>
  +    </target>
  +
  +    <!-- ######################################################### -->
  +
  +    <target name="dist" depends="dist-jar,doc" description="builds binary distribution"/>
  +
  +    <target name="dist-jar" depends="build">
  +        <mkdir dir="${dist}"/>
  +        <mkdir dir="${workdir}"/>
  +        <copy todir="${workdir}">
  +            <fileset dir="${dest.classes}">
  +                <patternset refid="patternset-non-test-classes"/>
  +            </fileset>
  +        </copy>
  +        <jar jarfile="${dist.jar}">
  +            <fileset dir="${workdir}"/>
  +        </jar>
  +        <delete dir="${workdir}"/>
  +    </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>


Mime
View raw message