Skip to content
Snippets Groups Projects
Commit d720cee5 authored by Peter J. Martel's avatar Peter J. Martel
Browse files

Pull CRT assembly into zip distribution

Add target that (on Windows) copies Microsoft C++ Runtime libraries and manifest from a folder specified in an enviroment variable.
parent 8d72f95d
No related branches found
No related tags found
No related merge requests found
...@@ -5,4 +5,6 @@ ...@@ -5,4 +5,6 @@
<!-- <copy file="${env.TSK_HOME}/win32/libewf/msvscpp/Release/libewf.dll" tofile="${basedir}/DataModel/release/modules/lib/libewf.dll"/> <!-- <copy file="${env.TSK_HOME}/win32/libewf/msvscpp/Release/libewf.dll" tofile="${basedir}/DataModel/release/modules/lib/libewf.dll"/>
<copy file="${env.TSK_HOME}/win32/libewf/msvscpp/zlib/zlib1.dll" tofile="${basedir}/DataModel/release/modules/lib/zlib1.dll"/> --> <copy file="${env.TSK_HOME}/win32/libewf/msvscpp/zlib/zlib1.dll" tofile="${basedir}/DataModel/release/modules/lib/zlib1.dll"/> -->
</target> </target>
<target name="copyExternalLibs">
</target>
</project> </project>
...@@ -11,4 +11,19 @@ ...@@ -11,4 +11,19 @@
<copy file="${env.LIBEWF_HOME}/msvscpp/Release/libewf.dll" tofile="${basedir}/DataModel/release/modules/lib/libewf.dll"/> <copy file="${env.LIBEWF_HOME}/msvscpp/Release/libewf.dll" tofile="${basedir}/DataModel/release/modules/lib/libewf.dll"/>
<copy file="${env.LIBEWF_HOME}/msvscpp/zlib/zlib1.dll" tofile="${basedir}/DataModel/release/modules/lib/zlib1.dll"/> <copy file="${env.LIBEWF_HOME}/msvscpp/zlib/zlib1.dll" tofile="${basedir}/DataModel/release/modules/lib/zlib1.dll"/>
</target> </target>
<target name="copyExternalLibs">
<!-- Get C++ Runtime dlls -->
<property environment="env"/>
<condition property="crtFound">
<isset property="env.CRT_HOME"/>
</condition>
<fail unless="crtFound" message="CRT_HOME must be set as an environment variable."/>
<copy file="${env.CRT_HOME}/Microsoft.VC90.CRT.manifest" tofile="${zip-tmp}/${app.name}/${app.name}/modules/lib/Microsoft.VC90.CRT.manifest"/>
<copy file="${env.CRT_HOME}/msvcm90.dll" tofile="${zip-tmp}/${app.name}/${app.name}/modules/lib/msvcm90.dll"/>
<copy file="${env.CRT_HOME}/msvcp90.dll" tofile="${zip-tmp}/${app.name}/${app.name}/modules/lib/msvcp90.dll"/>
<copy file="${env.CRT_HOME}/msvcr90.dll" tofile="${zip-tmp}/${app.name}/${app.name}/modules/lib/msvcr90.dll"/>
</target>
</project> </project>
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
</condition> </condition>
<fail unless="tskFound" message="TSK_HOME must be set as an environment variable."/> <fail unless="tskFound" message="TSK_HOME must be set as an environment variable."/>
<echo> TSK_HOME: ${env.TSK_HOME}</echo> <echo> TSK_HOME: ${env.TSK_HOME}</echo>
</target> </target>
<target name="getExternals" depends="findTSK,copyTSKLibs"> <target name="getExternals" depends="findTSK,copyTSKLibs">
...@@ -57,6 +56,7 @@ ...@@ -57,6 +56,7 @@
<!-- step (3) do your copying stuff here, check the ant doc for copy, move, etc file --> <!-- step (3) do your copying stuff here, check the ant doc for copy, move, etc file -->
<copy file="${basedir}/README.txt" tofile="${zip-tmp}/${app.name}/README.txt"/> <copy file="${basedir}/README.txt" tofile="${zip-tmp}/${app.name}/README.txt"/>
<copy file="${basedir}/LICENSE-2.0.txt" tofile="${zip-tmp}/${app.name}/LICENSE-2.0.txt"/> <copy file="${basedir}/LICENSE-2.0.txt" tofile="${zip-tmp}/${app.name}/LICENSE-2.0.txt"/>
<antcall target="copyExternalLibs"></antcall>
<!-- step (4) zip again, but with the version numbers in the dir --> <!-- step (4) zip again, but with the version numbers in the dir -->
<zip destfile="${nbdist.dir}/${app.name}-${app.version}.zip"> <zip destfile="${nbdist.dir}/${app.name}-${app.version}.zip">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment