remm 01/09/19 16:04:42
Modified: webapps/examples build.xml
Log:
- Add some conditional compilation flags in the examples build script, similar
to what is done with the Catalina script.
Revision Changes Path
1.15 +40 -2 jakarta-tomcat-4.0/webapps/examples/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/webapps/examples/build.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- build.xml 2001/09/16 04:58:28 1.14
+++ build.xml 2001/09/19 23:04:42 1.15
@@ -15,7 +15,43 @@
<property name="webapps.dist" value="../dist"/>
<property name="webapp.name" value="examples"/>
+ <!-- Construct Catalina classpath -->
+ <path id="examples.classpath">
+ <pathelement location="${activation.jar}"/>
+ <pathelement location="${jndi.jar}"/>
+ <pathelement location="${mail.jar}"/>
+ <pathelement location="${servlet.jar}"/>
+ </path>
+
+ <!-- =================== BUILD: Set compile flags ======================= -->
+ <target name="flags">
+
+ <!-- JDK flags -->
+ <available property="jdk.1.2.present" classname="java.util.HashMap" />
+ <available property="jdk.1.3.present"
+ classname="java.lang.reflect.Proxy" />
+ <available property="jdk.1.4.present" classname="java.nio.Buffer" />
+
+ <!-- Class availability flags -->
+ <condition property="javamail.present">
+ <and>
+ <available classname="javax.activation.DataSource"
+ classpath="${activation.jar}" />
+ <available classname="javax.mail.Service"
+ classpath="${mail.jar}" />
+ </and>
+ </condition>
+
+ <!-- Conditional compilation flags (determined from the flags above) -->
+ <condition property="compile.javamail">
+ <or>
+ <equals arg1="${full.dist}" arg2="on" />
+ <equals arg1="${javamail.present}" arg2="true" />
+ </or>
+ </condition>
+ </target>
+
<!-- =================== BUILD: Create Directories ====================== -->
<target name="build-prepare">
<mkdir dir="${webapps.build}"/>
@@ -38,10 +74,12 @@
<javac srcdir="WEB-INF/classes"
destdir="${webapps.build}/${webapp.name}/WEB-INF/classes"
- classpath="${servlet.jar}:${jndi.jar}:${activation.jar}:${mail.jar}"
debug="${compile.debug}" deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
- excludes="**/CVS/**"/>
+ excludes="**/CVS/**">
+ <classpath refid="examples.classpath" />
+ <exclude name="SendMailServlet.java" unless="compile.javamail" />
+ </javac>
<javac srcdir="jsp/plugin/applet"
destdir="${webapps.build}/${webapp.name}/jsp/plugin/applet"
