From: Vincent M. <vm...@us...> - 2003-05-16 19:03:37
|
Update of /cvsroot/mockobjects/mockobjects-java In directory sc8-pr-cvs1:/tmp/cvs-serv15453 Modified Files: build.xml Log Message: - Removed targets used to generate the web site - Prepare for release by moving the version to 0.08 Index: build.xml =================================================================== RCS file: /cvsroot/mockobjects/mockobjects-java/build.xml,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- build.xml 13 May 2003 08:59:12 -0000 1.33 +++ build.xml 16 May 2003 19:03:33 -0000 1.34 @@ -3,6 +3,7 @@ <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" /> @@ -19,7 +20,7 @@ <target name="project-properties"> <property name="project.fullname" value="Mock Objects" /> - <property name="project.version" value="0.08dev" /> + <property name="project.version" value="0.08" /> <property name="year" value="2002" /> <property name="debug" value="on" /> <property name="optimize" value="off" /> @@ -40,8 +41,7 @@ <property name="j2ee.lib" value="lib/j2ee.jar" /> </target> - <target name="deliverable-names" - depends="project-properties"> + <target name="deliverable-names" depends="project-properties"> <property name="dist.dir" value="dist" /> <property name="jar.base.name" value="${ant.project.name}-${project.version}" /> <property name="alt.jar.base.name" value="alt-${project.version}" /> @@ -57,8 +57,8 @@ </patternset> </target> - <target name="check-availabilities" - depends="source-locations"> + <target name="check-availabilities" depends="source-locations"> + <path id="lib.classpath"> <fileset dir="${lib.dir}"> <include name="*.jar" /> @@ -107,42 +107,31 @@ <filter token="today" value="${TODAY}" /> </target> - <target name="_flush-dir"> - <!-- requires flush.dir --> - <delete dir="${flush.dir}" quiet="yes" /> - - <mkdir dir="${flush.dir}" /> - </target> - - <target name="compile-core" - depends="call-me-first" + <target name="compile-core" depends="call-me-first" description="Compile mock objects core"> - <mkdir dir="${core.classes}" /> + <mkdir dir="${core.classes}" /> <javac destdir="${core.classes}" debug="${debug}" verbose="false" optimize="${optimize}" - srcdir="${src.core.dir}"> - + srcdir="${src.core.dir}"> <classpath> <path refid="lib.classpath" /> <pathelement path="${java.class.path}" /> </classpath> </javac> + </target> - <target name="compile-jdk" - depends="compile-core" + <target name="compile-jdk" depends="compile-core" description="Compile all the java files for included libraries"> - <mkdir dir="${jdk.classes}" /> - <javac destdir="${jdk.classes}" debug="${debug}" - verbose="false" + <mkdir dir="${jdk.classes}" /> + <javac destdir="${jdk.classes}" debug="${debug}" verbose="false" optimize="${optimize}"> <src path="${src.jdk.dir}/${jdk.version}" /> <src path="${src.jdk.dir}/common" /> - <classpath> <path refid="lib.classpath" /> <pathelement path="${java.class.path}" /> @@ -355,122 +344,6 @@ </javadoc> </target> - <target name="_prepare-xdoc"> - <!-- requires prepare.xdoc.dir, book.xml.file --> - <mkdir dir="${prepare.xdoc.dir}" /> - - <!-- 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" /> - - <!-- Copy all remaining files from ${xdoc.dir} to - ${out.xdoc.doc.dir} --> - <copy todir="${prepare.xdoc.dir}" filtering="on"> - <fileset dir="${xdoc.dir}"> - <exclude name="*-book.xml" /> - </fileset> - </copy> - </target> - - <target name="prepare-doc" depends="javadoc"> - <mkdir dir="${out.doc.dir}" /> - - <mkdir dir="${out.doc.dir}/images" /> - - <antcall target="_prepare-xdoc"> - <param name="prepare.xdoc.dir" value="${out.xdoc.doc.dir}" /> - <param name="book.xml.file" value="doc-book.xml" /> - </antcall> - -<!-- Copy the images --> - <copy todir="${out.doc.dir}/images"> - <fileset dir="${xdoc.dir}/images" /> - </copy> - -<!-- Copy other files (non XML) --> - <copy todir="${out.doc.dir}"> - <fileset dir="${xdoc.dir}"> - <include name="misc/*.pdf" /> - - <include name="papers/**" /> - </fileset> - </copy> - - <uptodate property="stylebook.doc.notrequired" - targetfile="${out.doc.dir}/index.html"> - <srcfiles dir="${out.xdoc.doc.dir}" includes="**/*.*" /> - - <srcfiles dir="${skin.dir}" includes="**/*.*" /> - </uptodate> - </target> - - <target name="doc" depends="prepare-doc" - unless="stylebook.doc.notrequired" - 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"> - <mkdir dir="${out.site.dir}" /> - - <antcall target="_prepare-xdoc"> - <param name="prepare.xdoc.dir" value="${out.xdoc.site.dir}" /> - <param name="book.xml.file" value="site-book.xml" /> - </antcall> - - <mkdir dir="${out.site.dir}/images" /> - <copy todir="${out.site.dir}/images"> - <fileset dir="${xdoc.dir}/images" /> - </copy> - - <copy todir="${out.site.dir}/papers"> - <fileset dir="${xdoc.dir}/papers" /> - </copy> - - <copy todir="${out.site.dir}"> - <fileset dir="${xdoc.dir}"> - <include name="misc/*.pdf" /> - </fileset> - </copy> - - <uptodate property="stylebook.site.notrequired" - targetfile="${out.site.dir}/index.html"> - <srcfiles dir="${out.xdoc.site.dir}" includes="**/*.*" /> - <srcfiles dir="${skin.dir}" includes="**/*.*" /> - </uptodate> - - </target> - - <target name="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}"> - <classpath> - <pathelement path="${java.class.path}" /> - </classpath> - </stylebook> - - <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> - --> - <target name="clean-compiled" description="Clean up compiled class files" depends="call-me-first" > @@ -499,7 +372,7 @@ </target> <target name="prepare-dist" - depends="jar,doc"> + depends="jar,javadoc"> <mkdir dir="${dist.dir}" /> </target> @@ -516,8 +389,6 @@ <include name="*.jar" /> </zipfileset> - <zipfileset dir="${out.doc.dir}" prefix="doc" /> - <zipfileset dir="${out.dir}" prefix="src"> <include name="${ant.project.name}-${project.version}-src.zip" /> </zipfileset> @@ -530,43 +401,9 @@ ======================================================================== --> <target name="all" - depends="clean, junit, jar, doc, dist" - description="do it all (clean, jar, doc, junit, dist)"> + depends="clean, junit, jar, javadoc, dist" + description="do it all (clean, jar, javadoc, junit, dist)"> </target> - -<!-- - ======================================================================== - Deploy the web site to SourceForge, using the 'scp' - and 'ssh' commands. The variable "username" need to be passed to Ant - 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" /> - - <property name="deploy.host" - value="mockobjects.sourceforge.net" /> - - <exec dir="." executable="scp"> - <arg value="${out.dir}/${site.name}.tar.gz" /> - - <arg value="${username}@${deploy.host}:${deploy.homepage}" /> - </exec> - - <exec dir="." executable="ssh"> - <arg - line="-l ${username} ${deploy.host} 'cd ${deploy.homepage};gunzip ${site.name}.tar.gz;tar xvf ${site.name}.tar;rm ${site.name}.tar'" /> - </exec> - </target> ---> - <target name="src" depends="clean,prepare-dist"> <property name="dist.name" |