From: Jim Procter <jprocter@dundee.ac.uk>
Date: Wed, 4 Jun 2014 14:47:03 +0000 (+0100)
Subject: JAL-690 JAL-1503 make file associations optional for JNLP
X-Git-Tag: Release_2_8_1~2^2^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2101b85469284f109fc44c4fda1752d3e02b7798;p=jalview.git

JAL-690 JAL-1503 make file associations optional for JNLP
---

diff --git a/build.xml b/build.xml
index d440331..1ac7afc 100755
--- a/build.xml
+++ b/build.xml
@@ -118,7 +118,9 @@
     <property name="jmolJar" value="JmolApplet-12.2.4.jar" />
     <property name="jalviewLiteJar" value="jalviewApplet.jar" />
     <!-- switch to indicate if we should obfuscate jalviewLite -->
-    <!--<property name="donotobfuscate" value="true"/> -->
+    <!-- <property name="donotobfuscate" value="true"/> -->
+    <!-- switch to exclude associations from generated jnlp files -->
+    <!-- <property name="nojnlpfileassocs" value="true"/> -->
 
     <!-- Jalview Web Service Clients - see the comments in 'buildextclients' for details -->
     <property name="wsdl.File" value="http://www.compbio.dundee.ac.uk/JalviewWS/services/jpred?wsdl" />
@@ -328,7 +330,8 @@
     <echo>java -classpath ${run.classpath} jalview.bin.Jalview
       </echo>
   </target>
-  <target name="writejnlpf">
+
+  <target name="-generatejnlpf">
     <presetdef name="jnlpf">
       <jnlp codebase="${WebStartLocation}">
         <information>
@@ -361,12 +364,20 @@
     </presetdef>
 
     <jnlpf toFile="${jnlpFile}"/>
+  
+  </target>
+  
+  <target name="-dofakejnlpfileassoc" depends="-generatejnlpf" if="nojnlpfileassocs">
+    <echo message="Not adding JNLP File Associations"/>
+  </target>
+  
+  <target name="-dojnlpfileassoc" depends="-generatejnlpf" unless="nojnlpfileassocs">
     <replace file="${jnlpFile}">
       <replacetoken>
         <![CDATA[</information>]]></replacetoken>
       <replacevalue>
         <![CDATA[
-        <association mime-type="application-x/ext-file" extensions="fa" />
+          <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="mfa" />
         <association mime-type="application-x/ext-file" extensions="fastq" />
@@ -379,8 +390,12 @@
         <association mime-type="application-x/ext-file" extensions="stk"/>
         <association mime-type="application-x/ext-file" extensions="jvp"/>
       </information>]]></replacevalue>
-  </replace>
+    </replace>
+    <echo message="Added file associations to JNLP file"/>
+    </target>
+<target name="writejnlpf" depends="-dojnlpfileassoc,-dofakejnlpfileassoc">
 </target>
+
 <target name="buildextclients" depends="init">
   <input message="Building external client source from WSDLs - Do you really want to do this ? (Yy/Nn)" validargs="Y,y,n,N" defaultvalue="N" addproperty="doextbuild.response" />
   <condition property="dontextbuild">