[Mockobjects-java-dev] CVS: mockobjects-java build.xml,1.8,1.9

[Steve F. <sm...@us...>]

Update of /cvsroot/mockobjects/mockobjects-java
In directory usw-pr-cvs1:/tmp/cvs-serv29803

Modified Files:
	build.xml 
Log Message:
distribution now includes a zip of the sources

Index: build.xml
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** build.xml	2001/08/10 15:46:17	1.8
--- build.xml	2001/08/12 23:01:45	1.9
***************
*** 1,8 ****
  <?xml version="1.0"?>
  
! <!-- 
    =============================================================================
      Build file for the mockobjects project.
!     
      The following properties need to be set in a ./build.properties or
      or ${user.home}/build.properties file :
--- 1,8 ----
  <?xml version="1.0"?>
  
! <!--
    =============================================================================
      Build file for the mockobjects project.
! 
      The following properties need to be set in a ./build.properties or
      or ${user.home}/build.properties file :
***************
*** 22,26 ****
      in your Ant installation for running the unit tests and the documentation
      and web site generation.
!              
      This script should be started with the following command line :
  
--- 22,26 ----
      in your Ant installation for running the unit tests and the documentation
      and web site generation.
! 
      This script should be started with the following command line :
  
***************
*** 28,36 ****
  
      Run "ant -projecthelp" to get a list of available targets.
!   ============================================================================= 
  -->
  <project name="mockobjects" default="jar" basedir=".">
  
!     <!-- Give user a chance to override without editing this file 
           (and without typing -D each time it compiles it) -->
      <property file="build.properties" />
--- 28,36 ----
  
      Run "ant -projecthelp" to get a list of available targets.
!   =============================================================================
  -->
  <project name="mockobjects" default="jar" basedir=".">
  
!     <!-- Give user a chance to override without editing this file
           (and without typing -D each time it compiles it) -->
      <property file="build.properties" />
***************
*** 49,53 ****
      <property name="package.prefix" value="com/mockobjects/"/>
  
!     <!-- 
         ========================================================================
           Set the properties related to the source tree
--- 49,53 ----
      <property name="package.prefix" value="com/mockobjects/"/>
  
!     <!--
         ========================================================================
           Set the properties related to the source tree
***************
*** 65,69 ****
      <property name="lib.dir" value="lib"/>
  
!     <!-- 
         ========================================================================
           Set the properties related to the build area
--- 65,69 ----
      <property name="lib.dir" value="lib"/>
  
!     <!--
         ========================================================================
           Set the properties related to the build area
***************
*** 85,89 ****
      <property name="out.xdoc.site.dir" value="${out.dir}/xdoc/site"/>
  
!     <!-- 
         ========================================================================
           Default values for properties not defined in build.properties
--- 85,89 ----
      <property name="out.xdoc.site.dir" value="${out.dir}/xdoc/site"/>
  
!     <!--
         ========================================================================
           Default values for properties not defined in build.properties
***************
*** 92,96 ****
      <property name="dist.dir" value="dist"/>
  
!     <!-- 
         ========================================================================
          Short names of deliverables
--- 92,96 ----
      <property name="dist.dir" value="dist"/>
  
!     <!--
         ========================================================================
          Short names of deliverables
***************
*** 114,118 ****
      <property name="dist.name" value="${project.name}-${project.version}"/>
  
!     <!-- 
         ========================================================================
           Useful file patterns for targets
--- 114,118 ----
      <property name="dist.name" value="${project.name}-${project.version}"/>
  
!     <!--
         ========================================================================
           Useful file patterns for targets
***************
*** 147,151 ****
      </patternset>
  
!     <!-- 
         ========================================================================
           Check to see what libraries are available in order to decide what
--- 147,151 ----
      </patternset>
  
!     <!--
         ========================================================================
           Check to see what libraries are available in order to decide what
***************
*** 161,165 ****
      <target name="check.availabilities">
  
