From: Jim Procter <jprocter@compbio.dundee.ac.uk>
Date: Tue, 28 Jan 2014 13:52:55 +0000 (+0000)
Subject: Merge branch 'JAL-957_jbake' into Release_2_8_Branch
X-Git-Tag: Release_2_8_0b1~1^2~13
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=1062f45072831c63e3e47d53055496ddbb1f92f1;hp=4dd1280e2c4220c92bba4db6c7429ad36ad84e70;p=jalview.git

Merge branch 'JAL-957_jbake' into Release_2_8_Branch
---

diff --git a/build.xml b/build.xml
index 70b7e29..6487a2d 100755
--- a/build.xml
+++ b/build.xml
@@ -665,6 +665,8 @@
       </jar>
     </presetdef>
     <!-- create differently privileged artefacts -->
+    <copy file="${packageDir}/examples/${jalviewLiteJar}" tofile="${packageDir}/examples/u_${jalviewLiteJar}" />
+    <copy file="${packageDir}/examples/${jmolJar}" tofile="${packageDir}/examples/u_${jmolJar}"/>
     <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}" />
@@ -685,6 +687,7 @@
     <signjar storepass="${jalview.keystore.pass}" keypass="${jalview.key.pass}" keystore="${jalview.keystore}" alias="${jalview.key}" lazy="false" verbose="false">
 
       <fileset dir="${packageDir}/examples">
+        <exclude name="u_*.jar"/>
         <include name="*.jar" />
       </fileset>
     </signjar>