Merge pull request sleuthkit#3238 from sleuthkit/patch-includes-from-project-base

Provide for building in a different builddir

Author: simsong

.github/workflows/build_ossfuzz.yml

@@ -19,7 +19,6 @@ jobs:
         - architecture: 'x64'
           compiler: 'gcc'
           configure_options: ''
-    if: false
     steps:
     - name: Install build dependencies
       run: |
@@ -36,6 +35,6 @@ jobs:
         sed 's?./tsk/util/??' -i projects/sleuthkit/build.sh
         sed 's?./tsk/pool/??' -i projects/sleuthkit/build.sh
         sed 's?--without-libvmdk?--without-libvmdk --without-libcrypto?' -i projects/sleuthkit/build.sh
-        python3 infra/helper.py build_image --pull sleuthkit 
+        python3 infra/helper.py build_image --pull sleuthkit
         python3 infra/helper.py build_fuzzers --sanitizer address sleuthkit
         python3 infra/helper.py check_build sleuthkit

Makefile.am

@@ -602,13 +602,15 @@ EXTRA_DIST += \
 	tools/timeline/mactime.base \
 	tools/timeline/.perltidyrc
 
-tools/timeline/mactime: tools/timeline/mactime.base Makefile
+tools/timeline/mactime: $(srcdir)/tools/timeline/mactime.base Makefile
+	@mkdir -p $(dir $@)
 	@echo "#!$(PERL) -w" >$@
 	@echo "my \$$VER=\"$(VERSION)\";" >>$@
 	@cat $(srcdir)/tools/timeline/mactime.base >>$@
 	@chmod +x $@
 
-tools/sorter/sorter: tools/sorter/sorter.base Makefile
+tools/sorter/sorter: $(srcdir)/tools/sorter/sorter.base Makefile
+	@mkdir -p $(dir $@)
 	@echo "#!$(PERL) -w" >$@
 	@echo "my \$$BIN_DIR=\"$(bindir)\";" >>$@
 	@echo "my \$$DATA_DIR=\"$(datadir)\";" >>$@
@@ -622,7 +624,8 @@ tools/sorter/sorter: tools/sorter/sorter.base Makefile
 
 EXTRA_DIST += test/legacy/runtests.sh
 
-check_SCRIPTS = \
+## Check system
+check_script_files = \
 	test/check_static.sh \
 	test/test_libraries.sh \
 	test/test_static_tools.sh \
@@ -635,6 +638,9 @@ check_SCRIPTS = \
 	test/tools/vstools/test_mmls.sh \
 	test/tools/vstools/test_mmls_E01.sh
 
+check_SCRIPTS = $(check_script_files)
+EXTRA_DIST += $(check_script_files)
+
 TESTS =	\
 	test/runner \
 	test/test_libraries.sh \
@@ -688,20 +694,33 @@ test_runner_SOURCES = \
 	test/tsk/img/test_vmdk.cpp \
 	test/tsk/util/test_crypto.cpp \
 	test/tsk/hashdb/test_binsrch_index.cpp \
-	test/runner.cpp
+	test/runner.cpp \
+	vendors/catch.hpp
 
 EXTRA_test_runner_DEPENDENCIES = test/get_images/test_images.txt
 
-test_fiwalk_fiwalk_test_CPPFLAGS = $(AM_CPPFLAGS) -Ivendors $(CATCH2_CPPFLAGS)
+test_fiwalk_fiwalk_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/vendors $(CATCH2_CPPFLAGS)
 test_fiwalk_fiwalk_test_LDADD = $(TSK_LIBS)
 test_fiwalk_fiwalk_test_SOURCES = \
 	test/fiwalk/fiwalk_test.cpp \
 	$(tools_fiwalk_src_libfiwalk_la_SOURCES)
 
 EXTRA_test_fiwalk_fiwalk_test_DEPENDENCIES = test/get_images/test_images.txt
 
-test/get_images/test_images.txt: test/get_images/test_images.yaml test/get_images/get_test_images.bash test/get_images/get_test_images.py
-	test/get_images/get_test_images.bash
+# System for getting test images
+# This will be replaced with a sub repo
+
+get_images_inputs = \
+    test/get_images/get_test_images.bash \
+    test/get_images/get_test_images.py \
+    test/get_images/test_images.yaml
+
+test/get_images/test_images.txt: $(get_images_inputs)
+	bash $(srcdir)/test/get_images/get_test_images.bash
+
+EXTRA_DIST += $(get_images_inputs)
+
+##
 
 CLEANFILES += test/get_images/test_images.txt
 

rejistry++/include/librejistry++.h

@@ -35,4 +35,4 @@
 #include "../src/RegistryValue.h"
 #include "../src/RejistryException.h"
 
-#endif
+#endif

test/get_images/get_test_images.bash

@@ -7,10 +7,8 @@ MYDIR=$(dirname "$0")
 pushd $MYDIR
 if [ ! -d venv ]; then
     python3 -m venv venv
-    source venv/bin/activate
-    pip install -r requirements.txt
-else
-    source venv/bin/activate
 fi
+source venv/bin/activate
+pip install -r requirements.txt
 popd
 python3 test/get_images/get_test_images.py

tsk/auto/db_sqlite.cpp

@@ -15,7 +15,7 @@
 
 #include "tsk_db_sqlite.h"
 #include "guid.h"
-#include "../img/pool.hpp"
+#include "tsk/img/pool.hpp"
 #include <string.h>
 #include <sstream>
 #include <algorithm>

tsk/auto/tsk_db_sqlite.h

@@ -25,7 +25,7 @@
 #ifdef HAVE_LIBSQLITE3
   #include <sqlite3.h>
 #else
-  #include "../../vendors/sqlite3.h"
+  #include "vendors/sqlite3.h"
 #endif
 
 using std::map;

tsk/fs/apfs.cpp

@@ -7,7 +7,7 @@
  *
  * This software is distributed under the Common Public License 1.0
  */
-#include "../util/crypto.hpp"
+#include "tsk/util/crypto.hpp"
 #include "apfs_fs.hpp"
 #include "tsk_apfs.hpp"
 

tsk/fs/apfs_compat.cpp

@@ -7,13 +7,13 @@
  *
  * This software is distributed under the Common Public License 1.0
  */
-#include "../libtsk.h"
+#include "tsk/libtsk.h"
 
 #include "decmpfs.h"
 #include "tsk_fs_i.h"
 
-#include "../pool/apfs_pool_compat.hpp"
-#include "../img/pool.hpp"
+#include "tsk/pool/apfs_pool_compat.hpp"
+#include "tsk/img/pool.hpp"
 #include "apfs_compat.hpp"
 
 #include <cstring>

tsk/fs/apfs_fs.hpp

@@ -10,10 +10,10 @@
 #pragma once
 
 #if HAVE_CONFIG_H
-#include "../tsk_config.h"
+#include "tsk/tsk_config.h"
 #endif
 
-#include "../util/crypto.hpp"
+#include "tsk/util/crypto.hpp"
 #include "apfs_fs.h"
 #include "tsk_apfs.hpp"
 

tsk/fs/apfs_open.cpp

@@ -7,10 +7,10 @@
  *
  * This software is distributed under the Common Public License 1.0
  */
-#include "../libtsk.h"
+#include "tsk/libtsk.h"
 
 #include "apfs_compat.hpp"
-#include "../img/pool.hpp"
+#include "tsk/img/pool.hpp"
 #include "tsk_fs_i.h"
 
 TSK_FS_INFO* apfs_open_auto_detect(