!         <available property="servlet.present" 
              classname="javax.servlet.Servlet"
              classpathref="lib.classpath"/>
--- 161,165 ----
      <target name="check.availabilities">
  
!         <available property="servlet.present"
              classname="javax.servlet.Servlet"
              classpathref="lib.classpath"/>
***************
*** 167,171 ****
      </target>
  
!     <!-- 
         ========================================================================
           Initialize the build. Must be called by all targets
--- 167,171 ----
      </target>
  
!     <!--
         ========================================================================
           Initialize the build. Must be called by all targets
***************
*** 193,197 ****
      </target>
  
!     <!-- 
         ========================================================================
           Prepare the output directory by copying the source files into it
--- 193,197 ----
      </target>
  
!     <!--
         ========================================================================
           Prepare the output directory by copying the source files into it
***************
*** 218,222 ****
      </target>
  
!     <!-- 
         ========================================================================
           Compiles the source directory
--- 218,222 ----
      </target>
  
!     <!--
         ========================================================================
           Compiles the source directory
***************
*** 275,279 ****
      </target>
  
!     <!-- 
         ========================================================================
           Create the runtime jar file
--- 275,279 ----
      </target>
  
!     <!--
         ========================================================================
           Create the runtime jar file
***************
*** 296,302 ****
      <!-- Generate the jar file -->
      <target name="jar" depends="prepare-jar"
!         description="--> generate the framework runtime jar">
  
!         <jar jarfile="${out.dir}/${jar.name}.jar" 
              manifest="${out.conf.dir}/manifest">
  
--- 296,302 ----
      <!-- Generate the jar file -->
      <target name="jar" depends="prepare-jar"
!         description="generate the framework runtime jar">
  
!         <jar jarfile="${out.dir}/${jar.name}.jar"
              manifest="${out.conf.dir}/manifest">
  
***************
*** 307,311 ****
      </target>
  
!     <!-- 
         ========================================================================
           Generate the javadoc
--- 307,311 ----
      </target>
  
!     <!--
         ========================================================================
           Generate the javadoc
***************
*** 317,321 ****
          <mkdir dir="${out.javadoc.dir}"/>
  
!         <uptodate property="javadoc.notrequired" 
              targetfile="${out.javadoc.dir}/packages.html">
  
--- 317,321 ----
          <mkdir dir="${out.javadoc.dir}"/>
  
!         <uptodate property="javadoc.notrequired"
              targetfile="${out.javadoc.dir}/packages.html">
  
***************
*** 326,330 ****
  
      <!-- Generate the javadoc for the current Servlet API -->
!     <target name="javadoc" depends="prepare-javadoc" 
          unless="javadoc.notrequired">
  
--- 326,330 ----
  
      <!-- Generate the javadoc for the current Servlet API -->
!     <target name="javadoc" depends="prepare-javadoc"
          unless="javadoc.notrequired">
  
***************
*** 355,361 ****
               web site -->
  
!         <tar tarfile="${out.dir}/${javadoc.name}.tar" 
              basedir="${out.javadoc.dir}"/>
!         <gzip zipfile="${out.dir}/${javadoc.name}.tar.gz" 
              src="${out.dir}/${javadoc.name}.tar"/>
          <delete file="${out.dir}/${javadoc.name}.tar"/>
--- 355,361 ----
               web site -->
  
!         <tar tarfile="${out.dir}/${javadoc.name}.tar"
              basedir="${out.javadoc.dir}"/>
!         <gzip zipfile="${out.dir}/${javadoc.name}.tar.gz"
              src="${out.dir}/${javadoc.name}.tar"/>
          <delete file="${out.dir}/${javadoc.name}.tar"/>
***************
*** 363,367 ****
      </target>
  
!     <!-- 
         ========================================================================
           Generate the full documentation, i.e. web site + javadoc
--- 363,367 ----
      </target>
  
!     <!--
         ========================================================================
           Generate the full documentation, i.e. web site + javadoc
