X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.xml;h=8d93cda618b84e71a7c0d0c4329611ebd2b8b9ad;hb=70f9e1de8a16eff7e6e8b4491f1fc2870ab89471;hp=fd4257cd867b77834cb66eacba632e1df9e720f0;hpb=55cbe1bc97dab5eb37c8b6261d966708a142bdce;p=jalview.git

diff --git a/build.xml b/build.xml
index fd4257c..8d93cda 100755
--- a/build.xml
+++ b/build.xml
@@ -1,5 +1,16 @@
 <?xml version="1.0"?>
   <project name="jalviewX" default="build" basedir=".">
+<!-- we use jalopy to format our sources -->
+<taskdef name="jalopy"
+         classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
+  <classpath>
+    <fileset dir="utils/jalopy/lib">
+      <include name="*.jar" />
+    </fileset>
+  </classpath>
+</taskdef>
+
+
     <!-- utils is a class path to additional utilities needed for
     building docs, jars and webstart stuff -->
 
@@ -27,6 +38,7 @@
         </fileset> -->
       </path>
 
+      <property name="JALVIEW_VERSION" value="2.01"/>
       <property name="" value=""/>
       <property name="libDir" value="lib"/>
       <property name="resourceDir" value="resources"/>
@@ -36,11 +48,13 @@
       <property name="outputDir" value="classes" />
       <property name="packageDir" value="dist" />
       <property name="outputJar" value="jalview.jar" />
-      <property name="wsdl.File" value="http://anaplog.compbio.dundee.ac.uk:8080/axis/services/jpred?wsdl" />
-      <property name="wsdl.Files" value="http://anaplog.compbio.dundee.ac.uk:8080/axis/services/vamsas?wsdlFiles" />
-      <property name="wsdl.MsaWS" value="http://anaplog.compbio.dundee.ac.uk:8080/axis/services/MuscleWS?wsdl" />
-
-      <property name="WebStartLocation" value="http://www.compbio.dundee.ac.uk/~jimp/jalviewtest"/>
+      <property name="wsdl.File" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/jpred?wsdl" />
+      <property name="wsdl.Files" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/vamsas?wsdlFiles" />
+      <property name="wsdl.MsaWS" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/MuscleWS?wsdl" />
+      <property name="wsdl.MsaWS2" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/ClustalWS?wsdl" />
+      <property name="wsdl.MsaWS2" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/ClustalWS?wsdl" />
+        <property name="WSInterf" value="MsaWS" />
+      <property name="WebStartLocation" value="http://www.jalview.org/webstart"/>
       <property name="wsdl.Namespace" value="vamsas" />
       <property name="wsdl.ClientNS" value="ext.vamsas" />
 
@@ -67,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 hh.mm aa"/>
+      </tstamp>
+      <properties file="${outputDir}/.build_properties">
+        <header>
+          ---Jalview Application Properties---
+        </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}"/>
@@ -94,10 +124,9 @@
       <mkdir dir="${outputDir}"/>
       <copy todir="${outputDir}">
         <fileset dir=".">
-
           <include name="${docDir}/**/*.*"/>
           <include name="${helpDir}/**/*.*"/>
-          <include name="${libDir}/*.*"/>
+          <include name="${libDir}/*.jar"/>
         </fileset>
         <fileset dir="${resourceDir}">
           <include name="**/*.*"/>
@@ -107,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">
@@ -122,12 +156,13 @@
     </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}">
         <fileset dir="${outputDir}/">
+          <exclude name="cache*/**"/>
           <exclude name="*.jar" />
           <exclude name="*.jar.*" />
           <exclude name="**/*.jar" />
@@ -141,7 +176,7 @@
           <include name="**/*.jar"/>
         </fileset>
       </copy>
-
+<!-- the default keystore details might need to be edited here -->
       <signjar
       storepass="alignmentisfun"
       keypass="alignmentisfun"
@@ -162,25 +197,32 @@
       codebase="${WebStartLocation}">
       <information>
         <title>Jalview</title>
-        <vendor>Barton Group</vendor>
+        <vendor>The Barton Group</vendor>
         <homepage href="www.jalview.org"/>
         <description>Jalview Multiple Alignment Editor</description>
         <description kind="short">Jalview</description>
-        <icon href="BartonGroupBanner.gif"/>
-      </information>
+        <icon href="logo_big.gif"/>
+	<!--
+	<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"/>
+        <association mime-type="application-x/ext-file" extensions="msf"/>
+        <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>
         <resources>
-          <j2se version="1.3+"/>
-          <fileset dir="${packageDir}">
-            <include name="jalview.jar"/>
-          </fileset>
+          <j2se version="1.4+"/>
           <fileset dir="${packageDir}">
             <include name="*.jar"/>
             <exclude name="jalview.jar"/>
           </fileset>
+          <property name="jalview.version" value="${JALVIEW_VERSION}"/>
         </resources>
         <application_desc main_class="jalview.bin.Jalview">
-          <argument>http://www.compbio.dundee.ac.uk/~andrew/jalview/glut.msf</argument>
-        </application_desc>
+          </application_desc>
         <security>
           <all_permissions/>
         </security>
@@ -200,6 +242,16 @@
     </target>
 
     <target name="buildextclients" depends="init">
+<!-- Currently, this doesn't happen automatically.
+     1. Run WSDL2Java as below, which generates an ext.vamsas +
+     vamsas.<datapackages> fileset.
+     2. refactor ext.vamsas.SpecificserviceWS* to
+     ext.vamsas.ServiceclassWS* that implements the ServiceclassWSI interface.
+     3. Update the jalview.ws.*WServices classes to reflect the
+     interface type, and all locations of this wsdl type that Jalview
+     might be using.
+
+-->
       <path id="axisbuild">
         <!--        <path refid="axis.classpath"/> -->
         <path refid="build.classpath"/>
@@ -214,7 +266,7 @@
       <axis-wsdl2java
       output="${sourceDir}"
       verbose="true"
-      url="${wsdl.MsaWS}"
+      url="${wsdl.MsaWS2}"
       serverside="false"
       deployscope="Request"
       debug="false"
@@ -235,4 +287,50 @@
   <target name="package" depends="init, build">
 
   </target>
+  <!-- jalopy code reformatter -->
+  <target name="sourcescrub" depends="init,build">
+    <jalopy destdir="jsrc" classpathref="run.classpath"
+      convention="jalview-jalopy.xml">
+      <fileset dir="${sourceDir}">
+        <include name="*.java"/>
+        <include name="**/*.java"/>
+        <include name="**/**/*.java"/>
+      </fileset>
+      </jalopy>
+  </target>
+
+
+
+  <!-- Compile, package and obfuscate Jalview Applet -->
+  <target name="makeApplet" depends="obfuscate"/>
+
+  <target name="compileApplet" depends="init,clean">
+    <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/**"/>
+  </target>
+
+  <target name="packageApplet" depends="compileApplet">
+       <jar destfile="in.jar">
+        <fileset dir="${outputDir}">
+          <include name="com/**"/>
+          <include name="jalview/**"/>
+          <include name="${resourceDir}/images/idwidth.gif"/>
+        </fileset>
+      </jar>
+  </target>
+
+  <target name="obfuscate" depends="packageApplet">
+    <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
+    </proguard>
+    <delete file="in.jar"/>
+  </target>
+
+
 </project>