From e0f8aef6d65a7da53b416c8291a703841401e9eb Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Mon, 7 Nov 2016 22:56:27 +0100
Subject: [PATCH] DroidFish, CuckooChessEngine: Use java ant task.

Use java ant task to create book.bin and eco.dat so that /usr/bin/java
does not have to be hardcoded.
---
 .../.externalToolBuilders/BinBook_Builder.launch | 16 ++++++++++------
 CuckooChessEngine/build_binbook.xml              |  9 +++++++++
 CuckooChessEngine/src/chess/Book.java            |  2 +-
 .../.externalToolBuilders/ECO_Builder.launch     | 14 +++++++++-----
 DroidFish/build_eco.xml                          | 11 +++++++++++
 5 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 CuckooChessEngine/build_binbook.xml
 create mode 100644 DroidFish/build_eco.xml

diff --git a/CuckooChessEngine/.externalToolBuilders/BinBook_Builder.launch b/CuckooChessEngine/.externalToolBuilders/BinBook_Builder.launch
index c2dcb75..5c9eeaa 100644
--- a/CuckooChessEngine/.externalToolBuilders/BinBook_Builder.launch
+++ b/CuckooChessEngine/.externalToolBuilders/BinBook_Builder.launch
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1278056238759_232&quot; label=&quot;working set&quot; name=&quot;working set&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/CuckooChessEngine/src/book.bin&quot; type=&quot;1&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/CuckooChessEngine/src/book.bin&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;launchConfigurationWorkingSet editPageId=&quot;org.eclipse.ui.resourceWorkingSetPage&quot; factoryID=&quot;org.eclipse.ui.internal.WorkingSetFactory&quot; id=&quot;1278056261536_239&quot; label=&quot;workingSet&quot; name=&quot;workingSet&quot;&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/CuckooChessEngine/src/chess/Book.java&quot; type=&quot;1&quot;/&gt;&#10;&lt;item factoryID=&quot;org.eclipse.ui.internal.model.ResourceFactory&quot; path=&quot;/CuckooChessEngine/src/book.txt&quot; type=&quot;1&quot;/&gt;&#10;&lt;/launchConfigurationWorkingSet&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/java"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="CuckooChessEngine"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/CuckooChessEngine/build_binbook.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/CuckooChessEngine/src/book.txt&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/CuckooChessEngine/src/chess/Book.java&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/CuckooChessEngine/build_binbook.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="chess/Book"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/CuckooChessEngine/bin}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/CuckooChessEngine}"/>
 </launchConfiguration>
diff --git a/CuckooChessEngine/build_binbook.xml b/CuckooChessEngine/build_binbook.xml
new file mode 100644
index 0000000..523d0f9
--- /dev/null
+++ b/CuckooChessEngine/build_binbook.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project default="build_binbook" name="Build assets/eco.dat">
+    <target name="build_binbook">
+        <java classpath="bin"
+              classname="chess.Book"
+              fork="yes">
+        </java>
+    </target>
+</project>
diff --git a/CuckooChessEngine/src/chess/Book.java b/CuckooChessEngine/src/chess/Book.java
index 94d4059..58a7bd1 100644
--- a/CuckooChessEngine/src/chess/Book.java
+++ b/CuckooChessEngine/src/chess/Book.java
@@ -189,7 +189,7 @@ public class Book {
     /** Creates the book.bin file. */
     public static void main(String[] args) throws IOException {
         List<Byte> binBook = createBinBook();
-        FileOutputStream out = new FileOutputStream("../src/book.bin");
+        FileOutputStream out = new FileOutputStream("src/book.bin");
         int bookLen = binBook.size();
         byte[] binBookA = new byte[bookLen];
         for (int i = 0; i < bookLen; i++)
diff --git a/DroidFish/.externalToolBuilders/ECO_Builder.launch b/DroidFish/.externalToolBuilders/ECO_Builder.launch
index b2e420c..c6be1c8 100644
--- a/DroidFish/.externalToolBuilders/ECO_Builder.launch
+++ b/DroidFish/.externalToolBuilders/ECO_Builder.launch
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/DroidFish/assets/eco.dat&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/DroidFish/src/org/petero/droidfish&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/java"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="DroidFish"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/DroidFish/build_eco.xml&quot; type=&quot;1&quot;/&gt;&#10;&lt;item path=&quot;/DroidFish/src/org/petero/droidfish&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/DroidFish/build_eco.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,auto,"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="org.petero.droidfish/buildtools/EcoBuilder ${workspace_loc:/DroidFish/src/org/petero/droidfish/buildtools/eco.pgn} ${workspace_loc:/DroidFish/assets/eco.dat}"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/DroidFish/bin/classes}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/DroidFish}"/>
 </launchConfiguration>
diff --git a/DroidFish/build_eco.xml b/DroidFish/build_eco.xml
new file mode 100644
index 0000000..a21263f
--- /dev/null
+++ b/DroidFish/build_eco.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project default="build_eco" name="Build assets/eco.dat">
+    <target name="build_eco">
+        <java classpath="bin/classes"
+              classname="org.petero.droidfish.buildtools.EcoBuilder"
+              fork="yes">
+            <arg value="src/org/petero/droidfish/buildtools/eco.pgn"/>  
+            <arg value="assets/eco.dat"/>
+        </java>
+    </target>
+</project>