From: rk <rk>
Date: Mon, 1 Dec 2003 21:23:25 +0000 (+0000)
Subject: a little cleanup
X-Git-Tag: LATEST_MERGED_1_1~225
X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=commitdiff_plain;h=7490dc00a4b662ac586104319a2dd4878153ff2f

a little cleanup
---

diff --git a/build.xml b/build.xml
index 3ee8e447..c1309144 100755
--- a/build.xml
+++ b/build.xml
@@ -79,6 +79,31 @@
     <fileset dir="lib">
       <include name="*.jar"/>
     </fileset>
+
+    <pathelement path="${tomcat.home}/lib/tomcat.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.x.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>
+  <!-- for libs shared between webapps (tomcat 4.1.x) -->
+	<fileset dir="${tomcat.home}">
+		<include name="shared/lib/*.jar" />
+	</fileset>
+	<fileset dir="${tomcat.home}">
+		<include name="common/endorsed/*.jar" />
+	</fileset>
   </path>
 
   <target name="prepare">
@@ -110,10 +135,7 @@
     </copy>
     
     <copy todir="${deploy.home}/WEB-INF/lib">
-      <fileset dir="lib">
-        <exclude name="ant.jar"/>
-        <exclude name="xerces.jar"/>
-      </fileset>
+      <fileset dir="lib" />
     </copy>
   </target>
 
@@ -125,22 +147,22 @@
   <target name="mrproper">
     <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>
 
   <target name="compile" depends="prepare">
+    <!-- check to see if $TOMCAT_HOME was set to something useful.. -->
+    <available file="${tomcat.home}/conf" property="tomcat.present"/>
+    <antcall target="testtomcat"/>
     <dependset>
-      <srcfileset
-        dir="source"
-        includes="**/*.java"/>
+      <srcfileset dir="source" includes="**/*.java"/>
+      <srcfileset dir="lib" includes="*.jar"/>         
+      <targetfileset dir="${deploy.classes}" includes="**/*.class"/>
 	<!-- ML: now why can't this be added?
-      <srcfileset
-        dir="etc/extrasource"
-        includes="**/*.java"/> -->
-      <srcfileset
-        dir="lib"
-        includes="*.jar"/>
-      <targetfileset
-        dir="${deploy.classes}"
-        includes="**/*.class"/>
+      <srcfileset dir="etc/extrasource" includes="**/*.java"/> -->   
     </dependset>
     <javac destdir="${deploy.classes}"
            debug="${compile.debug}" optimize="${compile.optimize}" deprecation="on">
@@ -150,10 +172,6 @@
     </javac>
   </target>
 
-  <target name="perms">
-    <exec executable="./perms.sh"/>
-  </target>
-
   <target name="javadoc" depends="prepare">
     <javadoc packagenames="mir.*, mircoders.*"
 	     sourcefiles="source/Mir.java,source/OpenMir.java"