diff --git a/bindings/java/build-unix.xml b/bindings/java/build-unix.xml index ecaa77908beeaddb1f6996b46953a00e4e78abd9..842bf731f389e3c852ef569afe125c7fdd125555 100644 --- a/bindings/java/build-unix.xml +++ b/bindings/java/build-unix.xml @@ -4,7 +4,6 @@ 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"> - <fail unless="ewfFound" message="LIBEWF_HOME must be set as an environment variable."/> <junit fork="on" haltonfailure="yes" dir="."> <sysproperty key="rslt" value="${test-results}"/> <sysproperty key="gold" value="${test-standards}"/> @@ -19,7 +18,6 @@ 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"> - <fail unless="ewfFound" message="LIBEWF_HOME must be set as an environment variable."/> <java classname="org.sleuthkit.datamodel.DataModelTestSuite" classpathref="libraries" fork="true" failonerror="true"> <sysproperty key="gold" value="${test-standards}"/> <sysproperty key="inpt" value="${test-input}"/> diff --git a/bindings/java/build-windows.xml b/bindings/java/build-windows.xml index 8000eb044328fb8a3a4d7dd2ee05406f3e9127bd..6c45e5ac3589b63225c5ce41d6f6f46f5af94931 100644 --- a/bindings/java/build-windows.xml +++ b/bindings/java/build-windows.xml @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="windows-1252"?> <project name="TSKTestTargets"> + <!-- some dlls come from LIBEWF_HOME --> + <property environment="env"/> + <condition property="ewfFound"> + <isset property="env.LIBEWF_HOME"/> + </condition> <property name="dlls" value="${env.LIBEWF_HOME}/msvscpp/zlib;${env.LIBEWF_HOME}/msvscpp/Release;../../win32/Release"/> <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." diff --git a/bindings/java/build.xml b/bindings/java/build.xml index 85bfaccbf3f17aaca48e4b7f3df3f77e06542a95..90b9489d83dd98c6856193db3ed8c239a9a628e0 100755 --- a/bindings/java/build.xml +++ b/bindings/java/build.xml @@ -9,15 +9,7 @@ <os family="windows"/> </condition> <import file="build-${os.family}.xml"/> - <!-- some dlls come from LIBEWF_HOME --> - <property environment="env"/> - <condition property="ewfFound"> - <or> - <isset property="env.LIBEWF_HOME"/> - <os family="unix"/> - </or> - </condition> - + <!-- set global properties for this build --> <property name="src" location="src/org/sleuthkit/datamodel"/> <property name="build" location="build/"/> @@ -134,11 +126,11 @@ pattern="lib/[artifact]-[revision](-[classifier]).[ext]" /> <target name="test" 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, test-precond"> + <fail if="imp" message="Run make install on The Sleuthkit."/> </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"> - <echo message="Run make install on The Sleuthkit"/> + depends="compile-test, test-create-standards-precond"> + <fail if="imp" message="Run make install on The Sleuthkit."/> </target> </project>