--- eclipse-3.3RC4/assemble.org.eclipse.sdk.solaris.gtk.x86.xml.orig	Thu Jun 21 20:36:58 2007
+++ eclipse-3.3RC4/assemble.org.eclipse.sdk.solaris.gtk.x86.xml	Thu Jun 21 21:27:40 2007
@@ -68,6 +68,9 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.team.core" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
+		<ant antfile="build.xml" dir="plugins/org.eclipse.core.filesystem.solaris.x86" target="gather.bin.parts">
+			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.text" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -77,6 +80,9 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.views.properties.tabbed" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
+		<ant antfile="build.xml" dir="plugins/org.eclipse.equinox.launcher.gtk.solaris.x86" target="gather.bin.parts">
+			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+		</ant>
 		<ant antfile="build.xml" dir="plugins/org.eclipse.ui.editors" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
@@ -404,6 +410,9 @@
 		<ant antfile="build.xml" dir="plugins/org.eclipse.compare" target="gather.bin.parts">
 			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
 		</ant>
+		<ant antfile="build.xml" dir="plugins/org.eclipse.platform.source.solaris.gtk.x86" target="gather.bin.parts">
+			<property name="destination.temp.folder" value="${eclipse.plugins}"/>
+		</ant>
 		<ant antfile="build.xml" dir="features/org.eclipse.rcp/" target="gather.bin.parts">
 			<property name="feature.base" value="${eclipse.base}"/>
 		</ant>
@@ -449,6 +458,9 @@
 		<ant antfile="build.xml" dir="features/org.eclipse.jdt/" target="gather.bin.parts">
 			<property name="feature.base" value="${eclipse.base}"/>
 		</ant>
+		<ant antfile="build.xml" dir="features/org.eclipse.sdk/" target="gather.bin.parts">
+			<property name="feature.base" value="${eclipse.base}"/>
+		</ant>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.ui.navigator_3.3.0.I20070605-0010"/>
@@ -479,6 +491,10 @@
 		</antcall>
 		<antcall target="jarUp">
 			<param name="source" value="${eclipse.plugins}"/>
+			<param name="elementName" value="org.eclipse.core.filesystem.solaris.x86_1.0.100.v20070425"/>
+		</antcall>
+		<antcall target="jarUp">
+			<param name="source" value="${eclipse.plugins}"/>
 			<param name="elementName" value="org.eclipse.text_3.3.0.v20070606-0010"/>
 		</antcall>
 		<antcall target="jarUp">
@@ -883,17 +899,19 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.cvs.source_1.0.0.v20070606-7C79_79EI99g_Y9e"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.contenttype_3.2.100.v20070319.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.core_3.3.0.I20070607.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.core.filesystem.solaris.x86_1.0.100.v20070425.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.text_3.3.0.v20070606-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.jobs_3.3.0.v20070423.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.views.properties.tabbed_3.3.0.I20070605-0010.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.launcher.gtk.solaris.x86_1.0.0.v20070606"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.editors_3.3.0.v20070606-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.doc.user_3.3.0.v20070608-1301.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.resources_3.3.0.v20070604.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.ui.presentations.r21_3.2.100.I20070605-0010.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.cvs_1.0.0.v20070606.jar"/>
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} &apos;${archiveFullPath}&apos;"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.ui.presentations.r21_3.2.100.I20070605-0010.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.cvs_1.0.0.v20070606.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui_3.3.0.I20070608-1100.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.debug.ui_3.3.0.v20070607-1800.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.ui_3.3.0.I20070607.jar"/>
@@ -907,11 +925,12 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.core_3.3.0.v_770.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.views_3.2.100.I20070319-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.update.ui_3.2.100.v20070606_copyright.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.help.ui_3.3.0.v20070530.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.rcp.source_3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu"/>
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} &apos;${archiveFullPath}&apos;"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.help.ui_3.3.0.v20070530.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.swt.gtk.solaris.x86_3.3.0.HEAD.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.rcp.source_3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.pde_3.3.0.v20070608-1300.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.workbench.compatibility_3.2.0.I20070319-0010"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.junit_3.3.0.v20070606-0010.jar"/>
@@ -924,12 +943,12 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.jsp.jasper_1.0.0.v20070607.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.platform.doc.isv_3.3.0.v20070608-1300.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.osgi.services_3.1.200.v20070605.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.pde.runtime_3.3.0.v20070608-1300.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.preferences_3.2.100.v20070522.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.core.filesystem_1.1.0.v20070606.jar"/>
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} &apos;${archiveFullPath}&apos;"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.pde.runtime_3.3.0.v20070608-1300.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.preferences_3.2.100.v20070522.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.core.filesystem_1.1.0.v20070606.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.registry_3.3.0.v20070522.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.ui.templates_3.3.0.v20070608-1300.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.intro_3.2.100.v20070530.jar"/>
@@ -942,13 +961,12 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.ant.ui_3.2.100.v20070511.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.common_3.3.0.v20070426.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.runtime.compatibility.registry_3.2.100.v20070316"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.debug.core_3.3.0.v20070607-1800.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.http.registry_1.0.0.v20070608.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.apt.pluggable.core_1.0.0.v20070529-2100.jar"/>
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} &apos;${archiveFullPath}&apos;"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.solaris.gtk.x86_3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.debug.core_3.3.0.v20070607-1800.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.http.registry_1.0.0.v20070608.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.apt.pluggable.core_1.0.0.v20070529-2100.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jface.text_3.3.0.v20070606-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.databinding.beans_1.0.0.I20070606-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.osgi_3.3.0.v20070530.jar"/>
@@ -958,14 +976,15 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.commands_3.3.0.I20070605-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.pde.core_3.3.0.v20070608-1300.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.help_3.3.0.v20070524.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.rcp.source.solaris.gtk.x86_3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.search_3.3.0.v20070606-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.sdk_3.3.0.v20070228-0800"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.ant.core_3.1.200.v20070522.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.pde.ui_3.3.0.v20070608-1300.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.ui.ide_3.3.0.I20070605-0010.jar"/>
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} &apos;${archiveFullPath}&apos;"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.ant.core_3.1.200.v20070522.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.pde.ui_3.3.0.v20070608-1300.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.ui.ide_3.3.0.I20070605-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.navigator.resources_3.3.0.I20070605-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt_3.3.0.v20070607-1300.jar"/>
 			<arg line="${pluginArchivePrefix}/org.junit4_4.3.1"/>
