X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=build.xml;h=8d27614d06f9602b7aca7fcb4b7f23bedc6c157e;hp=72359500c3469e95efa0bfab2245626f274b503d;hb=7585bdc21653bdb66d604ed5efa95497f28c7eb5;hpb=e9a698e0e1bc0f12919b3a856d3ee412eb5f8fa0

diff --git a/build.xml b/build.xml
index 7235950..8d27614 100755
--- a/build.xml
+++ b/build.xml
@@ -128,7 +128,7 @@
     <property name="packageDir" value="dist" />
     <property name="outputJar" value="jalview.jar" />
     <!-- Jalview Applet JMol Jar Dependency -->
-    <property name="jmolJar" value="JmolApplet-14.2.14_2015.06.11.jar" />
+    <property name="jmolJar" value="JmolApplet-14.6.4_2016.10.26.jar" />
     <property name="varnaJar" value="VARNAv3-93.jar" />
     <property name="jsoup" value="jsoup-1.8.1.jar" />
     <property name="jsonSimple" value="json_simple-1.1.jar" />
@@ -700,6 +700,10 @@
   <!-- temporary copy of source to update timestamps -->
   <copy todir="_sourcedist">
     <fileset dir=".">
+      <exclude name=".*" />
+      <exclude name="**/.*" />
+      <exclude name="*.class" />
+      <exclude name="**/*.class" />
       <include name="LICENSE" />
       <include name="README" />
       <include name="build.xml" />
@@ -724,8 +728,10 @@
       <exclude name="utils/InstallAnywhere/**Build.iap_xml" />
       <exclude name="utils/InstallAnywhere/**Build*/**" />
       <exclude name="utils/InstallAnywhere/**Build*/**" />
+      <exclude name="utils/InstallAnywhere/.build*.*/**" />
       <exclude name="utils/InstallAnywhere/**locale*" />
       <exclude name="utils/InstallAnywhere/**locale*/**" />
+      <exclude name="utils/InstallAnywhere/**locale*/**" />
       <include name="${schemaDir}/**/*" />
       <include name="utils/**/*" />
       <include name="${docDir}/**/*" />
@@ -736,18 +742,16 @@
   <tstamp prefix="build">
     <format property="year" pattern="yyyy" />
   </tstamp>
+  <!-- each replacetoken CDATA body must be on one line - 
+       otherwise the pattern doesn't match -->
   <replace value="${JALVIEW_VERSION}">
-    <replacetoken>
-      <![CDATA[$$Version-Rel$$]]>
-    </replacetoken>
+    <replacetoken><![CDATA[$$Version-Rel$$]]></replacetoken>
     <fileset dir="_sourcedist">
       <include name="**/*" />
     </fileset>
   </replace>
   <replace dir="_sourcedist" value="${build.year}">
-    <replacetoken>
-      <![CDATA[$$Year-Rel$$]]>
-    </replacetoken>
+    <replacetoken><![CDATA[$$Year-Rel$$]]></replacetoken>
     <fileset dir="_sourcedist">
       <include name="**/*" />
     </fileset>