X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build.xml;h=4ae38f48fe2356d1695cc3ec98d163ecbdbf963d;hb=2759810638b5bdc0a8d35f6d5396fa3ede1e27df;hp=63f3eefd19d02c4b5d337ee9982dbbdf3ae4d663;hpb=ee015f63671ac8770bba35dd98bc681eac0e719d;p=mir.git

diff --git a/build.xml b/build.xml
index 63f3eefd..4ae38f48 100755
--- a/build.xml
+++ b/build.xml
@@ -54,7 +54,7 @@
     </copy>
     <mkdir  dir="${deploy.home}/templates"/>
     <copy todir="${deploy.home}/templates">
-      <fileset dir="templates-dist"/>
+      <fileset dir="templates"/>
     </copy>
     <mkdir  dir="${deploy.home}/src"/>
     <copy todir="${deploy.home}/src">
@@ -66,7 +66,10 @@
     <mkdir  dir="${deploy.home}/WEB-INF/classes"/>
     <mkdir  dir="${deploy.home}/WEB-INF/lib"/>
     <copy todir="${deploy.home}/WEB-INF/lib">
-      <fileset dir="lib"/>
+      <fileset dir="lib">
+        <exclude name="ant.jar"/>
+        <exclude name="xerces.jar"/>
+      </fileset>
     </copy>
     <mkdir  dir="${javadoc.home}"/>
     <mkdir  dir="${deploy.home}/log"/>
@@ -141,11 +144,14 @@
      the source code for this application, if you wish to distribute
      that separately.
 -->
-
   <target name="dist" depends="prepare,compile">
-    <jar jarfile="${dist.home}/${dist.src}"
+    <jar jarfile="mirbase.jar"
+	 includes="mir/**"
+	 basedir="../Mir/WEB-INF/classes"/>
+    <jar jarfile="${dist.src}"
          basedir="./source"/>
-    <jar jarfile="${dist.home}/${dist.war}"
+    <jar jarfile="${dist.war}"
          basedir="${deploy.home}"/>
   </target>
-</project>
+
+</project>
\ No newline at end of file