Author: ias
Date: Fri Oct 8 17:27:29 2004
New Revision: 54138
Modified:
incubator/beehive/trunk/controls/build.xml
Log:
Change JDK 1.5 to JDK 5 and later. Remove source="1.5" because it's default in
JDK 5 compiler.
Modified: incubator/beehive/trunk/controls/build.xml
==============================================================================
--- incubator/beehive/trunk/controls/build.xml (original)
+++ incubator/beehive/trunk/controls/build.xml Fri Oct 8 17:27:29 2004
@@ -21,8 +21,8 @@
<property environment="os"/>
<property file="../beehive.properties"/>
- <!-- THE CONTROL BUILD REQUIRES JDK1.5. ATTEMPTS TO BUILD ON JDK1.4 WILL BE
A NOOP -->
- <condition property="isJDK15">
+ <!-- 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>
@@ -86,7 +86,7 @@
<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 CONTROL PROJECT ONLY BUILDS ON JDK1.5
|" />
+ <echo message="| NOTE: THE WSM PROJECT ONLY BUILDS ON JDK5 AND LATER
|" />
<echo
message="================================================================" />
<echo message="" />
<echo message="" />
@@ -105,15 +105,15 @@
<!-- ==================================================================== -->
<!-- Compiles the source code of the project. -->
<!-- ==================================================================== -->
- <target name="classes" depends="dirs" if="isJDK15">
+ <target name="classes" depends="dirs" if="isJDKOver5">
<!-- Build the API classes -->
- <javac destdir="${api.classes}" classpathref="api.classpath" source="1.5"
debug="on" >
+ <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"
source="1.5" debug="on">
+ <javac destdir="${runtime.classes}" classpathref="runtime.classpath"
debug="on">
<src path="${runtime.dir}"/>
</javac>
@@ -133,7 +133,7 @@
<!-- ==================================================================== -->
<!-- Jars up the classes, libraries, and resources. -->
<!-- ==================================================================== -->
- <target name="build" depends="classes" if="isJDK15">
+ <target name="build" depends="classes" if="isJDKOver5">
<echo message="--------------------------------------------------" />
<echo message="| controls build starting |" />
<echo message="--------------------------------------------------" />
@@ -191,7 +191,7 @@
<!-- ==================================================================== -->
<!-- deploy -->
<!-- ==================================================================== -->
- <target name="deploy" depends="build" if="isJDK15">
+ <target name="deploy" depends="build" if="isJDKOver5">
<echo message="--------------------------------------------------" />
<echo message="| controls deploy starting |" />
<echo message="--------------------------------------------------" />
@@ -228,7 +228,7 @@
<!-- ==================================================================== -->
<!-- docs -->
<!-- ==================================================================== -->
- <target name="docs" if="isJDK15">
+ <target name="docs" if="isJDKOver5">
<javadoc
destdir="${docs.dir}"
maxmemory="256M"
@@ -239,8 +239,7 @@
use="true"
additionalparam="-breakiterator -noqualifier all"
useexternalfile="true"
- classpathref="runtime.classpath"
- source="1.5">
+ classpathref="runtime.classpath">
<packageset dir="${api.dir}" defaultexcludes="yes">
<include name="org/apache/beehive/controls/**/*" />
</packageset>
