Menu
▾
▴
mockobjects-java-dev
|
From: Steve F. <sm...@us...> - 2002-10-14 23:00:28
|
Update of /cvsroot/mockobjects/mockobjects-java
In directory usw-pr-cvs1:/tmp/cvs-serv10936
Modified Files:
build.xml
Log Message:
some reformatting
added more versioning details to output file names
refactored shared target code
Index: build.xml
===================================================================
RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xml 29 Aug 2002 08:34:36 -0000 1.24
+++ build.xml 14 Oct 2002 23:00:17 -0000 1.25
@@ -1,27 +1,24 @@
<?xml version="1.0"?>
<project name="mockobjects" default="jar" basedir=".">
+
<property file="${user.home}/build.properties" />
<property file="build.properties" />
<property name="out.dir" value="out" />
<property name="out.doc.dir" value="${out.dir}/doc" />
- <property name="out.javadoc.dir"
- value="${out.doc.dir}/javadoc" />
+ <property name="out.javadoc.dir" value="${out.doc.dir}/javadoc" />
<property name="core.classes" value="${out.dir}/core/classes" />
<property name="jdk.classes" value="${out.dir}/jdk/classes" />
<property name="j2ee.classes" value="${out.dir}/j2ee/classes" />
- <property name="httpclient.classes"
- value="${out.dir}/ext/httpclient/classes" />
+ <property name="httpclient.classes" value="${out.dir}/ext/httpclient/classes" />
<property name="out.site.dir" value="${out.dir}/site" />
<property name="out.src.dir" value="${out.dir}/src" />
- <property name="out.src.examples.dir"
- value="${out.src.dir}/examples" />
+ <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="out.xdoc.site.dir" value="${out.dir}/xdoc/site" />
<target name="project-properties">
<property name="project.fullname" value="Mock Objects" />
- <property name="project.version" value="0.4" />
+ <property name="project.version" value="0.5" />
<property name="project.name" value="mockobjects" />
<property name="year" value="2002" />
<property name="debug" value="on" />
@@ -35,8 +32,7 @@
<property name="src.j2ee.dir" value="${src.dir}/j2ee" />
<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="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" />
@@ -46,14 +42,12 @@
<target name="deliverable-names" depends="project-properties">
<property name="dist.dir" value="dist" />
- <property name="jar.base.name" value="mocks" />
- <property name="sources.zip.name"
- value="${project.name}-src" />
+ <property name="jar.base.name" value="mockobjects-${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="javadoc.name" value="${project.name}-javadoc" />
+ <property name="project.zip.name" value="${project.name}-${project.version}" />
</target>
<target name="useful-file-patterns">
@@ -69,27 +63,25 @@
</fileset>
</path>
- <available property="jdk.version" value="1.2"
- classname="java.lang.ThreadLocal" />
- <available property="jdk.version" value="1.3"
- classname="java.lang.StrictMath" />
- <available property="jdk.version" value="1.4"
- classname="java.lang.CharSequence" />
+ <available property="jdk.version" value="1.2" classname="java.lang.ThreadLocal" />
+ <available property="jdk.version" value="1.3" classname="java.lang.StrictMath" />
+ <available property="jdk.version" value="1.4" classname="java.lang.CharSequence" />
<available property="j2ee.version" value="1.2"
- classpathref="lib.classpath"
- classname="javax.servlet.Servlet" />
+ classpathref="lib.classpath"
+ classname="javax.servlet.Servlet" />
<available property="j2ee.version" value="1.3"
- classpathref="lib.classpath"
- classname="javax.servlet.Filter" />
+ classpathref="lib.classpath"
+ classname="javax.servlet.Filter" />
<available property="httpclient" value="true"
- classpathref="lib.classpath"
- classname="org.apache.commons.httpclient.HttpClient" />
+ classpathref="lib.classpath"
+ classname="org.apache.commons.httpclient.HttpClient" />
<property name="jar.j2ee.name" value="" />
<available property="jar.j2ee.name"
- value="_j2ee${j2ee.version}" classpathref="lib.classpath"
- classname="javax.servlet.Servlet" />
+ value="_j2ee${j2ee.version}"
+ classpathref="lib.classpath"
+ classname="javax.servlet.Servlet" />
</target>
<target name="call-me-first"
@@ -113,49 +105,23 @@
</target>
<target name="_flush-dir">
-<!-- requires flush.dir -->
+ <!-- requires flush.dir -->
<delete dir="${flush.dir}" quiet="yes" />
<mkdir dir="${flush.dir}" />
</target>
- <target name="_copy-from-j2ee" if="j2ee.version">
-<!-- requires copy.todir, src.patternset.id -->
- <copy todir="${copy.todir}" filtering="true"
- includeEmptyDirs="false">
- <fileset dir="${src.dir}/j2ee/common">
- <patternset refid="${src.patternset.id}" />
- </fileset>
-
- <fileset dir="${src.dir}/j2ee/${j2ee.version}">
- <patternset refid="${src.patternset.id}" />
- </fileset>
- </copy>
- </target>
-
- <target name="_copy-from-src"
- depends="useful-file-patterns, _copy-from-j2ee">
-<!-- requires copy.todir, src.patternset.id -->
- <copy todir="${copy.todir}" filtering="true"
- includeEmptyDirs="false">
- <fileset dir="${src.dir}/core">
- <patternset refid="${src.patternset.id}" />
- </fileset>
- </copy>
- </target>
-
<target name="compile-core" depends="call-me-first"
description="Compile mock objects core">
<mkdir dir="${core.classes}" />
<javac destdir="${core.classes}" debug="${debug}"
- deprecation="${deprecation}" verbose="false"
- optimize="${optimize}" srcdir="${src.core.dir}">
+ deprecation="${deprecation}" verbose="false"
+ optimize="${optimize}" srcdir="${src.core.dir}">
<exclude name="com/mockobjects/test/**" />
<classpath>
<path refid="lib.classpath" />
-
<pathelement path="${java.class.path}" />
</classpath>
</javac>
@@ -203,12 +169,14 @@
<mkdir dir="${j2ee.classes}" />
- <javac destdir="${j2ee.classes}" debug="${debug}"
- deprecation="${deprecation}" verbose="false"
- optimize="${optimize}">
+ <javac destdir="${j2ee.classes}"
+ debug="${debug}"
+ deprecation="${deprecation}"
+ verbose="false"
+ optimize="${optimize}">
- <src path="${src.j2ee.dir}/${j2ee.version}" />
<src path="${src.j2ee.dir}/common" />
+ <src path="${src.j2ee.dir}/${j2ee.version}" />
<classpath>
<path refid="lib.classpath" />
@@ -273,49 +241,59 @@
</target>
<target name="copy-nonjava-files"
- depends="source-locations, check-availabilities, call-me-first">
+ depends="source-locations, check-availabilities, call-me-first">
</target>
- <target name="jar" depends="jar-core,jar-jdk,jar-j2ee"/>
+ <target name="jar"
+ depends="jar-core, jar-jdk, jar-j2ee"/>
- <target name="jar-core" depends="test"
- description="Generate core mockobjects jar">
-
- <jar jarfile="${out.dir}/mockobjects-core.jar"
- manifest="${conf.dir}/manifest">
+ <target name="jar-core"
+ depends="deliverable-names, test"
+ description="Generate core mockobjects jar">
+ <jar jarfile="${out.dir}/${jar.base.name}-core.jar"
+ manifest="${conf.dir}/manifest">
<fileset dir="${core.classes}" />
</jar>
</target>
- <target name="jar-jdk" depends="test"
- description="Generate jdk mockobjects jar">
- <jar jarfile="${out.dir}/mockobjects-jdk${jdk.version}.jar"
- manifest="${conf.dir}/manifest">
- <fileset dir="${jdk.classes}">
- <exclude name="alt/**"/>
- </fileset>
- </jar>
- <jar jarfile="${out.dir}/alt-jdk${jdk.version}.jar"
- manifest="${conf.dir}/manifest">
- <fileset dir="${jdk.classes}">
- <include name="alt/**"/>
- </fileset>
- </jar>
+
+ <target name="jar-jdk"
+ depends="deliverable-names, test"
+ description="Generate jdk mockobjects jar">
+ <antcall target="_inner-jar">
+ <param name="jarfile.name" value="${out.dir}/${jar.base.name}-jdk${jdk.version}.jar" />
+ <param name="alt.jarfile.name" value="${out.dir}/${alt.jar.base.name}-jdk${jdk.version}.jar" />
+ <param name="classes.dir" value="${jdk.classes}" />
+ </antcall>
</target>
- <target name="jar-j2ee" depends="test" if="j2ee.version"
- description="Generate j2ee mockobjects jar">
- <jar jarfile="${out.dir}/mockobjects-j2ee${j2ee.version}.jar"
- manifest="${conf.dir}/manifest">
- <fileset dir="${j2ee.classes}">
+
+ <target name="jar-j2ee"
+ depends="deliverable-names, test"
+ if="j2ee.version"
+ description="Generate j2ee mockobjects jar">
+ <antcall target="_inner-jar">
+ <param name="jarfile.name" value="${out.dir}/${jar.base.name}-j${jdk.version}-j2ee${j2ee.version}.jar" />
+ <param name="alt.jarfile.name" value="${out.dir}/${alt.jar.base.name}-j${jdk.version}-j2ee${j2ee.version}.jar" />
+ <param name="classes.dir" value="${j2ee.classes}" />
+ </antcall>
+ </target>
+
+ <target name="_inner-jar"
+ depends="deliverable-names, test" >
+ <!-- requires jarfile.name, alt.jarfile.name, classes.dir -->
+ <jar jarfile="${jarfile.name}"
+ manifest="${conf.dir}/manifest">
+ <fileset dir="${classes.dir}">
<exclude name="alt/**"/>
</fileset>
</jar>
- <jar jarfile="${out.dir}/alt-j2ee${j2ee.version}.jar"
- manifest="${conf.dir}/manifest">
- <fileset dir="${j2ee.classes}">
+ <jar jarfile="${alt.jarfile.name}"
+ manifest="${conf.dir}/manifest">
+ <fileset dir="${classes.dir}">
<include name="alt/**"/>
</fileset>
</jar>
</target>
+
<target name="jar-ext-httpclient" depends="test, compile-ext-httpclient"
description="Generate extention mockobjects jar">
<jar jarfile="${out.dir}/mockobjects-httpclient.jar"
@@ -368,15 +346,15 @@
</target>
<target name="_prepare-xdoc">
-<!-- requires prepare.xdoc.dir, book.xml.file -->
+ <!-- requires prepare.xdoc.dir, book.xml.file -->
<mkdir dir="${prepare.xdoc.dir}" />
-<!-- Copy doc-book.xml to book.xml for defining the local
+ <!-- Copy doc-book.xml to book.xml for defining the local
documentation web site and replacing token filters (year) -->
<copy file="${xdoc.dir}/${book.xml.file}" filtering="on"
- tofile="${prepare.xdoc.dir}/book.xml" />
+ tofile="${prepare.xdoc.dir}/book.xml" />
-<!-- Copy all remaining files from ${xdoc.dir} to
+ <!-- Copy all remaining files from ${xdoc.dir} to
${out.xdoc.doc.dir} -->
<copy todir="${prepare.xdoc.dir}" filtering="on">
<fileset dir="${xdoc.dir}">
@@ -392,7 +370,6 @@
<antcall target="_prepare-xdoc">
<param name="prepare.xdoc.dir" value="${out.xdoc.doc.dir}" />
-
<param name="book.xml.file" value="doc-book.xml" />
</antcall>
@@ -423,35 +400,34 @@
description="Generate the documentation website">
</target>
-<!--
+ <!--
========================================================================
Generate the web site
+ Note that we do not copy the javadoc to the web site. This is
+ because the web site need to evolve independently of the javadoc
+ for a given version of the project. In other words, the javadoc on
+ the web site must not change until a new release is out.
========================================================================
- -->
+ -->
+ <!--
<target name="prepare-site"
- depends="deliverable-names, call-me-first">
+ depends="deliverable-names, call-me-first">
<mkdir dir="${out.site.dir}" />
- <mkdir dir="${out.site.dir}/images" />
-
<antcall target="_prepare-xdoc">
- <param name="prepare.xdoc.dir"
- value="${out.xdoc.site.dir}" />
-
+ <param name="prepare.xdoc.dir" value="${out.xdoc.site.dir}" />
<param name="book.xml.file" value="site-book.xml" />
</antcall>
-<!-- Copy the images -->
+ <mkdir dir="${out.site.dir}/images" />
<copy todir="${out.site.dir}/images">
<fileset dir="${xdoc.dir}/images" />
</copy>
-<!-- Copy the papers -->
<copy todir="${out.site.dir}/papers">
<fileset dir="${xdoc.dir}/papers" />
</copy>
-<!-- Copy other files (non XML) -->
<copy todir="${out.site.dir}">
<fileset dir="${xdoc.dir}">
<include name="misc/*.pdf" />
@@ -459,70 +435,72 @@
</copy>
<uptodate property="stylebook.site.notrequired"
- targetfile="${out.site.dir}/index.html">
+ targetfile="${out.site.dir}/index.html">
<srcfiles dir="${out.xdoc.site.dir}" includes="**/*.*" />
-
<srcfiles dir="${skin.dir}" includes="**/*.*" />
</uptodate>
-<!-- Note that we do not copy the javadoc to the web site. This is
- because the web site need to evolve independently of the javadoc
- for a given version of the project. In other words, the javadoc on
- the web site must not change until a new release is out -->
</target>
-<!-- Generate the web site -->
<target name="site"
- depends="deliverable-names, prepare-site"
- unless="stylebook.site.notrequired"
- description="Generate the web site">
+ description="Generate the web site"
+ depends="deliverable-names, prepare-site"
+ unless="stylebook.site.notrequired">
+
<stylebook book="${out.xdoc.site.dir}/book.xml"
- skinDirectory="${skin.dir}/jakarta.apache.org"
- targetDirectory="${out.site.dir}">
+ skinDirectory="${skin.dir}/jakarta.apache.org"
+ targetDirectory="${out.site.dir}">
<classpath>
<pathelement path="${java.class.path}" />
</classpath>
</stylebook>
-<!-- Create the gzipped web site -->
- <tar tarfile="${out.dir}/${site.name}.tar"
- basedir="${out.site.dir}" />
+ <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" />
+ </target>
+ -->
- <gzip zipfile="${out.dir}/${site.name}.tar.gz"
- src="${out.dir}/${site.name}.tar" />
+ <target name="clean-compiled"
+ description="Clean up compiled class files"
+ depends="call-me-first" >
+ <delete quiet="true">
+ <fileset dir="${core.classes}" />
+ <fileset dir="${jdk.classes}" />
+ <fileset dir="${j2ee.classes}" />
+ </delete>
- <delete file="${out.dir}/${site.name}.tar" />
</target>
- <target name="clean" depends="call-me-first"
- description="clean up all generated files">
+ <target description="clean up all generated files"
+ name="clean"
+ depends="call-me-first">
<delete>
<fileset dir=".">
<include name="**/*.bak" />
</fileset>
</delete>
-<!-- Deletes all files ending with '~' -->
<delete>
<fileset dir="." includes="**/*~" defaultexcludes="no" />
</delete>
-<!-- Remove the out directory -->
<delete dir="${out.dir}" />
</target>
- <target name="prepare-dist" depends="jar,doc">
+ <target name="prepare-dist"
+ depends="jar,doc">
<mkdir dir="${dist.dir}" />
</target>
- <target name="zip-java-sources" depends="deliverable-names">
- <zip zipfile="${out.dir}/${sources.zip.name}.zip"
- basedir="${src.dir}" />
+ <target name="zip-java-sources"
+ depends="deliverable-names">
+ <zip zipfile="${out.dir}/${sources.zip.name}.zip" basedir="${src.dir}" />
</target>
- <target name="dist"
- depends="call-me-first, prepare-dist, zip-java-sources"
- description="Generate the distributables">
+ <target description="Generate the distributables"
+ name="dist"
+ depends="call-me-first, prepare-dist, zip-java-sources">
<zip zipfile="${dist.dir}/mockobjects${project.version}.zip">
<zipfileset dir="${out.dir}" prefix="lib">
<include name="*.jar" />
@@ -541,8 +519,9 @@
Do it all
========================================================================
-->
- <target name="all" depends="clean, test, jar, doc, site, dist"
- description="do it all (clean, jar, doc, test, site)">
+ <target name="all"
+ depends="clean, test, jar, doc, dist"
+ description="do it all (clean, jar, doc, test)">
</target>
<!--
@@ -555,6 +534,7 @@
========================================================================
-->
+<!--
<target name="deploy-site" depends="clean, site" if="username"
description="Deploy the web site to SourceForge (see target for details)">
@@ -575,6 +555,6 @@
line="-l ${username} ${deploy.host} 'cd ${deploy.homepage};gunzip ${site.name}.tar.gz;tar xvf ${site.name}.tar;rm ${site.name}.tar'" />
</exec>
</target>
-
+-->
</project>
|
