From a6d962a69a3d401beffe7c47147f924c8b56e983 Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@issues.jalview.org>
Date: Tue, 25 Oct 2016 09:30:06 +0100
Subject: [PATCH] JAL-1683 reinstate replacetoken patterns so source
 replacement happens!

---
 build.xml |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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>
-- 
1.7.10.2