From b01c01ca3b40e787b3bce07456b0bc21b513ee45 Mon Sep 17 00:00:00 2001
From: jlizier <joseph.lizier@gmail.com>
Date: Tue, 18 Oct 2016 12:53:26 +1100
Subject: [PATCH] Ant script now builds class files for the auto-analyser and
 includes these in the distribution. Also a patch to stop errors when the
 JIDT-logo file is not found (in zip dists)

---
 build.xml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/build.xml b/build.xml
index 49e3283..22db3f1 100755
--- a/build.xml
+++ b/build.xml
@@ -16,6 +16,7 @@
 	<property name="unittestsouttoplevel" location="unittests"/>
 	<property name="unittestssrc" location="java/unittests"/>
 	<property name="unittestsbin" location="${unittestsouttoplevel}/bin"/>
+	<property name="autoanalyserdemo" location="demos/java"/>
 	<property name="reports.tests" location="${unittestsouttoplevel}/reports"/>
 	<property name="javadocsdir" location="javadocs"/>
 	<property name="versionfile" value="version-${version}.txt"/>
@@ -79,6 +80,23 @@
 		</junit>
 	</target>
 
+	<!-- Compile the autoanalyser demo -->
+	<target name="autoanalyser" depends="jar" description="compile the autoanalyser demo">
+		<!-- Compile to Java 6 to provide compatibility for users with older JREs.
+		     Caveat: The flags here only check the language compatibility, but
+		     may still use newer libraries which may cause issues for users with JDK 6.
+		     Indeed, one gets the warning: "bootstrap class path not set in conjunction with -source 1.6"
+		     To fix this, one would use the bootstrap classpath to point our JDK to an rt.jar
+		     for Java 6. 
+		     At this stage, I'm sure I'm not using new library calls from Java 7, so we can
+		     ignore the warning, and I don't want to bother installing Java 6 just to compile
+		     like this. I'll endeavour not to use JDK 7 libraries so as not to cause
+		     any issues here ... -->
+		<javac srcdir="${autoanalyserdemo}" includes="infodynamics/demos/autoanalysis/*.java" excludes="infodynamics/demos/autoanalysis/GeneratedCalculator.java" includeAntRuntime="false" target="1.6" source="1.6">
+			<classpath refid="project.classpath"/>
+		</javac>
+	</target>
+
 	<!-- Make javadocs, excluding the classes we've derived from Apache Commons Math -->
 	<target name="javadocs" depends="compile" description="Make the javadocs for the toolkit">
 		<delete dir="${javadocsdir}"/>
@@ -183,7 +201,7 @@
 	</target>
 	
 	<!-- Developer build - builds everything and makes the full distribution file -->
-	<target name="dist" depends="jar,junit,javadocs,readmefiles" description="developer: generate the full distribution">
+	<target name="dist" depends="jar,junit,autoanalyser,javadocs,readmefiles" description="developer: generate the full distribution">
 		<echo message="${ant.project.name}: ${ant.file}"/>
 		<zip destfile="${distnamezip}">
 			<fileset file="build.xml"/>
@@ -191,13 +209,14 @@
 			<fileset file="license-gplv3.txt"/>
 			<fileset file="readme.txt"/>
 			<fileset file="InfoDynamicsToolkit.pdf"/>
+			<fileset file="JIDT-logo.png" erroronmissingdir="false"/> <!-- This file is missing in full repository versions -->
 			<fileset file="${versionfile}"/>
 			<zipfileset dir="java" includes="**/*.java" prefix="java"/>
 			<zipfileset dir="demos" includes="**/*.*,**/*" excludes="clojure/deploy,clojure/deploy/*.*,python/*.pyc" prefix="demos"/>
 			<zipfileset dir="javadocs" includes="**/*.*,**/*" prefix="javadocs"/>
 			<zipfileset dir="notices" includes="**/*.*,**/*" prefix="notices"/>
 			<zipfileset dir="tutorial" prefix="tutorial"/>
-			<zipfileset dir="web" includes="JIDT-logo.png" prefix=""/>
+			<zipfileset dir="web" includes="JIDT-logo.png" prefix="" erroronmissingdir="false"/> <!-- This file is missing in zip dist versions -->
 		</zip>
 	</target>
 </project>