***************
*** 379,383 ****
              tofile="${out.xdoc.doc.dir}/book.xml" filtering="on"/>
  
!         <!-- Copy all remaining files from ${xdoc.dir} to 
               ${out.xdoc.doc.dir} -->
          <copy todir="${out.xdoc.doc.dir}" filtering="on">
--- 379,383 ----
              tofile="${out.xdoc.doc.dir}/book.xml" filtering="on"/>
  
!         <!-- Copy all remaining files from ${xdoc.dir} to
               ${out.xdoc.doc.dir} -->
          <copy todir="${out.xdoc.doc.dir}" filtering="on">
***************
*** 392,396 ****
          </copy>
  
!         <uptodate property="stylebook.doc.notrequired" 
              targetfile="${out.doc.dir}/index.html">
  
--- 392,396 ----
          </copy>
  
!         <uptodate property="stylebook.doc.notrequired"
              targetfile="${out.doc.dir}/index.html">
  
***************
*** 404,408 ****
      <target name="doc" depends="prepare-doc"
          unless="stylebook.doc.notrequired"
!         description="--> generate the documentation">
  
          <!-- Generate the documentation web site -->
--- 404,408 ----
      <target name="doc" depends="prepare-doc"
          unless="stylebook.doc.notrequired"
!         description="generate the documentation">
  
          <!-- Generate the documentation web site -->
***************
*** 416,423 ****
  
          </stylebook>
!     
      </target>
  
!     <!-- 
         ========================================================================
           Generate the web site
--- 416,423 ----
  
          </stylebook>
! 
      </target>
  
!     <!--
         ========================================================================
           Generate the web site
***************
*** 435,439 ****
              tofile="${out.xdoc.site.dir}/book.xml" filtering="on"/>
  
!         <!-- Copy all remaining files from ${xdoc.dir} to 
               ${out.xdoc.site.dir} -->
          <copy todir="${out.xdoc.site.dir}" filtering="on">
--- 435,439 ----
              tofile="${out.xdoc.site.dir}/book.xml" filtering="on"/>
  
!         <!-- Copy all remaining files from ${xdoc.dir} to
               ${out.xdoc.site.dir} -->
          <copy todir="${out.xdoc.site.dir}" filtering="on">
***************
*** 448,452 ****
          </copy>
  
!         <uptodate property="stylebook.site.notrequired" 
              targetfile="${out.site.dir}/index.html">
  
--- 448,452 ----
          </copy>
  
!         <uptodate property="stylebook.site.notrequired"
              targetfile="${out.site.dir}/index.html">
  
***************
*** 465,469 ****
      <target name="site" depends="prepare-site"
          unless="stylebook.site.notrequired"
!         description="--> generate the web site">
  
          <stylebook book="${out.xdoc.site.dir}/book.xml"
--- 465,469 ----
      <target name="site" depends="prepare-site"
          unless="stylebook.site.notrequired"
!         description="generate the web site">
  
          <stylebook book="${out.xdoc.site.dir}/book.xml"
***************
*** 479,483 ****
          <!-- Create the gzipped web site -->
          <tar tarfile="${out.dir}/${site.name}.tar" basedir="${out.site.dir}"/>
!         <gzip zipfile="${out.dir}/${site.name}.tar.gz" 
              src="${out.dir}/${site.name}.tar"/>
          <delete file="${out.dir}/${site.name}.tar"/>
--- 479,483 ----
          <!-- Create the gzipped web site -->
          <tar tarfile="${out.dir}/${site.name}.tar" basedir="${out.site.dir}"/>
!         <gzip zipfile="${out.dir}/${site.name}.tar.gz"
              src="${out.dir}/${site.name}.tar"/>
          <delete file="${out.dir}/${site.name}.tar"/>
***************
*** 485,489 ****
      </target>
  
!     <!-- 
         ========================================================================
           Run the unit tests
