X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=2082fbdc8ab45c045531119fc9dcfcf7dbb84d5d;hb=1a204eb6f91465df533751cd6e592ddd11dcce5d;hp=c10f72682d8cb37d070da1ec9a5cae07c4d8c956;hpb=14186be9a9275c53f2fafce76f1c3b4c0e6692bb;p=jalview.git

diff --git a/build.xml b/build.xml
index c10f726..2082fbd 100755
--- a/build.xml
+++ b/build.xml
@@ -3,6 +3,8 @@
   <!-- utils is a class path to additional utilities needed for
   building docs, jars and webstart stuff -->
 
+
+  
   <target name="init">
 
     <property name="libDir" value="lib"/>
@@ -11,17 +13,26 @@
     <property name="docDir" value="doc"/>
     <property name="sourceDir" value="src" />
     <property name="outputDir" value="classes" />
+    <property name="packageDir" value="dist" />
     <property name="outputJar" value="jalview.jar" />
 
     <path id="build.classpath">
       <fileset dir="utils">
+        <include name="*.jar"/>
         <include name="**/*.jar"/>
       </fileset>
       <fileset dir="${libDir}">
+        <include name="*.jar"/>      
         <include name="**/*.jar"/>
       </fileset>
     </path>
-
+<!-->    <uptodate property="help.uptodate"
+     targetfile="${helpDir}/helpIndex.xml">
+      <srcfiles
+        dir="${helpDir}"
+        includes="**/*.html" />
+    </uptodate>
+    -->
   </target>
 
   <target name="clean" depends="init">
@@ -47,13 +58,14 @@
     </delete>
   </target>
   
-  <target name="prepare" depends="clean">
+  <target name="prepare" depends="init">
     <mkdir dir="${outputDir}"/>
     <copy todir="${outputDir}">
       <fileset dir=".">
+
         <include name="${docDir}/**/*.*"/>
         <include name="${helpDir}/**/*.*"/>
-        <include name="${libDir}"/>
+        <include name="${libDir}/*.*"/>
       </fileset>
       <fileset dir="${resourceDir}">
         <include name="**/*.*"/>
@@ -61,12 +73,94 @@
     </copy>
   </target>
 
-  <target name="build" depends="init, prepare">
+  <target name="build" depends="prepare">
             <!-- not efficient yet. -->
-     <javac srcdir="${sourceDir}" destdir="${outputDir}"
+     <javac source="1.4" target="1.4" srcdir="${sourceDir}" destdir="${outputDir}"
         classpathref="build.classpath" />
   </target>
+  <target name="buildindices" depends="init, prepare" 
+   unless="help.uptodate">
+    <java
+     classname="com.sun.java.help.search.Indexer"
+     classpathref="build.classpath"
+     fork="true"
+     dir="${outputDir}/${helpDir}"
+     >
+      <arg line="html"/>
+    </java>
+  </target>
+  
+  <target name="makejars" depends="build, buildindices">
+    <!-- make the package jar -->
+    <mkdir dir="${packageDir}"/>
+    
+    <jar destfile="${packageDir}/${outputJar}">
+      <fileset dir="${outputDir}">
+        <exclude name="*.jar" />
+      </fileset>
+    </jar>
 
+    <copy toDir="${packageDir}" flatten="true">
+      <fileset dir="${outputDir}">
+        <include name="*.jar"/>
+        <include name="**/*.jar"/>
+      </fileset>
+    </copy>
+
+    <signjar 
+    storepass="alignmentisfun"
+    keypass="alignmentisfun"
+    keystore="keys/.keystore"
+    alias="jalview"
+    lazy="false"
+    verbose="false"
+    >
+
+    <fileset dir="${packageDir}">
+      <include name="*.jar"/>
+    </fileset>
+    </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"
+    codebase="file://">
+    <information>
+      <title>Jalview</title>
+      <vendor>M Clamp</vendor>
+      <homepage href="www.jalview.org"/>
+      <description>Jalview Multiple Alignment Editor</description>
+      <description kind="short">Jalview</description>
+      <icon href="BartonGroupBanner.gif"/>
+    </information>
+    <resources>
+      <j2se version="1.3+"/>
+      <fileset dir="${packageDir}">
+        <include name="*.jar"/>
+      </fileset>
+    </resources>
+    <application_desc main_class="jalview.gui.AlignFrame">
+      <argument>http://www.compbio.dundee.ac.uk/~andrew/jalview/glut.msf</argument>
+      <argument>URL</argument>
+      <argument>MSF</argument>
+        </application_desc>
+    <security>
+      <all_permissions/>
+    </security>  
+    </jnlp>        
+  </target>
+  <target name="runenv" depends="init">
+      <path id="run.classpath">
+        <pathelement location="${outputDir}"/>
+        <fileset dir="${outputDir}">
+        <include name="${libDir}/*.jar"/>
+      </fileset>
+    </path>
+    <pathconvert targetos="unix" refid="run.classpath" property="run.classpath"/>
+    
+    <echo>java -classpath ${run.classpath} jalview.bin.Jalview
+    </echo>
+</target>
   
 
   <target name="package" depends="init, build">