Changeset 22021 for gs3-extensions/mat/trunk

Timestamp:

2010-05-03T17:01:57+12:00 (14 years ago)

Author:

sjm84

Message:

Fixed some more errors from previous commit

File:

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

gs3-extensions/mat/trunk/build.xml

@@ -9 +9 @@
   <property name="mat.build"   value="build"/>
   <property name="mat.classes" value="${mat.build}/classes"/>
-  <property name="mat.classes.base" value="${mat.classes}/org/greenstone"/>
+  <property name="mat.classes.base" value="org/greenstone"/>
   <property name="mat.admin.classes" value="${mat.classes.base}/admin"/>
   <property name="mat.main.classes" value="${mat.classes.base}/mat"/>
@@ -44 +44 @@
   
   <target name="clean">
+    <delete file="guiext.jar"/>
     <delete dir="${mat.build}"/>
     <delete dir="${mat.lib}"/>
+    <delete dir="${mat.web.scripts}"/>
+    <delete dir="${mat.webinf.lib}"/>
+    <delete dir="${mat.webinf.classes}"/>
   </target>
   
@@ -52 +56 @@
     <javac srcdir="${mat.src}" destdir="${mat.classes}" classpathref="classpath"/>
     
+    <mkdir dir="${mat.webinf.classes}"/>
     <copy file="${gs.webinf.classes}/global.properties" tofile="${mat.webinf.classes}/global.properties"/>
 
@@ -59 +64 @@
     </copy>
 
+    <echo>${mat.classes}</echo>
+    <echo>${mat.main.classes}</echo>
+    <echo>${mat.admin.classes}</echo>
+    <mkdir dir="${mat.webinf.lib}"/>
     <jar destfile="${mat.webinf.lib}/mat.jar">
-      <fileset dir="${mat.main.classes}">
-    <include name="**/*.class"/>
+      <fileset dir="${mat.classes}">
+    <include name="${mat.main.classes}/**"/>
       </fileset>
     </jar>
 
     <jar destfile="guiext.jar">
-      <fileset dir="${mat.admin.classes}">
-    <include name="**/*.class"/>
+      <fileset dir="${mat.classes}">
+    <include name="${mat.admin.classes}/**"/>
       </fileset>
     </jar>