From 26e555cf358e5fe989d4498eb4fbbfec8682cacd Mon Sep 17 00:00:00 2001
From: Sean-M <Smoss117@gmail.com>
Date: Tue, 12 Feb 2013 13:32:49 -0500
Subject: [PATCH] Even More minor fixes to build

---
 bindings/java/build-unix.xml    | 9 +++------
 bindings/java/build-windows.xml | 2 --
 bindings/java/build.xml         | 4 +---
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/bindings/java/build-unix.xml b/bindings/java/build-unix.xml
index 842bf731f..45a15b8c3 100644
--- a/bindings/java/build-unix.xml
+++ b/bindings/java/build-unix.xml
@@ -2,8 +2,7 @@
 <project name="TSKTestTargets">
 	<target name="test-precond" 
 			description="Traverses the Images stored in the path represented by test-input variable, creates results files stored in the path represented by test-results, and compares them to the standards stored in the path represented by the test-standards variable, always run test-create-standards at least once before before running test."
-			depends="compile-test, depender" 
-			if="pres">
+			depends="compile-test, depender">
 		<junit fork="on" haltonfailure="yes" dir=".">
 			<sysproperty key="rslt" value="${test-results}"/>
 			<sysproperty key="gold" value="${test-standards}"/>
@@ -12,20 +11,18 @@
 			<formatter type="plain" usefile="false" />
 			<test name="org.sleuthkit.datamodel.DataModelTestSuite" />
 		</junit>
-		<property name="imp" value="true"/>
 	</target>
 	<target name="test-create-standards-precond"
 			description="Traverses the Images stored in the path represented by test-input variable and creates then stores them to the path represented by the test-standards variable, run test-download-imgs at least once before this."
-			depends="compile-test, depender"
-			if="pres">
+			depends="compile-test, depender">
 		<java classname="org.sleuthkit.datamodel.DataModelTestSuite" classpathref="libraries"	fork="true" failonerror="true">
 			<sysproperty key="gold" value="${test-standards}"/>
 			<sysproperty key="inpt" value="${test-input}"/>
 			<sysproperty key="types" value="${test-types}"/>
 		</java>
-		<property name="imp" value="true"/>
 	</target>
 	<target name="depender">
 		<available file="/usr/local/lib/libtsk_jni.a" property="pres"/>
+		<fail unless="pres" message="Run make install on The Sleuthkit."/>
 	</target>
 </project>
\ No newline at end of file
diff --git a/bindings/java/build-windows.xml b/bindings/java/build-windows.xml
index 6c45e5ac3..b2d7d2257 100644
--- a/bindings/java/build-windows.xml
+++ b/bindings/java/build-windows.xml
@@ -19,7 +19,6 @@
 			<formatter type="plain" usefile="false" />
 			<test name="org.sleuthkit.datamodel.DataModelTestSuite" />
 		</junit>
-		<property name="imp" value="true"/>
 	</target>
 	<target name="test-create-standards-precond"
 			description="Traverses the Images stored in the path represented by test-input variable and creates then stores them to the path represented by the test-standards variable, run test-download-imgs at least once before this."
@@ -31,6 +30,5 @@
 			<sysproperty key="inpt" value="${test-input}"/>
 			<sysproperty key="types" value="${test-types}"/>
 		</java>
-		<property name="imp" value="true"/>
 	</target>
 </project>
diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index 1787cae23..f80a1e54c 100755
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -125,8 +125,6 @@ pattern="lib/[artifact]-[revision](-[classifier]).[ext]" />
 	</target>
 	<target name="test-create-standards"
 			description="Traverses the Images stored in the path represented by test-input variable and creates then stores them to the path represented by the test-standards variable, run test-download-imgs at least once before this."
-			depends="compile-test, test-create-standards-precond"
-			unless="imp">
-				<fail message="Run make install on The Sleuthkit."/>
+			depends="compile-test, test-create-standards-precond">
 	</target>
 </project>
-- 
GitLab