From: Jim Procter <jprocter@issues.jalview.org>
Date: Thu, 8 Sep 2016 17:15:45 +0000 (+0100)
Subject: JAL-2119 pass/resolve real help dir in link checker
X-Git-Tag: Release_2_10_0~47^2~1
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=07f9d0ec428f22b9df1da4e3ad68d7c4f99961bf;p=jalview.git

JAL-2119 pass/resolve real help dir in link checker
---

diff --git a/build.xml b/build.xml
index 3a2b07a..7feacfb 100755
--- a/build.xml
+++ b/build.xml
@@ -929,8 +929,8 @@
 <target name="linkcheck">
   <!-- finally, publish the help files -->
   <javac srcdir="utils" destdir="utils" includes="HelpLinksChecker.java"/>
-  <java fork="true" dir="help" classpath="utils" classname="HelpLinksChecker" failonerror="true">
-    <arg file="help"/>
+  <java fork="true" dir="${helpDir}" classpath="utils" classname="HelpLinksChecker" failonerror="true">
+    <arg file="${helpDir}"/>
     <arg value="-nointernet"/>
   </java>
 </target>
diff --git a/utils/HelpLinksChecker.java b/utils/HelpLinksChecker.java
index 7b676cc..a0853a9 100644
--- a/utils/HelpLinksChecker.java
+++ b/utils/HelpLinksChecker.java
@@ -85,7 +85,7 @@ public class HelpLinksChecker
   void checkLinks(String helpDirectoryPath) throws IOException
   {
     System.out.println("Checking help file links");
-    File helpFolder = new File(helpDirectoryPath);
+    File helpFolder = new File(helpDirectoryPath).getCanonicalFile();
     if (!helpFolder.exists())
     {
       System.out.println("Can't find " + helpDirectoryPath);