linear interpolation between sparse annotation element values.

[jalview.git] / build.xml

diff --git a/build.xml b/build.xml
index 4eb6243..189260f 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
         </fileset> -->
       </path>
 
-      <property name="JALVIEW_VERSION" value="2.03"/>
+      <property name="JALVIEW_VERSION" value="2.07"/>
       <property name="" value=""/>
       <property name="libDir" value="lib"/>
       <property name="resourceDir" value="resources"/>
@@ -67,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"/>
 
@@ -85,7 +89,7 @@
     <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 hh.mm aa"/>
+        <format property="date" pattern="dd MMMM yyyy"/>
       </tstamp>
       <properties file="${outputDir}/.build_properties">
         <header>
@@ -131,6 +135,9 @@
         <fileset dir="${resourceDir}">
           <include name="**/*.*"/>
         </fileset>
+       <fileset dir="../VamsasClient/packages/">
+         <include name="**/*.jar"/>
+       </fileset>
       </copy>
     </target>
 
@@ -161,6 +168,9 @@
       <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" />
@@ -316,12 +326,17 @@
   </target>
 
   <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=".build_properties"/>
-          <include name="${resourceDir}/images/idwidth.gif"/>
+          <include name="images/idwidth.gif"/>
         </fileset>
       </jar>
   </target>
@@ -333,6 +348,7 @@
       -injars      in.jar
       -outjars     jalviewApplet.jar
       -keep public class jalview.bin.JalviewLite
+       { public * ; }
     </proguard>
     <delete file="in.jar"/>
   </target>