Skip to content
Snippets Groups Projects
Commit 4a8d5ca1 authored by Jeff Wallace's avatar Jeff Wallace
Browse files

Added dist-debug target to create datamodel jar from debug libs.

parent 0948b6b8
No related branches found
No related tags found
No related merge requests found
...@@ -79,6 +79,8 @@ ...@@ -79,6 +79,8 @@
<target name="copyLibs" depends="copyLinuxLibs,copyMacLibs" /> <target name="copyLibs" depends="copyLinuxLibs,copyMacLibs" />
<target name="copyLibsDebug" depends="copyLibs" />
<target name="copyTSKLibs" depends="copyTskLibs_so,copyTskLibs_dylib"> <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 --> <!-- depends targets take care of the actual copying since the file differs on OS X and Linux -->
<!-- This assumes that TSK, libewf, and zlib have been installed on the system and those libraries will be with normal loading approaches --> <!-- This assumes that TSK, libewf, and zlib have been installed on the system and those libraries will be with normal loading approaches -->
......
...@@ -34,17 +34,25 @@ ...@@ -34,17 +34,25 @@
</java> </java>
</target> </target>
<target name="copyLibs" depends="copyWinLibs" description="Copy native libs to the correct folder" /> <target name="copyLibs" depends="copyWinLibs" description="Copy native libs to the correct folder">
<property name="tsk.config" value="Release"/>
<antcall target="copyWinLibs" />
</target>
<target name="copyLibsDebug" depends="copyWinLibs" description="Copy native libs to the correct folder">
<property name="tsk.config" value="Debug"/>
<antcall target="copyWinLibs" />
</target>
<target name="copyWinLibs" depends="copyWinLibs64,copyWinLibs32" description="Copy windows dlls to the correct location." /> <target name="copyWinLibs" depends="copyWinLibs64,copyWinLibs32" description="Copy windows dlls to the correct location." />
<target name="checkLibDirs"> <target name="checkLibDirs">
<available property="win64.exists" type="dir" file="${basedir}/../../win32/x64/Release" /> <available property="win64.exists" type="dir" file="${basedir}/../../win32/x64/${tsk.config}" />
<available property="win32.exists" type="dir" file="${basedir}/../../win32/Release" /> <available property="win32.exists" type="dir" file="${basedir}/../../win32/${tsk.config}" />
</target> </target>
<target name="copyWinLibs64" depends="checkLibDirs" if="win64.exists"> <target name="copyWinLibs64" depends="checkLibDirs" if="win64.exists">
<property name="win64dir" location="${basedir}/../../win32/x64/Release" /> <property name="win64dir" location="${basedir}/../../win32/x64/${tsk.config}" />
<fileset dir="${win64dir}" id="win64dlls"> <fileset dir="${win64dir}" id="win64dlls">
<include name="*.dll" /> <include name="*.dll" />
...@@ -69,7 +77,7 @@ ...@@ -69,7 +77,7 @@
</target> </target>
<target name="copyWinLibs32" depends="checkLibDirs" if="win32.exists"> <target name="copyWinLibs32" depends="checkLibDirs" if="win32.exists">
<property name="win32dir" location="${basedir}/../../win32/Release" /> <property name="win32dir" location="${basedir}/../../win32/${tsk.config}" />
<fileset dir="${win32dir}" id="win32dlls"> <fileset dir="${win32dir}" id="win32dlls">
<include name="*.dll" /> <include name="*.dll" />
</fileset> </fileset>
......
...@@ -121,6 +121,12 @@ pattern="lib/[artifact]-[revision](-[classifier]).[ext]" /> ...@@ -121,6 +121,12 @@ pattern="lib/[artifact]-[revision](-[classifier]).[ext]" />
<!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file --> <!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
<jar jarfile="${dist}/Tsk_DataModel.jar" basedir="${build}"/> <jar jarfile="${dist}/Tsk_DataModel.jar" basedir="${build}"/>
</target> </target>
<target name="dist-debug" depends="init-ivy, compile, copyLibsDebug"
description="generate the distribution" >
<!-- Put everything in ${build} into the MyProject-${DSTAMP}.jar file -->
<jar jarfile="${dist}/Tsk_DataModel.jar" basedir="${build}"/>
</target>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment