Re-add eclipse-usebuiltlauncher.patch.

This commit is contained in:
Andrew Overholt 2006-02-06 20:50:48 +00:00
parent a9c56bbdd2
commit dedf2228a1

View File

@ -0,0 +1,142 @@
diff -uNr features/org.eclipse.platform/build.xml features/org.eclipse.platform/build.xml
--- features/org.eclipse.platform/build.xml 2006-02-06 13:49:43.000000000 -0500
+++ features/org.eclipse.platform/build.xml 2006-02-06 13:58:52.000000000 -0500
@@ -349,6 +349,12 @@
<eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="org.eclipse.rcp,3.1.2," pluginIds="org.apache.ant,1.6.5,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.1,org.eclipse.compare,3.1.1,org.eclipse.core.boot,3.1.0,org.eclipse.core.filebuffers,3.1.2,org.eclipse.core.resources,3.1.2,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi.services,3.1.2,org.eclipse.osgi.util,3.1.1,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.2,org.eclipse.debug.ui,3.1.2,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.1,org.eclipse.help.appserver,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.1,org.eclipse.platform,3.1.2,org.eclipse.platform.doc.user,3.1.1,org.eclipse.search,3.1.2,org.eclipse.team.core,3.1.1,org.eclipse.team.cvs.core,3.1.1,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.1,org.eclipse.team.ui,3.1.1,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.1,org.eclipse.jface.text,3.1.2,org.eclipse.ui.console,3.1.2,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.1,org.eclipse.ui.cheatsheets,3.1.1,org.eclipse.ui.browser,3.1.1,org.eclipse.ui.workbench.texteditor,3.1.2,org.eclipse.ui.views,3.1.1,org.eclipse.ui.editors,3.1.1,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.1,org.eclipse.ui.ide,3.1.1,org.eclipse.update.core,3.1.2,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.1,org.eclipse.ui.workbench.compatibility,3.1.0,org.eclipse.core.resources.hpux,3.1.0,org.eclipse.core.resources.linux,3.1.0,org.eclipse.core.resources.macosx,3.1.0,org.eclipse.core.resources.qnx,3.1.0,org.eclipse.core.resources.win32,3.1.0,org.eclipse.ui.carbon,3.1.1,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/>
<antcall target="rootFiles${os}_${ws}_${arch}"/>
</target>
+ <target name="copybuiltlauncher" if="libsconfig">
+ <copy todir="${feature.base}/${os}.${ws}.${arch}/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/../../launchertmp" includes="**" />
+ </copy>
+ </target>
+
<target name="rootFileswin32_win32_x86">
<mkdir dir="${feature.base}/win32.win32.x86/${collectingFolder}"/>
<copy todir="${feature.base}/win32.win32.x86/${collectingFolder}" failonerror="true" overwrite="true">
@@ -357,6 +363,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/win32.win32.x86/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileslinux_gtk_x86">
@@ -369,6 +377,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="*.so*" />
</target>
@@ -380,6 +390,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="*.so*" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="eclipse" />
</target>
@@ -391,6 +403,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="*.so*" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="eclipse" />
</target>
@@ -404,6 +418,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="*.so*" />
</target>
@@ -415,6 +431,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.gtk.ia64/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileslinux_motif_x86">
@@ -429,6 +447,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="eclipse" />
<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="*.so*" />
</target>
@@ -440,6 +460,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/solaris.motif.sparc/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilessolaris_gtk_sparc">
@@ -450,6 +472,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilesaix_motif_ppc">
@@ -460,6 +484,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/aix.motif.ppc/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileshpux_motif_PA_RISC">
@@ -470,6 +496,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/hpux.motif.PA_RISC/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileshpux_motif_ia64">
@@ -480,6 +508,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/hpux.motif.ia64/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFileshpux_motif_ia64_32">
@@ -490,6 +520,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/hpux.motif.ia64_32/${collectingFolder}" includes="eclipse" />
</target>
<target name="rootFilesmacosx_carbon_ppc">
@@ -516,6 +548,8 @@
<fileset dir="${basedir}/rootfiles" includes="**" />
<fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" />
</copy>
+ <!-- Copy the launcher that we built over the pre-built binary -->
+ <antcall target="copybuiltlauncher" />
<chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" />
</target>