check for presence of TOMCAT_HOME env var. Check in all webapp lib dirs in tomcat...

diff --git a/build.xml b/build.xml
index c68923d..c6a64cc 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -59,6 +59,9 @@
   <property name="app.name"       value="Mir"/>
   <property name="deploy.home"    value="../${app.name}"/>
 
+  <!-- If you want to use the very good jikes compiler, uncomment this -->
+  <!-- <property name="build.compiler"   value="jikes"/>-->
+
 
 <!-- No customization required after this line -->
 
@@ -71,9 +74,6 @@
   <property name="javadoc.home"   value="${deploy.home}/javadoc"/>
   <property name="tomcat.home"    value="${env.TOMCAT_HOME}"/>
 
-  <!-- If you want to use the very good jikes compiler, uncomment this 
-  <property name="build.compiler"   value="jikes"/> -->
-
 
 
   <!-- Construct the classpath -->
@@ -85,8 +85,21 @@
       <include name="*.jar"/>
     </fileset>
     <pathelement path="${tomcat.home}/lib/tomcat.jar"/>
-       <fileset dir="${tomcat.home}/lib/common">
-               <include name="*.jar" />
+  <!-- for libs shared between tomcat and webapps (tomcat 3.3.x) -->
+       <fileset dir="${tomcat.home}">
+               <include name="lib/common/*.jar" />
+       </fileset>
+  <!-- for libs shared between webapps (tomcat 3.3.x) -->
+       <fileset dir="${tomcat.home}">
+               <include name="lib/apps/*.jar" />
+       </fileset>
+  <!-- for libs shared between tomcat and webapps (tomcat 4.0.x) -->
+       <fileset dir="${tomcat.home}">
+               <include name="common/lib/*.jar" />
+       </fileset>
+  <!-- for libs shared between webapps (tomcat 4.0.x) -->
+       <fileset dir="${tomcat.home}">
+               <include name="lib/*.jar" />
        </fileset>
   </path>
 
@@ -151,7 +164,10 @@
     <delete dir="${deploy.home}"/>
   </target>
 
-
+  <!-- drop out if $TOMCAT_HOME is not set>-->
+  <target name="testtomcat" unless="tomcat.present">
+    <fail message="the $$TOMCAT_HOME environment variable is not set or is set to the wrong path. Please set it first. giving up!"/>
+  </target>
 
 <!-- The "compile" target is used to compile (or recompile) the Java classes
      that make up this web application.  The recommended source code directory
@@ -170,11 +186,26 @@
 -->
 
   <target name="compile" depends="prepare">
-       <antcall target="clean"/>
+    <!-- check to see if $TOMCAT_HOME was set to something useful.. -->
+    <available file="${tomcat.home}/conf" property="tomcat.present"/>
+    <antcall target="testtomcat"/>
+
+    <!--<antcall target="clean"/>-->
+    <dependset>
+      <srcfileset
+        dir="source"
+        includes="**/*.java"/>
+      <srcfileset
+        dir="lib"
+        includes="*.jar"/>
+      <targetfileset
+        dir="${deploy.classes}"
+        includes="**/*.class"/>
+    </dependset>
     <javac srcdir="source" destdir="${deploy.classes}"
            debug="on" optimize="off" deprecation="on">
       <classpath refid="project.class.path"/>
-       </javac>
+    </javac>
     <copy   todir="${deploy.classes}">
       <fileset dir="source" includes="**/*.properties"/>
     </copy>