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

Merge branch 'releases/Release_2_10_0_Branch'
---

d9c7868a610eff29a8eddb160b6dc78a94a72470
diff --combined build.xml
index 7126c94,1d4878b..4835752
--- a/build.xml
+++ b/build.xml
@@@ -1,7 -1,7 +1,7 @@@
  <?xml version="1.0"?>
  <!--
 - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
 - * Copyright (C) $$Year-Rel$$ The Jalview Authors
 + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2)
 + * Copyright (C) 2015 The Jalview Authors
   * 
   * This file is part of Jalview.
   * 
@@@ -697,8 -697,9 +697,9 @@@
  </target>
  <target name="sourcedist" description="create jalview source distribution" depends="init">
    <delete file="${source.dist.name}" />
-   <tar destfile="${source.dist.name}" compression="gzip">
-     <tarfileset dir="./" prefix="jalview" preserveLeadingSlashes="true">
+   <!-- temporary copy of source to update timestamps -->
+   <copy todir="_sourcedist">
+     <fileset dir=".">
        <include name="LICENSE" />
        <include name="README" />
        <include name="build.xml" />
@@@ -729,8 -730,33 +730,33 @@@
        <include name="utils/**/*" />
        <include name="${docDir}/**/*" />
        <include name="examples/**/*" />
+     </fileset>
+   </copy>
+ 
+   <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>
+     <fileset dir="_sourcedist">
+       <include name="**/*" />
+     </fileset>
+   </replace>
+   <replace dir="_sourcedist" value="${build.year}">
+     <replacetoken><![CDATA[$$Year-Rel$$]]></replacetoken>
+     <fileset dir="_sourcedist">
+       <include name="**/*" />
+     </fileset>
+   </replace>
+ 
+   <tar destfile="${source.dist.name}" compression="gzip">
+     <tarfileset dir="_sourcedist/" prefix="jalview" preserveLeadingSlashes="true">
      </tarfileset>
    </tar>
+ 
+   <delete dir="_sourcedist" />
  </target>
  <target name="prepubapplet_1" depends="makeApplet">
    <copy todir="${packageDir}/examples">