From f87fbab30cdd6b15db33087a5c4cd15c2f1eedb8 Mon Sep 17 00:00:00 2001
From: Greg DiCristofaro <gregd@basistech.com>
Date: Mon, 25 Jul 2022 15:52:45 -0400
Subject: [PATCH] changes for building on minimal system
---
bindings/java/build.xml | 6 +++---
case-uco/java/nbproject/build-impl.xml | 6 +++---
tsk/fs/tsk_apfs.hpp | 1 +
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index c5d35abb6..74fd74af5 100644
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -119,7 +119,7 @@
</target>
<target name="compile-test" depends="compile" description="compile the tests">
- <javac debug="on" srcdir="${test}" destdir="${build}" includeantruntime="false">
+ <javac encoding="iso-8859-1" debug="on" srcdir="${test}" destdir="${build}" includeantruntime="false">
<classpath refid="libraries"/>
<compilerarg value="-Xlint" />
</javac>
@@ -127,7 +127,7 @@
<target name="compile" depends="init, set-library-path, retrieve-deps" description="compile the source">
<!-- Compile the java code from ${src} into ${build} -->
- <javac debug="on" srcdir="${src}" destdir="${build}" classpathref="libraries" includeantruntime="false">
+ <javac encoding="iso-8859-1" debug="on" srcdir="${src}" destdir="${build}" classpathref="libraries" includeantruntime="false">
<compilerarg value="-Xlint"/>
</javac>
@@ -137,7 +137,7 @@
</copy>
<!-- Verify sample compiles -->
- <javac debug="on" srcdir="${sample}" destdir="${build}" includeantruntime="false">
+ <javac encoding="iso-8859-1" debug="on" srcdir="${sample}" destdir="${build}" includeantruntime="false">
<classpath refid="libraries"/>
</javac>
diff --git a/case-uco/java/nbproject/build-impl.xml b/case-uco/java/nbproject/build-impl.xml
index 3dcc911e6..f94c082f6 100755
--- a/case-uco/java/nbproject/build-impl.xml
+++ b/case-uco/java/nbproject/build-impl.xml
@@ -343,7 +343,7 @@ is divided into following sections:
</path>
</resourcecount>
</condition>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac encoding="iso-8859-1" debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
@@ -394,7 +394,7 @@ is divided into following sections:
<property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/>
<mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac encoding="iso-8859-1" debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
@@ -436,7 +436,7 @@ is divided into following sections:
<sequential>
<property location="${build.dir}/empty" name="empty.dir"/>
<mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
+ <javac encoding="iso-8859-1" debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" fork="${javac.fork}" includeantruntime="false" includes="@{includes}" source="${javac.source}" sourcepath="@{sourcepath}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
<src>
<dirset dir="@{gensrcdir}" erroronmissingdir="false">
<include name="*"/>
diff --git a/tsk/fs/tsk_apfs.hpp b/tsk/fs/tsk_apfs.hpp
index fbfb3da2b..5012a3168 100755
--- a/tsk/fs/tsk_apfs.hpp
+++ b/tsk/fs/tsk_apfs.hpp
@@ -1194,6 +1194,7 @@ template <typename Node>
APFSBtreeNodeIterator<Node>::APFSBtreeNodeIterator(
const Node *node, uint32_t index, typename Node::iterator &&child, int recursion_depth)
: _node{own_node(node)}, _index{index} {
+ (void)recursion_depth; // so that project builds without unused parameter warning and error
_child_it = std::make_unique<typename Node::iterator>(
std::forward<typename Node::iterator>(child));
}
--
GitLab