@@ -978,17 +997,16 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.ui_3.3.0.I20070607.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.update.configurator_3.2.100.v20070606_copyright.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.cheatsheets_3.3.0.v20070507.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.help.webapp_3.3.0.v20070607.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.doc.user_3.3.0.v20070608-1300.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.http.servlet_1.0.0.v20070606.jar"/>
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} &apos;${archiveFullPath}&apos;"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.help.webapp_3.3.0.v20070607.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.doc.user_3.3.0.v20070608-1300.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.http.servlet_1.0.0.v20070606.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.launcher_1.0.0.v20070606.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.junit.runtime_3.3.0.v20070606-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.databinding_1.0.0.I20070606-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ui.workbench_3.3.0.I20070608-1100.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.swt.gtk.solaris.x86_3.3.0.HEAD.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.runtime_3.3.100.v20070530.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.runtime.compatibility.auth_3.2.100.v20070502.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.apt.core_3.3.0.v20070607-1200.jar"/>
@@ -997,11 +1015,11 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.jsch.core_1.0.0.I20070426.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.swt_3.3.0.v3345g.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.core.boot_3.1.100.v20060603.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.ui.net_1.0.0.I20070516.jar"/>
-			<arg line="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.200.v20070510.jar"/>
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} &apos;${archiveFullPath}&apos;"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.ui.net_1.0.0.I20070516.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.help.appserver_3.1.200.v20070510.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jface.databinding_1.1.0.I20070606-0010.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.team.cvs.core_3.3.0.I20070607.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.ltk.ui.refactoring_3.3.0.v20070606-0010.jar"/>
@@ -1015,7 +1033,11 @@
 			<arg line="${pluginArchivePrefix}/org.eclipse.equinox.http.jetty_1.0.0.v20070607.jar"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jdt.source_3.3.0.v20070606-0010-7o7jCHEFpPoqOYuobpfkaR"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.jface_3.3.0.I20070606-0010.jar"/>
+		</exec>
+		<exec executable="zip" dir="${assemblyTempDir}">
+			<arg line="-r -q ${zipargs} &apos;${archiveFullPath}&apos;"/>
 			<arg line="${pluginArchivePrefix}/org.eclipse.compare_3.3.0.I20070606.jar"/>
+			<arg line="${pluginArchivePrefix}/org.eclipse.platform.source.solaris.gtk.x86_3.3.0.v20070608-_19UEkLF-XsdF9jJrkPi"/>
 		</exec>
 		<exec executable="zip" dir="${assemblyTempDir}">
 			<arg line="-r -q ${zipargs} &apos;${archiveFullPath}&apos;"/>
