From 3e5872e02f4c11b762d886b7ad2f03b6414bdafc Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Wed, 21 Oct 2015 09:46:40 -0400
Subject: [PATCH] Made datamodel ant targets consistent
---
bindings/java/build-unix.xml | 7 ++++---
bindings/java/build-windows.xml | 6 +++---
bindings/java/build.xml | 10 +++++-----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/bindings/java/build-unix.xml b/bindings/java/build-unix.xml
index 4f802989e..836fba3f5 100644
--- a/bindings/java/build-unix.xml
+++ b/bindings/java/build-unix.xml
@@ -87,9 +87,10 @@
<copy file="${jni.so}" tofile="${i686}/linux/libtsk_jni.so" overwrite="true"/>
</target>
- <target name="copyLibs" depends="copyLinuxLibs,copyMacLibs" />
-
- <target name="copyLibsDebug" depends="copyLibs" />
+ <target name="copyLibs-SQLite" depends="copyLinuxLibs,copyMacLibs" />
+ <target name="copyLibs-PostgreSQL" depends="copyLinuxLibs,copyMacLibs" />
+ <target name="copyLibs-SQLiteDebug" depends="copyLinuxLibs,copyMacLibs" />
+ <target name="copyLibs-PostgreSQLDebug" depends="copyLinuxLibs,copyMacLibs" />
<target name="copyTSKLibs" depends="copyTskLibs_so,copyTskLibs_dylib">
<!-- depends targets take care of the actual copying since the file differs on OS X and Linux -->
diff --git a/bindings/java/build-windows.xml b/bindings/java/build-windows.xml
index 9f8ff1a8f..dcc395f5d 100644
--- a/bindings/java/build-windows.xml
+++ b/bindings/java/build-windows.xml
@@ -40,12 +40,12 @@
targetfile="${amd64}/win/libtsk_jni.dll"/>
</target>
- <target name="copyLibsSQLite" description="Copy native libs to the correct folder">
+ <target name="copyLibs-SQLite" description="Copy native libs to the correct folder">
<property name="tsk.config" value="Release"/>
<antcall target="copyWinTskLibsToBuildSQLite" />
</target>
- <target name="copyLibsSQLiteDebug" description="Copy native libs to the correct folder">
+ <target name="copyLibs-SQLiteDebug" description="Copy native libs to the correct folder">
<property name="tsk.config" value="Debug"/>
<antcall target="copyWinTskLibsToBuildSQLite" />
</target>
@@ -55,7 +55,7 @@
<antcall target="copyWinTskLibsToBuild-PostgreSQL" />
</target>
- <target name="copyLibsDebug-PostgreSQL" description="Copy native libs to the correct folder, PostgreSQL build">
+ <target name="copyLibs-PostgreSQLDebug" description="Copy native libs to the correct folder, PostgreSQL build">
<property name="tsk.config" value="Debug_PostgreSQL"/>
<antcall target="copyWinTskLibsToBuild-PostgreSQL" />
</target>
diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index a9baa4189..37b7e6e58 100755
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -126,13 +126,13 @@
</javac>
</target>
- <target name="SQLite" depends="check-build, init-ivy, compile, copyLibsSQLite"
+ <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}"/>
</target>
- <target name="PostgreSQL" depends="check-build, init-ivy, compile, copyLibs-PostgreSQL"
+ <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.jar" basedir="${build}"/>
@@ -151,20 +151,20 @@
</target>
<target name="dist" depends="check-build" unless="up-to-date">
- <antcall target="SQLite"/>
+ <antcall target="dist-SQLite"/>
</target>
<target name="Debug" depends="check-build" unless="up-to-date">
<antcall target="Debug-SQLite"/>
</target>
- <target name="Debug-SQLite" depends="check-build, init-ivy, compile, copyLibsSQLiteDebug"
+ <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}"/>
</target>
- <target name="Debug-PostgreSQL" depends="init-ivy, compile, copyLibsDebug-PostgreSQL"
+ <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.jar" basedir="${build}"/>
--
GitLab