From 96a5005eb7faf29f9e9fff676e3b694c893be55c Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Wed, 17 Jun 2020 16:21:08 -0400
Subject: [PATCH] updates to reflect sleuthkit build target

---
 build-windows.xml | 8 ++------
 build.xml         | 7 -------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/build-windows.xml b/build-windows.xml
index 27cbf31f26..7f03aa3dde 100644
--- a/build-windows.xml
+++ b/build-windows.xml
@@ -29,15 +29,11 @@
         <fail unless="ewfFound" message="LIBEWF_HOME must be set as an environment variable."/>
         
         <property name="tskLogicalImager.path" value="${env.TSK_HOME}/win32/Release_NoLibs/tsk_logical_imager.exe" />
-        <property name="win64.TskLib.path" value="${env.TSK_HOME}/win32/x64/Release_PostgreSQL"/>
-        <property name="win32.TskLib.path" value="${env.TSK_HOME}/win32/Release_PostgreSQL" />
-        <property name="win64.TskLib.postgres_path" value="${env.TSK_HOME}/win32/x64/Release_PostgreSQL"/>
-        <property name="win32.TskLib.postgres_path" value="${env.TSK_HOME}/win32/Release_PostgreSQL"/>
+        <property name="win64.TskLib.path" value="${env.TSK_HOME}/win32/x64/Release"/>
+        <property name="win32.TskLib.path" value="${env.TSK_HOME}/win32/Release" />
         <available property="tskLogicalImager.exists" type="file" file="${tskLogicalImager.path}" />
         <available property="win64.TskLib.exists" type="dir" file="${win64.TskLib.path}" />
         <available property="win32.TskLib.exists" type="dir" file="${win32.TskLib.path}" />
-        <available property="win64.TskLib_postgres.exists" type="dir" file="{win64.TskLib.postgres_path}" />
-        <available property="win32.TskLib_postgres.exists" type="dir" file="{win32.TskLib.postgres_path}" />
     </target>
 
     <!-- The following copy the libtsk_jni dependencies to the Autopsy
diff --git a/build.xml b/build.xml
index ca0892c583..1f00a24f79 100644
--- a/build.xml
+++ b/build.xml
@@ -156,13 +156,6 @@
                 <include name="libpq.dll"/>
             </fileset>
         </delete>
-
-        <!-- Just keep 64-bit photorec version -->
-        <var name="photorec-zip-path" value="${zip-tmp}/${app.name}/autopsy/photorec_exec"/>
-        <delete dir="${photorec-zip-path}/bin"/>
-        <move todir="${photorec-zip-path}">
-            <fileset dir="${photorec-zip-path}/64-bit/bin"/>
-        </move>
         
         <!-- step (4) zip again, but with the version numbers in the name & root folder -->
         <zip destfile="${nbdist.dir}/${app.name}-${app.version}.zip">