mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modified build script to copy all dll's (except libtsk_jni.dll) from the sleuthkit. This allows us to get rid of the extra rules for PostgreSQL dlls and we will automatically get the versions of the MSVC library that the sleuthkit was built with.

Browse Source
This commit is contained in:
esaunders 2016-10-19 14:32:05 -04:00
parent 3b3fa8d96d
commit 41c68e7f9f
2 changed files with 4 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
build-windows.xml
View File

@ -43,68 +43,40 @@
<!-- copy 64-bit dlls into the installer folder --> <!-- copy 64-bit dlls into the installer folder -->
<target name="copyWinTskLibs64ToBaseDir" if="win64.TskLib.exists"> <target name="copyWinTskLibs64ToBaseDir" if="win64.TskLib.exists">
<fileset dir="${win64.TskLib.path}" id="win64dlls"> <fileset dir="${win64.TskLib.path}" id="win64dlls">
<include name="libewf.dll" /> <include name="*.dll" />
<include name="libvmdk.dll"/> <exclude name="libtsk_jni.dll"/>
<include name="libvhdi.dll"/>
<include name="zlib.dll"/>
</fileset>
<fileset dir="${win64.TskLib.postgres_path}" id="postgres64dlls">
<include name="libeay32.dll"/>
<include name="ssleay32.dll"/>
<include name="libintl-8.dll"/>
<include name="libiconv-2.dll"/>
<include name="libpq.dll"/>
<include name="msvcr120.dll"/>
</fileset> </fileset>
<copy todir="${amd64}" overwrite="true"> <copy todir="${amd64}" overwrite="true">
<fileset refid="win64dlls" /> <fileset refid="win64dlls" />
<fileset refid="postgres64dlls" />
</copy> </copy>
<copy todir="${x86_64}" overwrite="true"> <copy todir="${x86_64}" overwrite="true">
<fileset refid="win64dlls" /> <fileset refid="win64dlls" />
<fileset refid="postgres64dlls" />
</copy> </copy>
</target> </target>
<!-- copy 32-bit dlls into the installer folder --> <!-- copy 32-bit dlls into the installer folder -->
<target name="copyWinTskLibs32ToBaseDir" if="win32.TskLib.exists"> <target name="copyWinTskLibs32ToBaseDir" if="win32.TskLib.exists">
<fileset dir="${win32.TskLib.path}" id="win32dlls"> <fileset dir="${win32.TskLib.path}" id="win32dlls">
<include name="zlib.dll" /> <include name="*.dll" />
<include name="libvmdk.dll"/> <exclude name="libtsk_jni.dll"/>
<include name="libvhdi.dll"/>
<include name="libewf.dll"/>
</fileset>
<fileset dir="${win32.TskLib.postgres_path}" id="postgres32dlls">
<include name="libeay32.dll"/>
<include name="ssleay32.dll"/>
<include name="libintl-8.dll"/>
<include name="libiconv-2.dll"/>
<include name="libpq.dll"/>
<include name="msvcr120.dll"/>
</fileset> </fileset>
<copy todir="${i386}" overwrite="true"> <copy todir="${i386}" overwrite="true">
<fileset refid="win32dlls" /> <fileset refid="win32dlls" />
<fileset refid="postgres32dlls" />
</copy> </copy>
<copy todir="${x86}" overwrite="true"> <copy todir="${x86}" overwrite="true">
<fileset refid="win32dlls" /> <fileset refid="win32dlls" />
<fileset refid="postgres32dlls" />
</copy> </copy>
<copy todir="${i586}" overwrite="true"> <copy todir="${i586}" overwrite="true">
<fileset refid="win32dlls" /> <fileset refid="win32dlls" />
<fileset refid="postgres32dlls" />
</copy> </copy>
<copy todir="${i686}" overwrite="true"> <copy todir="${i686}" overwrite="true">
<fileset refid="win32dlls" /> <fileset refid="win32dlls" />
<fileset refid="postgres32dlls" />
</copy> </copy>
</target> </target>
@ -115,57 +87,4 @@
<antcall target="copyWinTskLibs64ToBaseDir" inheritRefs="true" /> <antcall target="copyWinTskLibs64ToBaseDir" inheritRefs="true" />
</target> </target>
<!-- CRT LIBS TO ZIP - gets called from build.xml -->
<target name="copyLibsToZip" depends="copyCRT32ToZIP,copyCRT64ToZIP"/>
<target name="copyCRT32ToZIP">
<!-- verify we have the 32-bit dlls -->
<property name="CRT32.path" value="${thirdparty.dir}/crt/win32"/>
<available file="${CRT32.path}" property="crtFound"/>
<fail unless="crtFound" message="32-bit CRT not found in the thirdparty repo in path: ${CRT32.path}"/>
<!-- copy them from third party -->
<property name="zip-lib-path" value="${zip-tmp}/${app.name}/${app.name}/modules/lib/"/>
<fileset dir="${CRT32.path}" id="crt32dlls">
<include name="*.dll"/>
</fileset>
<copy todir="${zip-lib-path}/x86" overwrite="true">
<fileset refid="crt32dlls"/>
</copy>
<copy todir="${zip-lib-path}/i386" overwrite="true">
<fileset refid="crt32dlls"/>
</copy>
<copy todir="${zip-lib-path}/i586" overwrite="true">
<fileset refid="crt32dlls"/>
</copy>
<copy todir="${zip-lib-path}/i686" overwrite="true">
<fileset refid="crt32dlls"/>
</copy>
</target>
<target name="copyCRT64ToZIP">
<!-- Verify we have the 64-bit -->
<property name="CRT64.path" value="${thirdparty.dir}/crt/win64"/>
<available file="${CRT64.path}" property="crtFound"/>
<fail unless="crtFound" message="64-bit CRT not found in the thirdparty repo in path: ${CRT64.path}"/>
<!-- Copy the libs -->
<property name="zip-lib-path" value="${zip-tmp}/${app.name}/${app.name}/modules/lib/"/>
<fileset dir="${CRT64.path}" id="crt64dlls">
<include name="*.dll"/>
</fileset>
<copy todir="${zip-lib-path}/x86_64" overwrite="true">
<fileset refid="crt64dlls"/>
</copy>
<copy todir="${zip-lib-path}/amd64" overwrite="true">
<fileset refid="crt64dlls"/>
</copy>
</target>
</project> </project>

2
build.xml
View File

@ -92,8 +92,6 @@
</then> </then>
</if> </if>
<antcall target="copyLibsToZip"/>
<property name="app.property.file" value="${zip-tmp}/${app.name}/etc/${app.name}.conf" /> <property name="app.property.file" value="${zip-tmp}/${app.name}/etc/${app.name}.conf" />
<!-- for Japanese localized version add option: -Duser.language=ja --> <!-- for Japanese localized version add option: -Duser.language=ja -->
<property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-XX:MaxPermSize=128M -J-Xverify:none -J-Xdock:name=${app.title}&quot;" /> <property name="jvm.options" value="&quot;--branding ${app.name} -J-Xms24m -J-XX:MaxPermSize=128M -J-Xverify:none -J-Xdock:name=${app.title}&quot;" />