Renamed unix folders to be more specific. Added i686 support.

bindings/java/build-unix.xml

@@ -44,9 +44,14 @@
 		<property name="jni.jnilib" value="libtsk_jni.jnilib" />
 		<property name="mac.zlib" location="/usr/lib/libz.dylib"/>
 		<property name="mac.libewf" location="${env.LIBEWF_HOME}/libewf/.libs/libewf.dylib"/>
+		<!-- x86_64 -->
         <copy file="${jni.dylib}" tofile="${x86_64}/mac/${jni.jnilib}"/>
 		<copy file="${mac.libewf}" tofile="${x86_64}/mac/libewf.dylib"/>
 		<copy file="${mac.zlib}" tofile="${x86_64}/mac/zlib.dylib"/>
+		<!-- amd64 -->
+		<copy file="${jni.dylib}" tofile="${amd64}/mac/${jni.jnilib}"/>
+		<copy file="${mac.libewf}" tofile="${amd64}/mac/libewf.dylib"/>
+		<copy file="${mac.zlib}" tofile="${amd64}/mac/zlib.dylib"/>
     </target>
 
     <!-- Non-OS X -->
@@ -55,37 +60,41 @@
         <copy file="./jni/.libs/libtsk_jni.so" tofile="./libtsk_jni.so"/>
     </target>
 	
-	<target name="copyUnixLibs" depends="testTSKLibs" if="tsk_so.present">
+	<target name="copyLinuxLibs" depends="testTSKLibs" if="tsk_so.present">
 		<property environment="env"/>
 		<property name="jni.so" location="${basedir}/jni/.libs/libtsk_jni.so" />
 		<!-- check that this location is correct -->
-		<property name="unix.zlib" location="/usr/lib/libz.so"/>
+		<property name="linux.zlib" location="/usr/lib/libz.so"/>
 		<property name="zlib.so" value="zlib.so"/>
-		<property name="unix.libewf" location="${env.LIBEWF_HOME}/libewf/.libs/libewf.so"/>
+		<property name="linux.libewf" location="${env.LIBEWF_HOME}/libewf/.libs/libewf.so"/>
 		<property name="libewf.so" value="libewf.so"/>
 		<!-- x86_64 -->
-		<copy file="${jni.so}" tofile="${x86_64}/unix/libtsk_jni.so"/>
-		<copy file="${unix.zlib}" tofile="${x86_64}/unix/${zlib.so}"/>
-		<copy file="${unix.libewf}" tofile="${x86_64}/unix/${libewf.so}"/>
+		<copy file="${jni.so}" tofile="${x86_64}/linux/libtsk_jni.so"/>
+		<copy file="${linux.zlib}" tofile="${x86_64}/linux/${zlib.so}"/>
+		<copy file="${linux.libewf}" tofile="${x86_64}/linux/${libewf.so}"/>
 		<!-- amd64 -->
-		<copy file="${jni.so}" tofile="${amd64}/unix/libtsk_jni.so"/>
-		<copy file="${unix.zlib}" tofile="${amd64}/unix/${zlib.so}"/>
-		<copy file="${unix.libewf}" tofile="${amd64}/unix/${libewf.so}"/>
+		<copy file="${jni.so}" tofile="${amd64}/linux/libtsk_jni.so"/>
+		<copy file="${linux.zlib}" tofile="${amd64}/linux/${zlib.so}"/>
+		<copy file="${linux.libewf}" tofile="${amd64}/linux/${libewf.so}"/>
 		<!-- x86 -->
-		<copy file="${jni.so}" tofile="${x86}/unix/libtsk_jni.so"/>
-		<copy file="${unix.zlib}" tofile="${x86}/unix/${zlib.so}"/>
-		<copy file="${unix.libewf}" tofile="${x86}/unix/${libewf.so}"/>
+		<copy file="${jni.so}" tofile="${x86}/linux/libtsk_jni.so"/>
+		<copy file="${linux.zlib}" tofile="${x86}/linux/${zlib.so}"/>
+		<copy file="${linux.libewf}" tofile="${x86}/linux/${libewf.so}"/>
 		<!-- i386 -->
