--- eclipse-3.3RC4/features/org.eclipse.rcp/build.xml.orig	Sun Jun 24 03:34:18 2007
+++ eclipse-3.3RC4/features/org.eclipse.rcp/build.xml	Sun Jun 24 05:29:57 2007
@@ -331,7 +331,7 @@
 				<include name="eclipse_update_120.jpg"/>
 			</fileset>
 		</copy>
-		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu/feature.xml"  selfVersion="3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.6.1.v20070417,org.eclipse.core.commands:0.0.0,3.3.0.I20070605-0010,org.eclipse.core.databinding:0.0.0,1.0.0.I20070606-0010,org.eclipse.core.databinding.beans:0.0.0,1.0.0.I20070606-0010,org.eclipse.core.jobs:0.0.0,3.3.0.v20070423,org.eclipse.core.expressions:0.0.0,3.3.0.v20070606-0010,org.eclipse.core.runtime:0.0.0,3.3.100.v20070530,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.3.0.v20070530,org.eclipse.help:0.0.0,3.3.0.v20070524,org.eclipse.swt:0.0.0,3.3.0.v3345g,org.eclipse.jface:0.0.0,3.3.0.I20070606-0010,org.eclipse.jface.databinding:0.0.0,1.1.0.I20070606-0010,org.eclipse.ui:0.0.0,3.3.0.I20070608-1100,org.eclipse.ui.workbench:0.0.0,3.3.0.I20070608-1100,org.eclipse.ui.carbon:0.0.0,3.2.100.I20070605-0010,org.eclipse.update.configurator:0.0.0,3.2.100.v20070606_copyright,org.eclipse.swt.win32.win32.x86:0.0.0,3.3.0.v3345f,org.eclipse.swt.wpf.win32.x86:0.0.0,3.3.0.v3345a,org.eclipse.swt.gtk.linux.x86:0.0.0,3.3.0.v3345f,org.eclipse.swt.gtk.linux.s390:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.3.0.v3345a,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.3.0.v3345f,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.3.0.v3345f,org.eclipse.swt.carbon.macosx:0.0.0,3.3.0.v3345f,org.eclipse.swt.motif.aix.ppc:0.0.0,3.3.0.v3345a,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.3.0.v3345a,org.eclipse.swt.motif.linux.x86:0.0.0,3.3.0.v3345f,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.3.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.3.0.v3345a,org.eclipse.swt.photon.qnx.x86:0.0.0,3.3.0.v3345a,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.3.0.HEAD,org.eclipse.rcp:0.0.0,3.2.0.v20060605,org.eclipse.core.contenttype:0.0.0,3.2.100.v20070319,org.eclipse.equinox.app:0.0.0,1.0.0.v20070606,org.eclipse.equinox.common:0.0.0,3.3.0.v20070426,org.eclipse.equinox.preferences:0.0.0,3.2.100.v20070522,org.eclipse.equinox.registry:0.0.0,3.3.0.v20070522,org.eclipse.equinox.launcher:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.0.v20070524,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.0.v20070524,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.0.v20070219,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.0.v20070523,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.0.v20070523,"/>
+		<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu/feature.xml"  selfVersion="3.3.0.v20070607-8y8eE8NEbsN3X5PjTaJy8DEsjhiu" featureIds="" pluginIds="com.ibm.icu:0.0.0,3.6.1.v20070417,org.eclipse.core.commands:0.0.0,3.3.0.I20070605-0010,org.eclipse.core.databinding:0.0.0,1.0.0.I20070606-0010,org.eclipse.core.databinding.beans:0.0.0,1.0.0.I20070606-0010,org.eclipse.core.jobs:0.0.0,3.3.0.v20070423,org.eclipse.core.expressions:0.0.0,3.3.0.v20070606-0010,org.eclipse.core.runtime:0.0.0,3.3.100.v20070530,org.eclipse.core.runtime.compatibility.auth:0.0.0,3.2.100.v20070502,org.eclipse.osgi:0.0.0,3.3.0.v20070530,org.eclipse.help:0.0.0,3.3.0.v20070524,org.eclipse.swt:0.0.0,3.3.0.v3345g,org.eclipse.jface:0.0.0,3.3.0.I20070606-0010,org.eclipse.jface.databinding:0.0.0,1.1.0.I20070606-0010,org.eclipse.ui:0.0.0,3.3.0.I20070608-1100,org.eclipse.ui.workbench:0.0.0,3.3.0.I20070608-1100,org.eclipse.ui.carbon:0.0.0,3.2.100.I20070605-0010,org.eclipse.update.configurator:0.0.0,3.2.100.v20070606_copyright,org.eclipse.swt.win32.win32.x86:0.0.0,3.3.0.v3345f,org.eclipse.swt.wpf.win32.x86:0.0.0,3.3.0.v3345a,org.eclipse.swt.gtk.linux.x86:0.0.0,3.3.0.v3345f,org.eclipse.swt.gtk.linux.s390:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.s390x:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.solaris.sparc:0.0.0,3.3.0.v3345a,org.eclipse.swt.gtk.solaris.x86:0.0.0,3.3.0.HEAD,org.eclipse.swt.gtk.linux.ppc:0.0.0,3.3.0.v3345f,org.eclipse.swt.gtk.linux.x86_64:0.0.0,3.3.0.v3345f,org.eclipse.swt.carbon.macosx:0.0.0,3.3.0.v3345f,org.eclipse.swt.motif.aix.ppc:0.0.0,3.3.0.v3345a,org.eclipse.swt.motif.hpux.PA_RISC:0.0.0,3.3.0.v3345a,org.eclipse.swt.motif.linux.x86:0.0.0,3.3.0.v3345f,org.eclipse.swt.gtk.linux.ia64:0.0.0,3.3.0.HEAD,org.eclipse.swt.motif.solaris.sparc:0.0.0,3.3.0.v3345a,org.eclipse.swt.photon.qnx.x86:0.0.0,3.3.0.v3345a,org.eclipse.swt.motif.hpux.ia64_32:0.0.0,3.3.0.HEAD,org.eclipse.rcp:0.0.0,3.2.0.v20060605,org.eclipse.core.contenttype:0.0.0,3.2.100.v20070319,org.eclipse.equinox.app:0.0.0,1.0.0.v20070606,org.eclipse.equinox.common:0.0.0,3.3.0.v20070426,org.eclipse.equinox.preferences:0.0.0,3.2.100.v20070522,org.eclipse.equinox.registry:0.0.0,3.3.0.v20070522,org.eclipse.equinox.launcher:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.solaris.sparc:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.solaris.x86:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.carbon.macosx:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.linux.ppc:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.linux.x86:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.gtk.linux.s390:0.0.0,1.0.0,org.eclipse.equinox.launcher.gtk.linux.s390x:0.0.0,1.0.0,org.eclipse.equinox.launcher.motif.linux.x86:0.0.0,1.0.0.v20070524,org.eclipse.equinox.launcher.gtk.linux.x86_64:0.0.0,1.0.0.v20070606,org.eclipse.equinox.launcher.motif.aix.ppc:0.0.0,1.0.0.v20070524,org.eclipse.equinox.launcher.motif.hpux.PA_RISC:0.0.0,1.0.0.v20070219,org.eclipse.equinox.launcher.wpf.win32.x86:0.0.0,1.0.0.v20070523,org.eclipse.equinox.launcher.win32.win32.x86:0.0.0,1.0.0.v20070523,"/>
 		<antcall target="rootFiles${os}_${ws}_${arch}"/>
 	</target>
 	<target name="rootFileswin32_win32_x86">
@@ -540,6 +540,9 @@
 	<target name="rootFilessolaris_gtk_x86">
 		<mkdir dir="${feature.base}/solaris.gtk.x86/${collectingFolder}/"/>
 		<copy todir="${feature.base}/solaris.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true">
+			<fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/solaris/x86">
+				<include name="**"/>
+			</fileset>
 			<fileset dir="${basedir}/rootfiles">
 				<include name="**"/>
 			</fileset>
