From 9d1dc2f2dd9a2d8774772d5d9f67ec7939a43ce1 Mon Sep 17 00:00:00 2001
From: Jim Procter <jprocter@issues.jalview.org>
Date: Mon, 25 Jun 2018 13:23:20 +0100
Subject: [PATCH] JAL-3033 try to configure eclipse workspace via property

---
 .ant-targets-build.xml |   31 +++++++++++++++++++++++++++++++
 build.xml              |    4 ++--
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/.ant-targets-build.xml b/.ant-targets-build.xml
index 7ef21f1..8dd03da 100644
--- a/.ant-targets-build.xml
+++ b/.ant-targets-build.xml
@@ -1,2 +1,33 @@
+build
+build-site
+buildPropertiesFile
+buildTests
+buildextclients
+buildindices
+castorbinding
+clean
+compileApplet
+distclean
+eclipse-install
 help
+init
+linkcheck
+makeApplet
+makedist
+makefulldist
+obfuscate
+packageApplet
+prepare
+prepareTests
+preparejnlp
+prepubapplet_1
+pubapplet
+runenv
+signApplet
+sourcedist
+sourcedoc
+sourcescrub
+testclean
+testng
 usage
+writejnlpf
diff --git a/build.xml b/build.xml
index e69c676..dbe9f71 100755
--- a/build.xml
+++ b/build.xml
@@ -1005,7 +1005,7 @@
   <property name="eclipse-exec" value="${eclipse-inst}/eclipse"/>
   <property name="site" value="site"/>
   <!-- where the eclipse js workspace has been initialised -->
-  <property name="eclipse-workspace" value="/cluster/gjb_lab/jprocter/eclipse-js-workspace"/>
+  <property name="eclipse-work" value="/cluster/gjb_lab/jprocter/eclipse-js-workspace"/>
   
   <!-- execute eclipse build, trap log and dump to stdout here -->
   <copy file="${swingjsdir}/net.sf.j2s.core.jar" todir="${eclipse-inst}/dropins"/>
@@ -1017,7 +1017,7 @@
     <arg value="-application"/>
     <arg value="org.eclipse.jdt.apt.core.aptBuild"/>
     <arg value="-data"/>
-    <arg value="/cluster/gjb_lab/jprocter/eclipse-js-workspace"/>
+    <arg value="${eclipse-work}"/>
   </exec>
 
   <!-- TODO: run jslint and something else here to check we have a complete set of .js files for java -->
-- 
1.7.10.2