fixed MS CRT dlls so that we have 32-bit versus 64-bit. Changed to have dlls not in ZIPs in third-party folder

build-windows.xml

@@ -83,17 +83,22 @@
     <target name="copyExternalLibsToZip" depends="copyCRT32,copyCRT64"/>
     
     <target name="copyCRT32">
-        <property name="CRT.path" value="${thirdparty.dir}/crt/win32/crt.zip"/>
-        <available file="${CRT.path}"  property="crtFound"/>
 
-        <fail unless="crtFound" message="CRT not found in the thirdparty repo in path: ${CRT.path}"/>
+        <!-- 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/"/>
-        <unzip src="${CRT.path}" dest="${zip-lib-path}/x86" overwrite="true"/>
+        <fileset dir="${CRT32.path}" id="crt32dlls">
-        <fileset dir="${zip-lib-path}/x86" 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>
@@ -108,19 +113,23 @@
     </target>
     
     <target name="copyCRT64">
-        <property name="CRT.path" value="${thirdparty.dir}/crt/win64/crt.zip"/>
+        <!-- Verify we have the 64-bit -->
-        <available file="${CRT.path}"  property="crtFound"/>
+        <property name="CRT64.path" value="${thirdparty.dir}/crt/win64"/>
-        
+        <available file="${CRT64.path}"  property="crtFound"/>
-        <fail unless="crtFound" message="CRT not found in the thirdparty repo in path: ${CRT.path}"/>
+        <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/"/>
-        <unzip src="${CRT.path}" dest="${zip-lib-path}/x86_64" overwrite="true"/>
+        <fileset dir="${CRT64.path}" id="crt64dlls">
-        <fileset dir="${zip-lib-path}/x86_64" id="crt32dlls">
             <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="crt32dlls"/>
+            <fileset refid="crt64dlls"/>
         </copy>
     </target>
     

docs/doxygen/native_libs.dox

@@ -16,4 +16,6 @@ Autopsy has two types of native libraries:
 
 The libraries that <tt>libtsk_jni</tt> depends on are launched by Autopsy in the Installer.loadDynLibraries() method. This is because if we wait until <tt>libtsk_jni</tt> needs them, then they will be located based on Windows search paths and the NetBeans paths are not in that set.  So, we launch them before <tt>libtsk_jni</tt> needs them and from within Autopsy so that it  uses the Autopsy search pathes. 
 
+There is code in build-windows.xml and build-unix.xml to copy the external libraries into their respective locations when a ZIP package is made of the program.  These libraries must be accessible via normal launching methods when developing Autopsy (i.e. we only copy them into the Autopsy structure when building the ZIP). 
+
 */

thirdparty/crt/update.bat

@@ -0,0 +1,7 @@
+REM Updates the 32-bit and 64-bit VS Runtime dlls
+REM Needs to be run from a 64-bit command prompt
+REM Otherwise Windows will put 32-bit dlls in system32
+copy c:\windows\system32\msvcr100.dll win64
+copy c:\windows\system32\msvcp100.dll win64
+copy c:\windows\sysWoW64\msvcr100.dll win32
+copy c:\windows\sysWow64\msvcp100.dll win32