[MO-java-dev] CVS: mockobjects-java build.xml,1.22,1.23

[Jeff M. <cus...@us...>]

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

Modified Files:
	build.xml 
Log Message:
Changes to build file to improve code release


Index: build.xml
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml	9 May 2002 13:16:38 -0000	1.22
+++ build.xml	30 Jul 2002 18:22:35 -0000	1.23
@@ -21,7 +21,7 @@
 
   <target name="project-properties">
     <property name="project.fullname" value="Mock Objects" />
-    <property name="project.version" value="0.03" />
+    <property name="project.version" value="0.4" />
     <property name="project.name" value="mockobjects" />
     <property name="year" value="2002" />
     <property name="debug" value="on" />
@@ -336,8 +336,8 @@
   depends="call-me-first, deliverable-names"
   unless="javadoc.notrequired"
   description="Generate the javadoc for the current version">
-    <javadoc sourcepath="${out.src.dir}"
-    packagenames="com.mockobjects.*" destdir="${out.javadoc.dir}"
+    <javadoc
+    packagenames="com.mockobjects.*,alt.*" destdir="${out.javadoc.dir}"
     author="true" public="true" version="true" use="true"
     windowtitle="${project.fullname} ${project.version}"
     doctitle="${project.fullname} ${project.version}"
@@ -345,27 +345,18 @@
 
       <classpath>
         <path refid="lib.classpath" />
-
         <pathelement path="${java.class.path}" />
       </classpath>
+      <sourcepath>
+        <pathelement path="${src.dir}/core"/>
+        <pathelement path="${src.dir}/jdk/common"/>
+        <pathelement path="${src.dir}/jdk/1.3"/>
+        <pathelement path="${src.dir}/j2ee/common"/>
+        <pathelement path="${src.dir}/j2ee/1.3"/>
+      </sourcepath>
     </javadoc>
   </target>
 
-  <target name="zip-javadoc-for-website" depends="javadoc">
-<!-- Create a gzip file of the javadoc. This is for putting to the
-             project web site. It needs to be unzipped in the root document
-             of the web site. This file is not intended to be redistributed as part
-             of the end-user redistributable. It is simply to help create the
-             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" />
-  </target>
-
   <target name="_prepare-xdoc">
 <!-- requires prepare.xdoc.dir, book.xml.file -->
     <mkdir dir="${prepare.xdoc.dir}" />
@@ -420,13 +411,6 @@
   <target name="doc" depends="prepare-doc"
   unless="stylebook.doc.notrequired"
   description="Generate the documentation website">
-    <stylebook book="${out.xdoc.doc.dir}/book.xml"
-    skinDirectory="${skin.dir}/jakarta.apache.org"
-    targetDirectory="${out.doc.dir}">
-      <classpath>
-        <pathelement path="${java.class.path}" />
-      </classpath>
-    </stylebook>
   </target>
 
 <!--
@@ -479,7 +463,7 @@
 
 <!-- Generate the web site -->
   <target name="site"
-  depends="deliverable-names, prepare-site, zip-javadoc-for-website"
+  depends="deliverable-names, prepare-site"
    unless="stylebook.site.notrequired"
   description="Generate the web site">
     <stylebook book="${out.xdoc.site.dir}/book.xml"
@@ -529,15 +513,15 @@
   <target name="dist"
   depends="call-me-first, prepare-dist, zip-java-sources"
   description="Generate the distributables">
-    <zip zipfile="${dist.dir}/${dist.name}.zip">
+    <zip zipfile="${dist.dir}/mockobjects${project.version}.zip">
       <zipfileset dir="${out.dir}" prefix="lib">
-        <include name="${jar.name}.jar" />
+        <include name="*.jar" />
       </zipfileset>
 
       <zipfileset dir="${out.doc.dir}" prefix="doc" />
 
       <zipfileset dir="${out.dir}" prefix="src">
-        <include name="${src.name}.zip" />
+        <include name="mockobjects-src.zip" />
       </zipfileset>
     </zip>
   </target>