X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build.xml;h=89342b413cc1313ee9f769b7d4c37da175e1cd5c;hb=7daa352541756250e798b0d7479b2bc7f807de0b;hp=3c91a2f5dcb3f1c58164017dfef63d817bd6644c;hpb=5bcae030b489e670c6983aa97eb9b6d8a6bbbbd5;p=jalview.git

diff --git a/build.xml b/build.xml
index 3c91a2f..89342b4 100755
--- a/build.xml
+++ b/build.xml
@@ -38,6 +38,7 @@
         </fileset> -->
       </path>
 
+      <property name="JALVIEW_VERSION" value="2.03"/>
       <property name="" value=""/>
       <property name="libDir" value="lib"/>
       <property name="resourceDir" value="resources"/>
@@ -80,6 +81,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}"/>
@@ -119,8 +136,13 @@
 
     <target name="build" depends="prepare">
       <!-- not efficient yet. -->
-      <javac source="1.4" target="1.4" srcdir="${sourceDir}" destdir="${outputDir}"
-      classpathref="build.classpath" />
+      <javac source="1.4" target="1.4"
+        srcdir ="${sourceDir}"
+        destdir="${outputDir}"
+      classpathref="build.classpath">
+      <exclude name="jalview/*applet*"/>
+       <exclude name="com/stevesoft/**"/>
+      </javac>
     </target>
     <target name="buildindices" depends="init, prepare"
     unless="help.uptodate">
@@ -134,11 +156,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" />
@@ -171,16 +196,18 @@
       <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"/>
-        <association mime-type="application-x/ext-file" extensions="fa"/>
+        <offline_allowed/>
+	<!--
+	<association mime-type="application-x/ext-file" extensions="fa"/>
         <association mime-type="application-x/ext-file" extensions="fasta"/>
         <association mime-type="application-x/ext-file" extensions="fastq"/>
         <association mime-type="application-x/ext-file" extensions="blc"/>
@@ -188,9 +215,10 @@
         <association mime-type="application-x/ext-file" extensions="pfam"/>
         <association mime-type="application-x/ext-file" extensions="aln"/>
         <association mime-type="application-x/ext-file" extensions="pir"/>
-      </information>
+	-->
+       </information>
         <resources>
-          <j2se version="1.3+"/>
+          <j2se version="1.4+"/>
           <fileset dir="${packageDir}">
             <include name="jalview.jar"/>
           </fileset>
@@ -198,6 +226,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>
@@ -289,23 +318,29 @@
        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="jalview/**"/>
-          <include name="${resourceDir}/images/idwidth.gif"/>
+          <include name=".build_properties"/>
+          <include name="images/idwidth.gif"/>
         </fileset>
       </jar>
   </target>
 
   <target name="obfuscate" depends="packageApplet">
-    <taskdef resource="proguard/ant/task.properties" classpath="C:/JalviewX/utils/proguard.jar" />
+    <taskdef resource="proguard/ant/task.properties" classpath="utils/proguard.jar" />
     <proguard>
       -libraryjars "${java.home}/lib/rt.jar"
       -injars      in.jar
       -outjars     jalviewApplet.jar
       -keep public class jalview.bin.JalviewLite
+      		{ public static void main(java.lang.String[]);}
     </proguard>
     <delete file="in.jar"/>
   </target>