Andrew Overholt 2d6da44
diff -up ./build.xml.swtx86_64 ./build.xml
Andrew Overholt 2d6da44
--- ./build.xml.swtx86_64	2008-07-18 16:56:02.000000000 -0400
Andrew Overholt 2d6da44
+++ ./build.xml	2008-07-18 16:56:50.000000000 -0400
Andrew Overholt 2d6da44
@@ -72,26 +72,7 @@
Andrew Overholt 2d6da44
 	</target>
Andrew Overholt 2d6da44
 
Andrew Overholt 2d6da44
 	<target name="compilelibs" depends="init,clean,compile" if="libsconfig">
Andrew Overholt 2d6da44
-		<property name="swtlibs" value="${buildDirectory}/swttmp" />
Andrew Overholt 2d6da44
-		<mkdir dir="${swtlibs}" />
Andrew Overholt 2d6da44
-
Andrew Overholt 2d6da44
-		
Andrew Overholt 2d6da44
-		<ant antfile="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}/build.xml" target="src.zip" dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
Andrew Overholt 2d6da44
-		<unzip dest="${swtlibs}">
Andrew Overholt 2d6da44
-			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" >
Andrew Overholt 2d6da44
-				<include name="src.zip" />
Andrew Overholt 2d6da44
-			</fileset>
Andrew Overholt 2d6da44
-		</unzip>
Andrew Overholt 2d6da44
-		<exec dir="${swtlibs}/" executable="sh" failonerror="true">
Andrew Overholt 2d6da44
-			<arg line="build.sh" />
Andrew Overholt 2d6da44
-		</exec>
Andrew Overholt 2d6da44
-		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
Andrew Overholt 2d6da44
-		<mkdir dir="${swtdir}" />
Andrew Overholt 2d6da44
-		<move todir="${swtdir}/">
Andrew Overholt 2d6da44
-			<fileset dir="${swtlibs}">
Andrew Overholt 2d6da44
-				<include name="**/*.so" />
Andrew Overholt 2d6da44
-			</fileset>
Andrew Overholt 2d6da44
-		</move>
Andrew Overholt 2d6da44
+		<ant antfile="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}/build.xml" target="build.nativeLibraries" dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />
Andrew Overholt 2d6da44
 	
Andrew Overholt 2d6da44
 		<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />
Andrew Overholt 2d6da44
 		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">