Merge remote-tracking branch 'upstream/custom-release-2.11.0' into develop

bindings/java/Makefile.am

 # Compile the sub directories
 SUBDIRS = jni
 
-tsk_jar = $(top_builddir)/bindings/java/dist/Tsk_DataModel.jar
+tsk_jar = $(top_builddir)/bindings/java/dist/sleuthkit-$(PACKAGE_VERSION).jar
 jardir = $(prefix)/share/java
 jar_DATA = $(tsk_jar)
 

bindings/java/build.xml

@@ -12,6 +12,7 @@
 
 	<!-- set global properties for this build -->
 	<property name="src" location="src/org/sleuthkit/datamodel"/>
+	<property name="VERSION" value="4.6.0"/>
 	<property name="sample" location="src/org/sleuthkit/datamodel/Examples"/>
 	<property name="build" location="build/"/>
 	<property name="build-datamodel" location="build/org/sleuthkit/datamodel"/>
@@ -129,17 +130,17 @@
 	<target name="dist-SQLite" depends="check-build, init-ivy, compile, copyLibs-SQLite"
 			unless="up-to-date" description="generate the distribution" >
 		<!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-		<jar jarfile="${dist}/Tsk_DataModel.jar" basedir="${build}"/>
+		<jar jarfile="${dist}/sleuthkit-${VERSION}.jar" basedir="${build}"/>
 	</target>
 
 	<target name="dist-PostgreSQL" depends="check-build, init-ivy, compile, copyLibs-PostgreSQL" 
 			unless="up-to-date" description="generate the PostgreSQL distribution" >
 		<!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-		<jar jarfile="${dist}/Tsk_DataModel_PostgreSQL.jar" basedir="${build}"/>
+		<jar jarfile="${dist}/sleuthkit-postgresql-${VERSION}.jar" basedir="${build}"/>
 	</target>
 
 	<target name="check-build" depends="check-native-build">
-		<uptodate property="java-up-to-date" targetfile="${dist}/Tsk_DataModel.jar" >
+		<uptodate property="java-up-to-date" targetfile="${dist}/sleuthkit-${VERSION}.jar" >
 			<srcfiles dir="${src}" includes="**/*.java"/>
 		</uptodate>
 		<condition property="up-to-date">
@@ -161,13 +162,13 @@
 	<target name="Debug-SQLite" depends="check-build, init-ivy, compile, copyLibs-SQLiteDebug" 
 			unless="up-to-date" description="generate the debug distribution" >
 		<!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-		<jar jarfile="${dist}/Tsk_DataModel.jar" basedir="${build}"/>
+		<jar jarfile="${dist}/sleuthkit-${VERSION}.jar" basedir="${build}"/>
 	</target>
   
 	<target name="Debug-PostgreSQL" depends="init-ivy, compile, copyLibs-PostgreSQLDebug" 
 			description="generate the PostgreSQL debug distribution" >
 		<!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
-		<jar jarfile="${dist}/Tsk_DataModel_PostgreSQL.jar" basedir="${build}"/>
+		<jar jarfile="${dist}/sleuthkit-postgresql-${VERSION}.jar" basedir="${build}"/>
 	</target>
 
 	<target name="jni" depends="compile" description="make the jni.h file">

configure.ac

@@ -4,9 +4,9 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
 
-AC_INIT(sleuthkit, 4.5.0)
+AC_INIT(sleuthkit, 4.6.0)
 m4_include([m4/ax_pthread.m4])
-dnl include the version from 1.12.1. This will work for 
+dnl include the version from 1.12.1. This will work for
 m4_include([m4/cppunit.m4])
 m4_include([m4/ax_jni_include_dir.m4])
 m4_include([m4/ac_prog_javac_works.m4])
@@ -107,20 +107,20 @@ esac
 dnl Add enable/disable option
 AC_ARG_ENABLE([java],
     [AS_HELP_STRING([--disable-java], [Do not build the java bindings or jar file])])
- 
+
 dnl Checks for libraries.
 
 
 dnl Some platforms will complain about missing included functions if libstdc++ is not included.
-AC_CHECK_LIB(stdc++, main, , AC_MSG_ERROR([missing libstdc++])) 
-AC_CHECK_HEADERS(list, , , AC_MSG_ERROR([missing STL list class header])) 
-AC_CHECK_HEADERS(map, , , AC_MSG_ERROR([missing STL map class header])) 
-AC_CHECK_HEADERS(queue, , , AC_MSG_ERROR([missing STL queue class header])) 
-AC_CHECK_HEADERS(set, , , AC_MSG_ERROR([missing STL set class header])) 
-AC_CHECK_HEADERS(stack, , , AC_MSG_ERROR([missing STL stack class header])) 
-AC_CHECK_HEADERS(streambuf, , , AC_MSG_ERROR([missing STL streambuf class header])) 
-AC_CHECK_HEADERS(string, , , AC_MSG_ERROR([missing STL string class header])) 
-AC_CHECK_HEADERS(vector, , , AC_MSG_ERROR([missing STL vector class header])) 
+AC_CHECK_LIB(stdc++, main, , AC_MSG_ERROR([missing libstdc++]))
+AC_CHECK_HEADERS(list, , , AC_MSG_ERROR([missing STL list class header]))
+AC_CHECK_HEADERS(map, , , AC_MSG_ERROR([missing STL map class header]))
+AC_CHECK_HEADERS(queue, , , AC_MSG_ERROR([missing STL queue class header]))
+AC_CHECK_HEADERS(set, , , AC_MSG_ERROR([missing STL set class header]))
+AC_CHECK_HEADERS(stack, , , AC_MSG_ERROR([missing STL stack class header]))
+AC_CHECK_HEADERS(streambuf, , , AC_MSG_ERROR([missing STL streambuf class header]))
+AC_CHECK_HEADERS(string, , , AC_MSG_ERROR([missing STL string class header]))
+AC_CHECK_HEADERS(vector, , , AC_MSG_ERROR([missing STL vector class header]))
 
 dnl Check for sqlite and its dependencies
 AC_CHECK_HEADERS([sqlite3.h],
@@ -223,7 +223,7 @@ AS_IF([test "x$with_libewf" != "xno"],
     dnl Test the dir if they specified something beyond yes/no
     [AS_IF([test "x$with_libewf" != "xyes"],
         [AS_IF([test -d ${with_libewf}/include],
-            [CPPFLAGS="$CPPFLAGS -I${with_libewf}/include"  
+            [CPPFLAGS="$CPPFLAGS -I${with_libewf}/include"
                 LDFLAGS="$LDFLAGS -L${with_libewf}/lib"],
             dnl Dir given was not correct
             [AC_MSG_FAILURE([libewf directory not found at ${with_libewf}])])
@@ -337,7 +337,7 @@ AC_CONFIG_FILES([
     tests/Makefile
     samples/Makefile
     man/Makefile
-    bindings/java/Makefile 
+    bindings/java/Makefile
     bindings/java/jni/Makefile
     unit_tests/Makefile
     unit_tests/base/Makefile])
@@ -355,4 +355,3 @@ Features:
    Java/JNI support:                      $ax_java_support
    Multithreading:                        $ax_multithread
 ]);
-