Merge branch 'develop' of http://source.jalview.org/git/jalview into develop

diff --git a/build.gradle b/build.gradle
index 0f0b8ff..492d7c1 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -638,7 +638,7 @@ task copyHelp(type: Copy) {
     exclude '**/*.gif'
       exclude '**/*.jpg'
       exclude '**/*.png'
-      filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION])
+      filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['Version-Rel': JALVIEW_VERSION,'Year-Rel': getDate("yyyy")])
   }
   from(inputDir) {
     include '**/*.gif'
@@ -1238,5 +1238,5 @@ task helppages  {
   dependsOn pubhtmlhelp
   
   inputs.dir("$classes/$helpDir")
-  outputs.file("build/distribution/help/helpTOC.html")
+  outputs.dir("$helpOutputDir")
 }

diff --git a/gradle.properties b/gradle.properties
index 6605fa9..53189f0 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,7 +21,7 @@ j11libDir = j11lib
 resourceDir = resources
 helpParentDir = help
 helpDir = help
-helpOutputDir = build/distribution/help
+helpOutputDir = build/distributions/help
 docDir = doc
 sourceDir = src
 schemaDir = schemas

diff --git a/utils/publishHelp.xml b/utils/publishHelp.xml
index 17ef9e2..c626a21 100644 (file)
--- a/utils/publishHelp.xml
+++ b/utils/publishHelp.xml
@@ -1,7 +1,7 @@
 <project name="Publish Help Webpages for Jalview" default="pubhtmlhelp">
 
 <target name="pubhtmlhelp">
-  <property name="appletHelpDir" value="../build/distribution/help"/>
+  <property name="appletHelpDir" value="../build/distributions/help"/>
         <!-- finally, publish the help files -->
         <javac srcdir="." destdir="." includes="help2Website.java"/>
         <java fork="true" dir="${helpBuildDir}" classpath="." classname="help2Website"/>