From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 25 Oct 2016 08:31:18 +0000 (+0100)
Subject: Merge branch 'sourcepub' into releases/Release_2_10_0_Branch
X-Git-Tag: Release_2_10_0b1_sourcepub^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f536285cd58d044b65bfe00279a42c4b1cfb48e3;hp=d0d9438f00d2ad44a9d5711922157d2746d44c00;p=jalview.git

Merge branch 'sourcepub' into releases/Release_2_10_0_Branch
---

diff --git a/build.xml b/build.xml
index 7235950..1d4878b 100755
--- a/build.xml
+++ b/build.xml
@@ -736,18 +736,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>