Show
Ignore:
Timestamp:
22.04.2010 13:07:14 (10 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs3-extensions/mat/trunk/build.xml

    r21926 r21941  
    44    <property name="build.dir"   value="build"/> 
    55    <property name="classes.dir" value="${build.dir}/classes"/> 
    6         <property name="jar.dir"     value="${build.dir}/jar"/> 
    7     <property name="main-class"  value="org.greenstone.mat.CollectionChooser"/> 
    86    <property name="lib.dir"     value="lib"/> 
    97    <property name="tmp.dir"     value="tmp"/> 
    10     <property name="web.dir" value="../../web/WEB-INF"/> 
     8    <property name="gsdl3srchome.dir" value="../.."/> 
     9    <property name="web.dir" value="${gsdl3srchome.dir}/web/WEB-INF"/> 
    1110    <property name="jcommon" value="jcommon.jar"/> 
    1211    <property name="jfreechart" value="jfreechart.jar"/> 
    13     <property name="mat.dir" value="../../web/mat"/> 
    14     <property name="jni.dir" value="../../lib/jni"/> 
    15     <property name="tomcat.lib.dir" value="../../packages/tomcat/common/lib"/> 
    16     <property name="tomcat.endorsed.dir" value="../../packages/tomcat/common/endorsed"/> 
    17     <property name="web.class.dir" value="../../web/WEB-INF/classes/org/greenstone/mat/servlet"/> 
     12    <property name="mat.dir" value="${gsdl3srchome.dir}/web/mat"/> 
     13    <property name="jni.dir" value="${gsdl3srchome.dir}/lib/jni"/>   
     14    <property name="tomcat.home" value="${gsdl3srchome.dir}/packages/tomcat"/> 
     15    <property name="tomcat.lib.dir" value="${tomcat.home}/common/lib"/> 
     16    <property name="tomcat.endorsed.dir" value="${tomcat.home}/common/endorsed"/> 
     17    <property name="web.class.dir" value="${web.dir}/classes/org/greenstone/mat/servlet"/> 
    1818    <property name="mat.class.dir" value="${classes.dir}/org/greenstone/mat/servlet"/> 
    1919     
     
    3636    </target> 
    3737 
    38     <target name="compile" depends="setup-java-lib,setup-tmp,create_log_folder"> 
     38    <target name="compile" depends="setup-java-lib,setup-tmp,create_log_folder,move-mat-xml"> 
    3939        <mkdir dir="${classes.dir}"/> 
    4040        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/> 
     
    4646                   </fileset> 
    4747        </copy> 
     48        <jar destfile="web/WEB-INF/lib/mat.jar"> 
     49          <fileset dir="build/classes"> 
     50            <include name="org/greenstone/mat/**"/> 
     51          </fileset> 
     52        </jar> 
     53        <jar destfile="guiext.jar"> 
     54          <fileset dir="build/classes"> 
     55            <include name="org/greenstone/admin/**"/> 
     56          </fileset> 
     57        </jar> 
     58    </target> 
     59 
     60    <target name="move-mat-xml"> 
     61      <copy file="${basedir}/resources/tomcat/mat.xml" tofile="${tomcat.home}/conf/Catalina/localhost/mat.xml" overwrite="true"> 
     62        <filterset> 
     63              <filter token="matwebhome" value="${basedir}/web"/> 
     64        </filterset> 
     65      </copy> 
    4866    </target> 
    4967