Changeset 21941 for gs3-extensions/mat/trunk

Timestamp:

2010-04-22T13:07:14+12:00 (14 years ago)

Author:

sjm84

Message:

Tidied and modified Mat's build.xml file, it also now creates a mat.jar in /web/WEB-INF/lib and creates a guiext.jar file in the top level

File:

• gs3-extensions/mat/trunk/build.xml (modified) (3 diffs)

gs3-extensions/mat/trunk/build.xml

@@ -4 +4 @@
     <property name="build.dir"   value="build"/>
     <property name="classes.dir" value="${build.dir}/classes"/>
-        <property name="jar.dir"     value="${build.dir}/jar"/>
-    <property name="main-class"  value="org.greenstone.mat.CollectionChooser"/>
     <property name="lib.dir"     value="lib"/>
     <property name="tmp.dir"     value="tmp"/>
-    <property name="web.dir" value="../../web/WEB-INF"/>
+    <property name="gsdl3srchome.dir" value="../.."/>
+    <property name="web.dir" value="${gsdl3srchome.dir}/web/WEB-INF"/>
     <property name="jcommon" value="jcommon.jar"/>
     <property name="jfreechart" value="jfreechart.jar"/>
-    <property name="mat.dir" value="../../web/mat"/>
-    <property name="jni.dir" value="../../lib/jni"/>
-    <property name="tomcat.lib.dir" value="../../packages/tomcat/common/lib"/>
-    <property name="tomcat.endorsed.dir" value="../../packages/tomcat/common/endorsed"/>
-    <property name="web.class.dir" value="../../web/WEB-INF/classes/org/greenstone/mat/servlet"/>
+    <property name="mat.dir" value="${gsdl3srchome.dir}/web/mat"/>
+    <property name="jni.dir" value="${gsdl3srchome.dir}/lib/jni"/>  
+    <property name="tomcat.home" value="${gsdl3srchome.dir}/packages/tomcat"/>
+    <property name="tomcat.lib.dir" value="${tomcat.home}/common/lib"/>
+    <property name="tomcat.endorsed.dir" value="${tomcat.home}/common/endorsed"/>
+    <property name="web.class.dir" value="${web.dir}/classes/org/greenstone/mat/servlet"/>
     <property name="mat.class.dir" value="${classes.dir}/org/greenstone/mat/servlet"/>
     
@@ -36 +36 @@
     </target>
 
-    <target name="compile" depends="setup-java-lib,setup-tmp,create_log_folder">
+    <target name="compile" depends="setup-java-lib,setup-tmp,create_log_folder,move-mat-xml">
         <mkdir dir="${classes.dir}"/>
         <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
@@ -46 +46 @@
                    </fileset>
         </copy>
+        <jar destfile="web/WEB-INF/lib/mat.jar">
+          <fileset dir="build/classes">
+            <include name="org/greenstone/mat/**"/>
+          </fileset>
+        </jar>
+        <jar destfile="guiext.jar">
+          <fileset dir="build/classes">
+            <include name="org/greenstone/admin/**"/>
+          </fileset>
+        </jar>
+    </target>
+
+    <target name="move-mat-xml">
+      <copy file="${basedir}/resources/tomcat/mat.xml" tofile="${tomcat.home}/conf/Catalina/localhost/mat.xml" overwrite="true">
+        <filterset>
+              <filter token="matwebhome" value="${basedir}/web"/>
+        </filterset>
+      </copy>
     </target>