-		<copy file="${jni.so}" tofile="${i386}/unix/libtsk_jni.so"/>
-		<copy file="${unix.zlib}" tofile="${i386}/unix/${zlib.so}"/>
-		<copy file="${unix.libewf}" tofile="${i386}/unix/${libewf.so}"/>
+		<copy file="${jni.so}" tofile="${i386}/linux/libtsk_jni.so"/>
+		<copy file="${linux.zlib}" tofile="${i386}/linux/${zlib.so}"/>
+		<copy file="${linux.libewf}" tofile="${i386}/linux/${libewf.so}"/>
 		<!-- i586 -->
-		<copy file="${jni.so}" tofile="${i586}/unix/libtsk_jni.so"/>
-		<copy file="${unix.zlib}" tofile="${i586}/unix/${zlib.so}"/>
-		<copy file="${unix.libewf}" tofile="${i586}/unix/${libewf.so}"/>
+		<copy file="${jni.so}" tofile="${i586}/linux/libtsk_jni.so"/>
+		<copy file="${linux.zlib}" tofile="${i586}/linux/${zlib.so}"/>
+		<copy file="${linux.libewf}" tofile="${i586}/linux/${libewf.so}"/>
+		<!-- i686 -->
+		<copy file="${jni.so}" tofile="${i686}/linux/libtsk_jni.so"/>
+		<copy file="${linux.zlib}" tofile="${i686}/linux/${zlib.so}"/>
+		<copy file="${linux.libewf}" tofile="${i686}/linux/${libewf.so}"/>
 	</target>
 
-	<target name="copyLibs" depends="copyUnixLibs,copyMacLibs" />
+	<target name="copyLibs" 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 -->

bindings/java/build-windows.xml

@@ -98,5 +98,11 @@
 			<fileset refid="crt32dlls" />
 		</copy>		
 		
+		<copy todir="${i686}/win" overwrite="true">
+			<fileset refid="win32dlls" />
+		</copy>
+		<copy todir="${i686}/win" overwrite="true">
+			<fileset refid="crt32dlls" />
+		</copy>	
 	</target>
 </project>

bindings/java/build.xml

@@ -26,6 +26,7 @@
 	<property name="x86_64" location="build/NATIVELIBS/x86_64" />
 	<property name="i386" location="build/NATIVELIBS/i386" />
 	<property name="i586" location="build/NATIVELIBS/i586" />
+	<property name="i686" location="build/NATIVELIBS/i686"/>
 	<property name="crt" location="${basedir}/crt" />
   
 	<path id="libraries">
@@ -47,20 +48,23 @@
 		<mkdir dir="${amd64}" />
 		<mkdir dir="${amd64}/win" />
 		<mkdir dir="${amd64}/mac" />
-		<mkdir dir="${amd64}/unix" />
+		<mkdir dir="${amd64}/linux" />
 	    <mkdir dir="${x86}" />
 		<mkdir dir="${x86}/win" />
-		<mkdir dir="${x86}/unix" />
+		<mkdir dir="${x86}/linux" />
 		<mkdir dir="${x86_64}" />
 		<mkdir dir="${x86_64}/win" />
 		<mkdir dir="${x86_64}/mac" />
-		<mkdir dir="${x86_64}/unix"/>
+		<mkdir dir="${x86_64}/linux"/>
 		<mkdir dir="${i386}" />
 		<mkdir dir="${i386}/win" />
-		<mkdir dir="${i386}/unix"/>
+		<mkdir dir="${i386}/linux"/>
 		<mkdir dir="${i586}" />
 		<mkdir dir="${i586}/win" />
-		<mkdir dir="${i586}/unix" />
+		<mkdir dir="${i586}/linux" />
+		<mkdir dir="${i686}"/>
+		<mkdir dir="${i686}/win"/>
+		<mkdir dir="${i686}/linux"/>
 	</target>
   
 	<property name="ivy.install.version" value="2.3.0-rc2" />