### Eclipse Workspace Patch 1.0

#P org.eclipse.releng.eclipsebuilder

Index: eclipse/buildConfigs/sdk/srcBuild/build.xml

===================================================================

RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build.xml,v

retrieving revision 1.21

diff -u -r1.21 build.xml

--- eclipse/buildConfigs/sdk/srcBuild/build.xml	27 May 2008 19:41:03 -0000	1.21

+++ eclipse/buildConfigs/sdk/srcBuild/build.xml	21 Jun 2008 23:43:37 -0000

@@ -1,7 +1,7 @@

 <project name="Eclipse SDK Source Build" default="run" basedir=".">

-	<target name="run" depends="fetch,insertBuildId,compile,install" />

+	<target name="run" depends="fetch,insertBuildId,compile,compilelibs,install" />

 	<target name="allElements">

@@ -71,6 +71,53 @@

 		<record name="compilelog.txt" action="stop" />

 	</target>

+	<target name="compilelibs" depends="init,clean,compile" if="libsconfig">

+		<property name="swtlibs" value="${buildDirectory}/swttmp" />

+		<mkdir dir="${swtlibs}" />

+

+		

+		<ant antfile="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}/build.xml" target="src.zip" dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />

+		<unzip dest="${swtlibs}">

+			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" >

+				<include name="src.zip" />

+			</fileset>

+		</unzip>

+		<exec dir="${swtlibs}/" executable="sh" failonerror="true">

+			<arg line="build.sh" />

+		</exec>

+		<property name="swtdir" value="${buildDirectory}/plugins/org.eclipse.swt.${installWs}.${installOs}.${installArch}" />

+		<mkdir dir="${swtdir}" />

+		<move todir="${swtdir}/">

+			<fileset dir="${swtlibs}">

+				<include name="**/*.so" />

+			</fileset>

+		</move>

+	

+		<property name="launcherlibs" value="${buildDirectory}/features/org.eclipse.equinox.executable" />

+		<exec dir="${launcherlibs}/library/${installWs}/" executable="sh" failonerror="true">

+			<arg line="build.sh" />

+		</exec>

+		<copy file="${launcherlibs}/library/${installWs}/eclipse" todir="${buildDirectory}/eclipse/" />

+

+		<property name="launcherfragment" value="org.eclipse.equinox.launcher.${installWs}.${installOs}.${installArch}" />

+

+		<copy file="${launcherlibs}/library/${installWs}/eclipse" todir="features/org.eclipse.equinox.executable/contributed/${installWs}/${installOs}/${installArch}/" />

+		<copy todir="${buildDirectory}/plugins/${launcherfragment}">

+			<fileset dir="${launcherlibs}/library/${installWs}">

+				<include name="**/*.so" />

+			</fileset>

+		</copy>

+

+		

+		<exec dir="plugins/org.eclipse.core.filesystem/natives/unix/${installOs}" executable="make" failonerror="true" />

+		<move file="plugins/org.eclipse.core.filesystem/natives/unix/${installOs}/liblocalfile_1_0_0.so" todir="plugins/org.eclipse.core.filesystem.${installOs}.${installArch}/os/${installOs}/${installArch}">

+		</move>

+		

+		<ant dir="plugins/org.eclipse.update.core.${installOs}/src" antfile="build.xml" />

+

+	</target>

+

+

 	<target name="install" depends="init">

 		<echo message="Assembling..." />

@@ -174,7 +221,7 @@

 	<target name="install.eclipse.zip">

 		<exec dir="${buildDirectory}" executable="unzip" failonerror="true">

-			<arg line="-qq ${buildDirectory}/${buildLabel}/*.zip" />

+			<arg line="-qq -o ${buildDirectory}/${buildLabel}/*.zip" />

 		</exec>

 	</target>