Author: steveh
Date: Mon Oct 11 15:59:45 2004
New Revision: 54633
Modified:
incubator/beehive/trunk/controls/build.xml
Log:
Changed location of doc build. Added "-notimestamp".
Modified: incubator/beehive/trunk/controls/build.xml
==============================================================================
--- incubator/beehive/trunk/controls/build.xml (original)
+++ incubator/beehive/trunk/controls/build.xml Mon Oct 11 15:59:45 2004
@@ -15,245 +15,198 @@
$Header:$
-->
-
<project name="controls" default="usage" basedir=".">
-
- <property environment="os"/>
- <property file="../beehive.properties"/>
-
- <!-- THE CONTROL BUILD REQUIRES JDK5 AND LATER. ATTEMPTS TO BUILD ON JDK
EALRIER THAN 5.0 WILL BE A NOOP -->
- <condition property="isJDKOver5">
- <equals arg1="${ant.java.version}" arg2="1.5"/>
- </condition>
-
- <property name="build.dir" value="build"/>
- <property name="classes.dir" value="${build.dir}/classes" />
- <property name="jars.dir" value="${build.dir}/jars"/>
- <property name="docs.dir" value="${build.dir}/docs"/>
-
- <property name="api.dir" value="src/api"/>
- <property name="api.classes" value="${classes.dir}/api"/>
-
- <property name="runtime.dir" value="src/runtime"/>
- <property name="runtime.classes" value="${classes.dir}/runtime"/>
-
- <property name="controls.jar" value="${jars.dir}/controls.jar"/>
-
- <path id="api.classpath">
+ <property environment="os"/>
+ <property file="../beehive.properties"/>
+ <!-- THE CONTROL BUILD REQUIRES JDK5 AND LATER. ATTEMPTS TO BUILD ON
JDK EALRIER THAN 5.0 WILL BE A NOOP -->
+ <condition property="isJDKOver5">
+ <equals arg1="${ant.java.version}" arg2="1.5"/>
+ </condition>
+ <property name="build.dir" value="build"/>
+ <property name="classes.dir" value="${build.dir}/classes"/>
+ <property name="jars.dir" value="${build.dir}/jars"/>
+ <property name="docs.dir" value="${build.dir}/docs"/>
+ <property name="api.dir" value="src/api"/>
+ <property name="api.classes" value="${classes.dir}/api"/>
+ <property name="runtime.dir" value="src/runtime"/>
+ <property name="runtime.classes" value="${classes.dir}/runtime"/>
+ <property name="controls.jar" value="${jars.dir}/controls.jar"/>
+ <path id="api.classpath">
</path>
-
- <path id="runtime.classpath">
- <pathelement location="${ant.jar}"/>
- <pathelement location="${servlet24.jar}"/>
- <pathelement location="${tools.jar}"/>
- <pathelement location="${velocity14.jar}"/>
- <pathelement location="${velocitydep14.jar}"/>
- <pathelement location="${api.classes}"/>
- <path id="${api.classpath}"/>
- </path>
-
- <condition property="controls.os" value="windows" >
- <os family="windows" />
- </condition>
- <condition property="controls.os" value="unix" >
- <os family="unix" />
- </condition>
-
- <!-- ==================================================================== -->
- <!-- usage - output usage -->
- <!-- ==================================================================== -->
- <target name="usage">
- <echo message="" />
- <echo message="" />
- <echo message="Controls Build file" />
- <echo
message="================================================================" />
- <echo message="| Usage
|" />
- <echo
message="================================================================" />
- <echo message="" />
- <echo
message="----------------------------------------------------------------" />
- <echo message="| Standard Targets
|" />
- <echo
message="----------------------------------------------------------------" />
- <echo message="build - build java classes and jar files" />
- <echo message="clean - remove build files" />
- <echo message="deploy - does nothing for this project" />
- <echo message="redeploy - do an "clean", ",
"build" and "deploy"." />
- <echo message="docs - build the java docs" />
- <echo message="drt - runs the DRT (developer regression test)" />
- <echo message="" />
- <echo
message="----------------------------------------------------------------" />
- <echo message="| Project-Specific Targets
|" />
- <echo
message="----------------------------------------------------------------" />
- <echo message="dirs - Creates the output directories of the
build."/>
- <echo message="classes - Compiles the source code of the project."/>
- <echo
message="================================================================" />
- <echo message="| NOTE: THE WSM PROJECT ONLY BUILDS ON JDK5 AND LATER
|" />
- <echo
message="================================================================" />
- <echo message="" />
- <echo message="" />
- </target>
-
- <!-- ==================================================================== -->
- <!-- Creates the output directories of the build. -->
- <!-- ==================================================================== -->
- <target name="dirs">
- <mkdir dir="${api.classes}"/>
- <mkdir dir="${runtime.classes}"/>
- <mkdir dir="${jars.dir}"/>
- <mkdir dir="${docs.dir}"/>
- </target>
-
- <!-- ==================================================================== -->
- <!-- Compiles the source code of the project. -->
- <!-- ==================================================================== -->
- <target name="classes" depends="dirs" if="isJDKOver5">
-
- <!-- Build the API classes -->
- <javac destdir="${api.classes}" classpathref="api.classpath" debug="on" >
- <src path="${api.dir}"/>
- </javac>
-
- <!-- Build the runtime classes -->
- <javac destdir="${runtime.classes}" classpathref="runtime.classpath"
debug="on">
- <src path="${runtime.dir}"/>
- </javac>
-
- <!-- Copy template files into the build -->
- <copy todir="${runtime.classes}" overwrite="true" >
- <fileset dir="${runtime.dir}"
includes="**/*.template,**/*.vm,META-INF/**" />
- </copy>
-
- <!-- Copy property files into the build -->
- <copy todir="${runtime.classes}" overwrite="true" >
- <fileset dir="${runtime.dir}" includes="**/*.properties" />
- </copy>
-
-
- </target>
-
- <!-- ==================================================================== -->
- <!-- Jars up the classes, libraries, and resources. -->
- <!-- ==================================================================== -->
- <target name="build" depends="classes" if="isJDKOver5">
- <echo message="--------------------------------------------------" />
- <echo message="| controls build starting |" />
- <echo message="--------------------------------------------------" />
-
- <jar jarfile="${controls.jar}" >
- <fileset dir="${api.classes}" />
- <fileset dir="${runtime.classes}" />
- </jar>
-
- <echo message="--------------------------------------------------" />
- <echo message="| controls build ending |" />
- <echo message="--------------------------------------------------" />
- </target>
-
-
- <!-- ==================================================================== -->
- <!-- build_all. build this project and all inter-project dependencies -->
- <!-- ==================================================================== -->
- <target name="build_all">
- <antcall target="build"/>
- </target>
-
- <!-- ==================================================================== -->
- <!-- clean -->
- <!-- ==================================================================== -->
- <target name="clean">
- <delete dir="${build.dir}"/>
- </target>
-
- <!-- ==================================================================== -->
- <!-- clean_all -->
- <!-- ==================================================================== -->
- <target name="clean_all">
- <antcall target="clean"/>
- </target>
-
- <!-- ==================================================================== -->
- <!-- redeploy -->
- <!-- ==================================================================== -->
- <target name="redeploy">
- <antcall target="clean"/>
- <antcall target="build"/>
- <antcall target="deploy"/>
- </target>
-
- <!-- ==================================================================== -->
- <!-- redeploy_all -->
- <!-- ==================================================================== -->
- <target name="redeploy_all">
- <antcall target="clean_all"/>
- <antcall target="build_all"/>
- <antcall target="deploy_all"/>
- </target>
-
- <!-- ==================================================================== -->
- <!-- deploy -->
- <!-- ==================================================================== -->
- <target name="deploy" depends="build" if="isJDKOver5">
- <echo message="--------------------------------------------------" />
- <echo message="| controls deploy starting |" />
- <echo message="--------------------------------------------------" />
-
- <!-- Copy build output to client locations (lib dir of servers etc) -->
-
- <echo message="--------------------------------------------------" />
- <echo message="| controls deploy ending |" />
- <echo message="--------------------------------------------------" />
- </target>
-
- <!-- ==================================================================== -->
- <!-- deploy_all -->
- <!-- ==================================================================== -->
- <target name="deploy_all" >
- <antcall target="deploy"/>
- </target>
-
- <!-- ==================================================================== -->
- <!-- minprod -->
- <!-- ==================================================================== -->
- <target name = "minprod">
- <echo message="--------------------------------------------------" />
- <echo message="| controls minprod starting |" />
- <echo message="--------------------------------------------------" />
-
- <antcall target="deploy" />
-
- <echo message="--------------------------------------------------" />
- <echo message="| controls minprod completed |" />
- <echo message="--------------------------------------------------" />
- </target>
-
- <!-- ==================================================================== -->
- <!-- docs -->
- <!-- ==================================================================== -->
- <target name="docs" if="isJDKOver5">
- <javadoc
- destdir="${docs.dir}"
- maxmemory="256M"
- windowtitle="Controls Documentation"
- doctitle="Java Controls"
- version="true"
- author="false"
- use="true"
- additionalparam="-breakiterator -noqualifier all"
- useexternalfile="true"
- classpathref="runtime.classpath">
- <packageset dir="${api.dir}" defaultexcludes="yes">
- <include name="org/apache/beehive/controls/**/*" />
- </packageset>
- <packageset dir="${runtime.dir}" defaultexcludes="yes">
- <include name="org/apache/beehive/controls/**/*" />
- </packageset>
- </javadoc>
- </target>
-
- <!-- ==================================================================== -->
- <!-- drt -->
- <!-- ==================================================================== -->
- <target name="drt" depends="deploy">
- <ant dir="./test" target="checkin.tests" inheritAll="false"/>
- </target>
-
+ <path id="runtime.classpath">
+ <pathelement location="${ant.jar}"/>
+ <pathelement location="${servlet24.jar}"/>
+ <pathelement location="${tools.jar}"/>
+ <pathelement location="${velocity14.jar}"/>
+ <pathelement location="${velocitydep14.jar}"/>
+ <pathelement location="${api.classes}"/>
+ <path id="${api.classpath}"/>
+ </path>
+ <condition property="controls.os" value="windows">
+ <os family="windows"/>
+ </condition>
+ <condition property="controls.os" value="unix">
+ <os family="unix"/>
+ </condition>
+ <!--
==================================================================== -->
+ <!-- usage - output usage -->
+ <!--
==================================================================== -->
+ <target name="usage">
+ <echo message=""/>
+ <echo message=""/>
+ <echo message="Controls Build file"/>
+ <echo
message="================================================================"/>
+ <echo message="| Usage
|"/>
+ <echo
message="================================================================"/>
+ <echo message=""/>
+ <echo
message="----------------------------------------------------------------"/>
+ <echo message="| Standard Targets
|"/>
+ <echo
message="----------------------------------------------------------------"/>
+ <echo message="build - build java classes and jar files"/>
+ <echo message="clean - remove build files"/>
+ <echo message="deploy - does nothing for this project"/>
+ <echo message="redeploy - do an "clean", ",
"build" and "deploy"."/>
+ <echo message="docs - build the java docs"/>
+ <echo message="drt - runs the DRT (developer regression
test)"/>
+ <echo message=""/>
+ <echo
message="----------------------------------------------------------------"/>
+ <echo message="| Project-Specific Targets
|"/>
+ <echo
message="----------------------------------------------------------------"/>
+ <echo message="dirs - Creates the output directories of
the build."/>
+ <echo message="classes - Compiles the source code of the
project."/>
+ <echo
message="================================================================"/>
+ <echo message="| NOTE: THE WSM PROJECT ONLY BUILDS ON JDK5
AND LATER |"/>
+ <echo
message="================================================================"/>
+ <echo message=""/>
+ <echo message=""/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- Creates the output directories of the build. -->
+ <!--
==================================================================== -->
+ <target name="dirs">
+ <mkdir dir="${api.classes}"/>
+ <mkdir dir="${runtime.classes}"/>
+ <mkdir dir="${jars.dir}"/>
+ <mkdir dir="${docs.dir}"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- Compiles the source code of the project. -->
+ <!--
==================================================================== -->
+ <target name="classes" depends="dirs" if="isJDKOver5">
+ <!-- Build the API classes -->
+ <javac destdir="${api.classes}" classpathref="api.classpath"
debug="on">
+ <src path="${api.dir}"/>
+ </javac>
+ <!-- Build the runtime classes -->
+ <javac destdir="${runtime.classes}"
classpathref="runtime.classpath" debug="on">
+ <src path="${runtime.dir}"/>
+ </javac>
+ <!-- Copy template files into the build -->
+ <copy todir="${runtime.classes}" overwrite="true">
+ <fileset dir="${runtime.dir}"
includes="**/*.template,**/*.vm,META-INF/**"/>
+ </copy>
+ <!-- Copy property files into the build -->
+ <copy todir="${runtime.classes}" overwrite="true">
+ <fileset dir="${runtime.dir}"
includes="**/*.properties"/>
+ </copy>
+ </target>
+ <!--
==================================================================== -->
+ <!-- Jars up the classes, libraries, and resources. -->
+ <!--
==================================================================== -->
+ <target name="build" depends="classes" if="isJDKOver5">
+ <echo
message="--------------------------------------------------"/>
+ <echo message="| controls build starting
|"/>
+ <echo
message="--------------------------------------------------"/>
+ <jar jarfile="${controls.jar}">
+ <fileset dir="${api.classes}"/>
+ <fileset dir="${runtime.classes}"/>
+ </jar>
+ <echo
message="--------------------------------------------------"/>
+ <echo message="| controls build ending
|"/>
+ <echo
message="--------------------------------------------------"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- build_all. build this project and all inter-project dependencies
-->
+ <!--
==================================================================== -->
+ <target name="build_all">
+ <antcall target="build"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- clean -->
+ <!--
==================================================================== -->
+ <target name="clean">
+ <delete dir="${build.dir}"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- clean_all -->
+ <!--
==================================================================== -->
+ <target name="clean_all">
+ <antcall target="clean"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- redeploy -->
+ <!--
==================================================================== -->
+ <target name="redeploy">
+ <antcall target="clean"/>
+ <antcall target="build"/>
+ <antcall target="deploy"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- redeploy_all -->
+ <!--
==================================================================== -->
+ <target name="redeploy_all">
+ <antcall target="clean_all"/>
+ <antcall target="build_all"/>
+ <antcall target="deploy_all"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- deploy -->
+ <!--
==================================================================== -->
+ <target name="deploy" depends="build" if="isJDKOver5">
+ <echo
message="--------------------------------------------------"/>
+ <echo message="| controls deploy starting
|"/>
+ <echo
message="--------------------------------------------------"/>
+ <!-- Copy build output to client locations (lib dir of servers
etc) -->
+ <echo
message="--------------------------------------------------"/>
+ <echo message="| controls deploy ending
|"/>
+ <echo
message="--------------------------------------------------"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- deploy_all -->
+ <!--
==================================================================== -->
+ <target name="deploy_all">
+ <antcall target="deploy"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- minprod -->
+ <!--
==================================================================== -->
+ <target name="minprod">
+ <echo
message="--------------------------------------------------"/>
+ <echo message="| controls minprod starting
|"/>
+ <echo
message="--------------------------------------------------"/>
+ <antcall target="deploy"/>
+ <echo
message="--------------------------------------------------"/>
+ <echo message="| controls minprod completed
|"/>
+ <echo
message="--------------------------------------------------"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- docs -->
+ <!--
==================================================================== -->
+ <target name="docs" if="isJDKOver5">
+ <javadoc destdir="${docs.dir}/reference/classref_controls"
maxmemory="256M" windowtitle="Controls Documentation" doctitle="Java Controls"
version="true" author="false" use="true" additionalparam="-breakiterator
-noqualifier all -notimestamp" useexternalfile="true"
classpathref="runtime.classpath">
+ <packageset dir="${api.dir}" defaultexcludes="yes">
+ <include
name="org/apache/beehive/controls/**/*"/>
+ </packageset>
+ <packageset dir="${runtime.dir}" defaultexcludes="yes">
+ <include
name="org/apache/beehive/controls/**/*"/>
+ </packageset>
+ </javadoc>
+ <fixcrlf srcdir="${docs.dir}"/>
+ </target>
+ <!--
==================================================================== -->
+ <!-- drt -->
+ <!--
==================================================================== -->
+ <target name="drt" depends="deploy">
+ <ant dir="./test" target="checkin.tests" inheritAll="false"/>
+ </target>
</project>
