X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=build.xml;h=54c96281b520dabfbe803027500b72658140f9f2;hb=ddf4954f19778179e9359f12319ff808b88c5365;hp=f2d98cd2149d2146c141b5e1d3d3922f099f5ec4;hpb=9459916c419db72849e328bb30e0047dc5130420;p=mir.git

diff --git a/build.xml b/build.xml
index f2d98cd2..54c96281 100755
--- a/build.xml
+++ b/build.xml
@@ -12,7 +12,10 @@
     -        form of a war file
     -   * source-distribution
     -        Sets up a distributable version of mir as a
-    -        zipped version of the source tree
+    -        gzipped tar version of the source tree
+    -   * full-distribution
+    -        Sets up a distributable version of mir in the
+    -        form of a gzipped tar file with the sources
     -   * javadoc
     -        Generates the project's javadoc
     -->
@@ -148,12 +151,14 @@
   <target name="compile" depends="prepare-compilation" unless="up.to.date"
           description="Creates the jars needed for a mir deployment">
           
-    <javac destdir="${build.classes}" debug="true">
+    <javac destdir="${build.classes}" debug="true" deprecation="off" source="1.3">
       <src path="source"/>
       <src path="etc/extrasource"/>
       <classpath refid="project.classpath"/>
     </javac>
 
+    <delete file="${build.jars}/mir.jar"/>
+
     <jar
        jarfile="${build.jars}/mir.jar">
       <fileset dir="${build.classes}" includes="**/*.class" />
@@ -195,20 +200,20 @@
     <mkdir  dir="${build.javadoc}"/>
   </target>
 
-  <target name="prepare-binary-distribution">
+  <target name="prepare-distribution">
     <mkdir  dir="${distribution.home}"/>
-    <delete dir="${build}/binarydist"/>
-    <mkdir  dir="${build}/binarydist"/>
+    <delete dir="${build}/dist"/>
+    <mkdir  dir="${build}/dist"/>
   </target>
 
-  <target name="binary-distribution" depends="prepare-binary-distribution">
+  <target name="distribution" depends="prepare-distribution">
     <antcall target="generate-deployment-tree">
-      <param name="destination" value="${build}/binarydist"/>
+      <param name="destination" value="${build}/dist"/>
     </antcall>
 
-    <zip zipfile="${distribution.home}/binary.zip" >
-      <fileset dir="${build}/binarydist" includes="**/*" />
-    </zip>
+    <tar tarfile="${distribution.home}/mir-${version}.tar.gz" compression="gzip">
+      <tarfileset dir="${build}/dist" includes="**/*" />
+    </tar>
   </target>
 
   <target name="prepare-source-distribution">
@@ -216,10 +221,14 @@
   </target>
 
   <target name="source-distribution" depends="prepare-source-distribution">
-    <zip zipfile="${distribution.home}/source.zip" >
+    <!--<zip zipfile="${distribution.home}/mir-source-${version}.zip" >
       <fileset dir="."
         includes="bundles/**/*,source/**/*,etc/**/*,meta/**/*,web/**/*,templates/**/*,dbscripts/**/*,lib/**/*,doc/**/*,build.xml" />
-    </zip>
+    </zip>-->
+    <tar tarfile="${distribution.home}/mir-source-${version}.tar.gz" compression="gzip">
+      <tarfileset dir="."
+        includes="bundles/**/*,source/**/*,etc/**/*,meta/**/*,web/**/*,templates/**/*,dbscripts/**/*,lib/**/*,doc/**/*,build.xml" />
+    </tar>
 
   </target>
   
@@ -246,7 +255,7 @@
   <target name="prepare-html">
     <mkdir dir="${build}/xslt"/>
  
-    <unzip dest="${build}/xslt" src="doc/lib/docbook-xsl-1.66.1.zip"/>
+    <unzip dest="${build}/xslt" src="doc/lib/docbook-xsl-1.70.1.zip"/>
  
     <copy todir="${build}/xslt">
       <fileset dir="doc/style">
@@ -262,6 +271,14 @@
           destdir="${build}/htmldocs"
           style="${build}/xslt/html.xsl"/>
   </target>
-  
+
+  <target name="full-distribution" depends="prepare-distribution,deploy,source-distribution">
+  	<copy todir="${destination}/WEB-INF">
+  	      <fileset file="${distribution.home}/mir-source-${version}.tar.gz"/>
+  	    </copy>
+    <tar tarfile="${distribution.home}/mir-${version}.tar.gz" compression="gzip">
+      <tarfileset dir="bin" includes="**/*" />
+    </tar>
+  </target>
 
 </project>