X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=189260fd78764aa5af8f8752cb47e4fa7724f8f5;hb=9126ec7ce6e35d4e9e2a984f53a10ac14f71bca3;hp=dbed685a5ed5018b9bc8db6221028b19996a0936;hpb=b2556b24919f5958b771868463fe4bb542f03708;p=jalview.git

diff --git a/build.xml b/build.xml
index dbed685..189260f 100755
--- a/build.xml
+++ b/build.xml
@@ -38,6 +38,7 @@
         </fileset> -->
       </path>
 
+      <property name="JALVIEW_VERSION" value="2.07"/>
       <property name="" value=""/>
       <property name="libDir" value="lib"/>
       <property name="resourceDir" value="resources"/>
@@ -66,6 +67,10 @@
           <include name="*.jar"/>
           <include name="**/*.jar"/>
         </fileset>
+        	<fileset dir="../VamsasClient/packages">
+        		<include name="*.jar"/>
+       			<include name="**/*.jar"/>
+		</fileset>
 <!--        <fileset dir="old_lib_signed">
 <include name="lib_axis.jar"/>
 
@@ -80,6 +85,22 @@
       -->
     </target>
 
+
+    <taskdef classpath="utils/roxes-ant-tasks-1.2-2004-01-30.jar" resource="com/roxes/tools/ant/taskdefs.properties"/>
+    <target name="buildPropertiesFile" depends="init">
+      <tstamp prefix="build">
+        <format property="date" pattern="dd MMMM yyyy"/>
+      </tstamp>
+      <properties file="${outputDir}/.build_properties">
+        <header>
+          ---Jalview Build Details---
+        </header>
+        <property name="VERSION" value="${JALVIEW_VERSION}"/>
+        <property name="BUILD_DATE" value="${build.date}"/>
+      </properties>
+    </target>
+
+
     <target name="clean" depends="init">
       <!-- not efficient yet. -->
       <delete dir="${outputDir}"/>
@@ -114,6 +135,9 @@
         <fileset dir="${resourceDir}">
           <include name="**/*.*"/>
         </fileset>
+      	<fileset dir="../VamsasClient/packages/">
+     	  <include name="**/*.jar"/>
+      	</fileset>
       </copy>
     </target>
 
@@ -139,11 +163,14 @@
     </java>
     </target>
 
-    <target name="makejars" depends="build, buildindices">
+    <target name="makejars" depends="build, buildPropertiesFile, buildindices">
       <!-- make the package jar -->
       <mkdir dir="${packageDir}"/>
 
       <jar destfile="${packageDir}/${outputJar}">
+        <manifest>
+             <attribute name="Main-Class" value="jalview.bin.Jalview"/>
+        </manifest>
         <fileset dir="${outputDir}/">
           <exclude name="cache*/**"/>
           <exclude name="*.jar" />
@@ -176,15 +203,16 @@
       <taskdef classpathref="build.classpath" resource="com/roxes/tools/ant/taskdefs.properties"/>
 
       <!--    codebase="http://www.jalview.org/jalview/webstart" -->
-      <jnlp toFile="${packageDir}/Jalview.jnlp" href="Jalview.jnlp"
+      <jnlp toFile="${packageDir}/jalview.jnlp" href="jalview.jnlp"
       codebase="${WebStartLocation}">
       <information>
         <title>Jalview</title>
         <vendor>The Barton Group</vendor>
-        <homepage href="www.jalview.org"/>
+        <homepage href="http://www.jalview.org"/>
         <description>Jalview Multiple Alignment Editor</description>
         <description kind="short">Jalview</description>
         <icon href="logo_big.gif"/>
+        <offline_allowed/>
 	<!--
 	<association mime-type="application-x/ext-file" extensions="fa"/>
         <association mime-type="application-x/ext-file" extensions="fasta"/>
@@ -197,7 +225,7 @@
 	-->
        </information>
         <resources>
-          <j2se version="1.3+"/>
+          <j2se version="1.4+"/>
           <fileset dir="${packageDir}">
             <include name="jalview.jar"/>
           </fileset>
@@ -205,6 +233,7 @@
             <include name="*.jar"/>
             <exclude name="jalview.jar"/>
           </fileset>
+          <property name="jalview.version" value="${JALVIEW_VERSION}"/>
         </resources>
         <application_desc main_class="jalview.bin.Jalview">
           </application_desc>
@@ -296,12 +325,18 @@
        excludes="ext/**,MCview/**,org/**,vamsas/**"/>
   </target>
 
-  <target name="packageApplet" depends="compileApplet">
+  <target name="packageApplet" depends="compileApplet, buildPropertiesFile">
+  <copy file="${resourceDir}/images/idwidth.gif" toFile="${outputDir}/images/idwidth.gif"/>
        <jar destfile="in.jar">
+        <manifest>
+            <attribute name="Main-Class" value="jalview.bin.JalviewLite"/>
+        </manifest>
         <fileset dir="${outputDir}">
           <include name="com/**"/>
+          <include name="MCview/**"/>
           <include name="jalview/**"/>
-          <include name="${resourceDir}/images/idwidth.gif"/>
+          <include name=".build_properties"/>
+          <include name="images/idwidth.gif"/>
         </fileset>
       </jar>
   </target>
@@ -313,6 +348,7 @@
       -injars      in.jar
       -outjars     jalviewApplet.jar
       -keep public class jalview.bin.JalviewLite
+       { public * ; }
     </proguard>
     <delete file="in.jar"/>
   </target>