[MO-java-dev] CVS: mockobjects-java build.xml,1.31,1.32 env.txt,1.2,1.3

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

Update of /cvsroot/mockobjects/mockobjects-java
In directory sc8-pr-cvs1:/tmp/cvs-serv22955

Modified Files:
	build.xml env.txt 
Log Message:
Pepper Mocks with ReturnValue


Index: build.xml
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- build.xml	13 Jan 2003 13:46:56 -0000	1.31
+++ build.xml	18 Mar 2003 14:28:43 -0000	1.32
@@ -15,11 +15,11 @@
   <property name="out.src.examples.dir" value="${out.src.dir}/examples" />
   <property name="out.xdoc.doc.dir" value="${out.dir}/xdoc/doc" />
   <property name="out.xdoc.site.dir" value="${out.dir}/xdoc/site" />
+  <property name="conf.dir" value="conf" />
 
   <target name="project-properties">
     <property name="project.fullname" value="Mock Objects" />
     <property name="project.version" value="0.08dev" />
-    <property name="project.name" value="mockobjects" />
     <property name="year" value="2002" />
     <property name="debug" value="on" />
     <property name="optimize" value="off" />
@@ -33,7 +33,6 @@
     <property name="src.jdk.dir" value="${src.dir}/jdk" />
     <property name="src.httpclient.dir" value="${src.dir}/extensions" />
     <property name="src.examples.dir" value="${src.dir}/examples" />
-    <property name="conf.dir" value="conf" />
     <property name="doc.dir" value="doc" />
     <property name="xdoc.dir" value="${doc.dir}/xdocs" />
     <property name="skin.dir" value="${doc.dir}/skins" />
@@ -44,12 +43,12 @@
   <target name="deliverable-names"
           depends="project-properties">
     <property name="dist.dir" value="dist" />
-    <property name="jar.base.name" value="mockobjects-${project.version}" />
+    <property name="jar.base.name" value="${ant.project.name}-${project.version}" />
     <property name="alt.jar.base.name" value="alt-${project.version}" />
-    <property name="sources.zip.name" value="${project.name}-src" />
-    <property name="site.name" value="${project.name}-website" />
-    <property name="javadoc.name" value="${project.name}-javadoc" />
-    <property name="project.zip.name" value="${project.name}-${project.version}" />
+    <property name="sources.zip.name" value="${ant.project.name}-src" />
+    <property name="site.name" value="${ant.project.name}-website" />
+    <property name="javadoc.name" value="${ant.project.name}-javadoc" />
+    <property name="project.zip.name" value="${ant.project.name}-${project.version}" />
   </target>
 
   <target name="useful-file-patterns">
@@ -246,12 +245,12 @@
   </target>
 
   <target name="jar"
-          depends="jar-core, jar-jdk, jar-j2ee"/>
+          depends="junit, jar-core, jar-jdk, jar-j2ee"/>
 
   <target name="jar-core"
-          depends="deliverable-names, junit"
+          depends="compile-core, deliverable-names"
           description="Generate core mockobjects jar">
-    <jar jarfile="${out.dir}/${jar.base.name}-core.jar"
+    <jar jarfile="${out.dir}/${ant.project.name}-core-${project.version}.jar"
          manifest="${conf.dir}/manifest">
       <fileset dir="${core.classes}">
         <exclude name="test/**"/>
@@ -260,7 +259,7 @@
   </target>
 
   <target name="jar-jdk"
-          depends="deliverable-names, junit"
+          depends="deliverable-names"
           description="Generate jdk mockobjects jar">
     <antcall target="_inner-jar">
       <param name="jarfile.name"
@@ -272,7 +271,7 @@
   </target>
 
   <target name="jar-j2ee"
-          depends="deliverable-names, junit"
+          depends="deliverable-names"
           if="j2ee.version"
           description="Generate j2ee mockobjects jar">
     <antcall target="_inner-jar">
@@ -285,7 +284,7 @@
   </target>
 
   <target name="_inner-jar"
-          depends="deliverable-names, junit" >
+          depends="deliverable-names" >
     <!-- requires jarfile.name, alt.jarfile.name, classes.dir -->
     <jar jarfile="${jarfile.name}"
          manifest="${conf.dir}/manifest">
@@ -306,7 +305,7 @@
   <target name="jar-ext-httpclient"
           depends="junit, compile-ext-httpclient"
 	  description="Generate extension mockobjects jar">
-    <jar jarfile="${out.dir}/mockobjects-httpclient.jar"
+    <jar jarfile="${out.dir}/${ant.project.name}-httpclient.jar"
       manifest="${conf.dir}/manifest">
       <fileset dir="${httpclient.classes}">
         <exclude name="alt/**"/>
@@ -512,7 +511,7 @@
   <target description="Generate the distributables"
           name="dist"
           depends="call-me-first, prepare-dist, zip-java-sources">
-    <zip zipfile="${dist.dir}/mockobjects${project.version}.zip">
+    <zip zipfile="${dist.dir}/${ant.project.name}${project.version}.zip">
       <zipfileset dir="${out.dir}" prefix="lib">
         <include name="*.jar" />
       </zipfileset>
@@ -520,7 +519,7 @@
       <zipfileset dir="${out.doc.dir}" prefix="doc" />
 
       <zipfileset dir="${out.dir}" prefix="src">
-        <include name="mockobjects-${project.version}-src.zip" />
+        <include name="${ant.project.name}-${project.version}-src.zip" />
       </zipfileset>
     </zip>
   </target>
@@ -567,5 +566,25 @@
     </exec>
   </target>
 -->
+
+
+  <target name="src" depends="clean,prepare-dist">
+    <property name="dist.name"
+      value="${ant.project.name}-${project.version}"/>
+    <copy todir="${dist.dir}/${dist.name}">
+      <fileset dir="${basedir}">
+        <include name="${src.dir}/**"/>
+        <include name="build.xml"/>
+        <include name="${lib.dir}/**"/>
+        <include name="${conf.dir}/**"/>
+      </fileset>
+    </copy>
+    <tar tarfile="${dist.name}-src.tar" basedir="${dist.dir}">
+    </tar>
+    <gzip zipfile="${dist.name}-src.tgz"
+      src="${dist.name}-src.tar" />
+    <delete file="${dist.name}-src.tar" />
+  </target>
+
 </project>
 

Index: env.txt
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/env.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- env.txt	15 Oct 2002 13:53:11 -0000	1.2
+++ env.txt	18 Mar 2003 14:28:43 -0000	1.3
@@ -1,4 +1,3 @@
-clean-compiled jar:/usr/java/j2sdk1.3.1:
+clean-compiled jar:/opt/IBMJava2-131:
 clean-compiled jar:/usr/java/j2sdk1.4.1:
-clean-compiled jar:/usr/java/jdk1.3.1_01:-Dj2ee.lib=lib/j2ee.jar
-clean-compiled jar:/usr/java/jdk1.3.1_03:-Dj2ee.lib=lib/j2ee.jar
+clean-compiled jar:/opt/IBMJava2-131:-Dj2ee.lib=lib/j2ee.jar