X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=fff571b8b70fdd643aac040a68d292a214c935b8;hb=b0b27e984d8486610b0c4bffe97f6b4cf3d0a768;hp=7fe433514cc538a5c17f9b5ad7f925822a80ad1d;hpb=e15e5527ce2b54407031b7ef554d924a9fde1d3d;p=jalview.git

diff --git a/build.xml b/build.xml
index 7fe4335..fff571b 100755
--- a/build.xml
+++ b/build.xml
@@ -38,7 +38,7 @@
         </fileset> -->
       </path>
 
-      <property name="JALVIEW_VERSION" value="2.01"/>
+      <property name="JALVIEW_VERSION" value="2.06"/>
       <property name="" value=""/>
       <property name="libDir" value="lib"/>
       <property name="resourceDir" value="resources"/>
@@ -85,11 +85,11 @@
     <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>
-          ---Jalview Application Properties---
+          ---Jalview Build Details---
         </header>
         <property name="VERSION" value="${JALVIEW_VERSION}"/>
         <property name="BUILD_DATE" value="${build.date}"/>
@@ -161,6 +161,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" />
@@ -178,27 +181,27 @@
       </copy>
 <!-- the default keystore details might need to be edited here -->
       <signjar
-      storepass="alignmentisfun"
-      keypass="alignmentisfun"
-      keystore="keys/.keystore"
+      storepass="password"
+      keypass="password"
+      keystore="C:/JalviewX/myKeys"
       alias="jalview"
       lazy="false"
       verbose="false"
       >
 
       <fileset dir="${packageDir}">
-        <include name="*.jar"/>
+        <include name="jalview.jar"/>
       </fileset>
-      </signjar>
+       </signjar>
       <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"/>
@@ -217,7 +220,11 @@
         <resources>
           <j2se version="1.4+"/>
           <fileset dir="${packageDir}">
+            <include name="jalview.jar"/>
+          </fileset>
+          <fileset dir="${packageDir}">
             <include name="*.jar"/>
+            <exclude name="jalview.jar"/>
           </fileset>
           <property name="jalview.version" value="${JALVIEW_VERSION}"/>
         </resources>
@@ -308,15 +315,21 @@
     <mkdir dir="${outputDir}"/>
     <javac source="1.2" target="1.1" srcdir="${sourceDir}" destdir="${outputDir}"
        includes="jalview/analysis/**,jalview/appletgui/**,jalview/datamodel/**jalview/jbappletgui/**,jalview/math/**,jalview/schemes/**"
-       excludes="ext/**,MCview/**,org/**,vamsas/**"/>
+       excludes="ext/**,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="jalview/**"/>
-          <include name="${resourceDir}/images/idwidth.gif"/>
+          <include name="MCview/**"/>
+          <include name=".build_properties"/>
+          <include name="images/idwidth.gif"/>
         </fileset>
       </jar>
   </target>
@@ -328,6 +341,9 @@
       -injars      in.jar
       -outjars     jalviewApplet.jar
       -keep public class jalview.bin.JalviewLite
+      		{ public * ; }
+      		
+      		
     </proguard>
     <delete file="in.jar"/>
   </target>