--- 485,489 ----
      </target>
  
!     <!--
         ========================================================================
           Run the unit tests
***************
*** 491,495 ****
      -->
      <target name="test" depends="compile"
!         description="--> run the unit tests">
  
          <junit fork="yes" haltonfailure="yes">
--- 491,495 ----
      -->
      <target name="test" depends="compile"
!         description="run the unit tests">
  
          <junit fork="yes" haltonfailure="yes">
***************
*** 514,518 ****
      </target>
  
!     <!-- 
         ========================================================================
           Remove all build generated files
--- 514,518 ----
      </target>
  
!     <!--
         ========================================================================
           Remove all build generated files
***************
*** 520,524 ****
      -->
      <target name="clean" depends="init"
!         description="--> clean up all generated files">
  
          <delete>
--- 520,524 ----
      -->
      <target name="clean" depends="init"
!         description="clean up all generated files">
  
          <delete>
***************
*** 538,542 ****
      </target>
  
!     <!-- 
         ========================================================================
           Create the distributables
--- 538,542 ----
      </target>
  
!     <!--
         ========================================================================
           Create the distributables
***************
*** 544,554 ****
      -->
      <target name="prepare-dist" depends="jar,doc">
- 
          <mkdir dir="${dist.dir}"/>
  
      </target>
  
!     <target name="dist" depends="prepare-dist"
!         description="--> generate the distributables">
  
          <zip zipfile="${dist.dir}/${dist.name}.zip">
--- 544,557 ----
      -->
      <target name="prepare-dist" depends="jar,doc">
          <mkdir dir="${dist.dir}"/>
+     </target>
  
+     <target name="ZipJavaSources" depends="prepare">
+       <zip zipfile="${out.dir}/${src.name}.zip"
+            basedir="${out.src.dir}" />
      </target>
  
!     <target name="dist" depends="prepare-dist, ZipJavaSources"
!         description="generate the distributables">
  
          <zip zipfile="${dist.dir}/${dist.name}.zip">
***************
*** 557,565 ****
              </zipfileset>
              <zipfileset dir="${out.doc.dir}" prefix="doc"/>
          </zip>
  
      </target>
  
!     <!-- 
         ========================================================================
           Do it all
--- 560,570 ----
              </zipfileset>
              <zipfileset dir="${out.doc.dir}" prefix="doc"/>
+ 	    <zipfileset dir="${out.dir}"  prefix="src"
+                         includes="${src.name}.zip" />
          </zip>
  
      </target>
  
!     <!--
         ========================================================================
           Do it all
***************
*** 567,574 ****
      -->
      <target name="all" depends="clean,jar,doc,test,site,dist"
!         description="--> do it all (clean, jar, doc, test, site)">
      </target>
  
!     <!-- 
         ========================================================================
           Deploy the web site to SourceForge, using the 'scp'
--- 572,579 ----
      -->
      <target name="all" depends="clean,jar,doc,test,site,dist"
!         description="do it all (clean, jar, doc, test, site)">
      </target>
  
!     <!--
         ========================================================================
           Deploy the web site to SourceForge, using the 'scp'
***************
*** 576,585 ****
           when calling this target and represent your username on SourceForge.
  
!          Ex: ant -Dusername=vmassol deploy-site 
  
         ========================================================================
      -->
      <target name="deploy-site" depends="clean,site" if="username"
!         description="--> deploy the web site to SourceForge (see target for details)">
  
          <property name="deploy.homepage" value="/home/groups/m/mo/mockobjects/htdocs"/>
--- 581,590 ----
           when calling this target and represent your username on SourceForge.
  
!          Ex: ant -Dusername=vmassol deploy-site
  
         ========================================================================
      -->
      <target name="deploy-site" depends="clean,site" if="username"
!         description="deploy the web site to SourceForge (see target for details)">
  
          <property name="deploy.homepage" value="/home/groups/m/mo/mockobjects/htdocs"/>