From: jprocter <<jprocter@dundee.ac.uk>
Date: Fri, 17 Jan 2014 16:27:25 +0000 (+0000)
Subject: JAL-1400 tweaking to ensure JmolApplet build correctly
X-Git-Tag: Release_2_8_0b1~1^2~18^2
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=dfb6a07c452c1c4f2931a1acff753bbe4fc556f0

JAL-1400 tweaking to ensure JmolApplet build correctly
---

diff --git a/build.xml b/build.xml
index 3fccf5d..f2a9daf 100755
--- a/build.xml
+++ b/build.xml
@@ -600,7 +600,7 @@
       </fileset>
     </copy>
 
-    <presetdef name="applet.jar">
+    <presetdef name="ap_applet.jar">
       <!-- build a signed applet with 'all-permissions' - 
 			  Needs 'param name="permissions' value="all-permissions"' in applet tag
 			  JalviewLite+JmolApplet linked sequence/structure fails
@@ -616,7 +616,7 @@
         </manifest>
       </jar>
     </presetdef>
-    <presetdef name="s_applet.jar">
+    <presetdef name="applet.jar">
       <!-- build signed applet with sandbox permissions -
 			  Needs 'param name="permissions' value="sandbox"' in applet tag
 			 Preserves Pre-Java 1.7_u45 behavior once 'permissions' parameter added to applet tag 
@@ -632,7 +632,7 @@
         </manifest>
       </jar>
     </presetdef>
-    <presetdef name="applet_tl.jar">
+    <presetdef name="tl_applet.jar">
       <!-- build signed applet with trusted library/trusted permissions -
 			        Needs 'param name="permissions' value="all-permissions"' in applet tag
 			       j1.7_45:
@@ -652,7 +652,7 @@
         </manifest>
       </jar>
     </presetdef>
-    <presetdef name="applet_to.jar">
+    <presetdef name="to_applet.jar">
       <!-- not fully test variant (yet) -->
       <jar update="true" index="true" jarfile="@{jarfile}">
         <manifest>
@@ -664,20 +664,22 @@
       </jar>
     </presetdef>
     <!-- create differently privileged artefacts -->
+    <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/ap_${jalviewLiteJar}" />
+    <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/ap_${jmolJar}"/>
+    <ap_applet.jar jarfile="${packageDir}/examples/ap_${jalviewLiteJar}" />
+    <ap_applet.jar jarfile="${packageDir}/examples/ap_${jmolJar}" />
     <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/tl_${jalviewLiteJar}" />
     <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/tl_${jmolJar}" />
+    <tl_applet.jar jarfile="${packageDir}/examples/tl_${jalviewLiteJar}" />
+    <tl_applet.jar jarfile="${packageDir}/examples/tl_${jmolJar}" />
     <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/to_${jalviewLiteJar}" />
     <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/to_${jmolJar}" />
-    <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/s_${jalviewLiteJar}" />
-    <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/s_${jmolJar}" />
-    <applet.jar jarfile="${packageDir}/examples/ap_${jalviewLiteJar}" />
-    <applet.jar jarfile="${packageDir}/examples/ap_${jmolJar}" />
-    <applet_tl.jar jarfile="${packageDir}/examples/tl_${jalviewLiteJar}" />
-    <applet_tl.jar jarfile="${packageDir}/examples/tl_${jmolJar}" />
-    <s_applet.jar jarfile="${packageDir}/examples/${jalviewLiteJar}" />
-    <s_applet.jar jarfile="${packageDir}/examples/${jmolJar}" />
-    <applet_to.jar jarfile="${packageDir}/examples/to_${jalviewLiteJar}" />
-    <applet_to.jar jarfile="${packageDir}/examples/to_${jmolJar}" />
+    <to_applet.jar jarfile="${packageDir}/examples/to_${jalviewLiteJar}" />
+    <to_applet.jar jarfile="${packageDir}/examples/to_${jmolJar}" />
+    <!-- finally, create manifest for original jars -->
+    <applet.jar jarfile="${packageDir}/examples/${jalviewLiteJar}" />
+    <applet.jar jarfile="${packageDir}/examples/${jmolJar}" />
+
     <!-- todo - write examples/downloads for alternate versions of the applet -->
     <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">