diff options
Diffstat (limited to 'java/eclipse-devel/files/patch-features-platform-build.xml')
| -rw-r--r-- | java/eclipse-devel/files/patch-features-platform-build.xml | 158 |
1 files changed, 62 insertions, 96 deletions
diff --git a/java/eclipse-devel/files/patch-features-platform-build.xml b/java/eclipse-devel/files/patch-features-platform-build.xml index 5e4b253236c2..cc56d98ff957 100644 --- a/java/eclipse-devel/files/patch-features-platform-build.xml +++ b/java/eclipse-devel/files/patch-features-platform-build.xml @@ -1,42 +1,23 @@ ---- features/org.eclipse.platform/build.xml.orig Fri May 13 11:34:52 2005 -+++ features/org.eclipse.platform/build.xml Sat May 14 20:43:11 2005 -@@ -42,6 +42,11 @@ +--- features/org.eclipse.platform/build.xml.orig 2007-06-26 04:39:42.000000000 +0900 ++++ features/org.eclipse.platform/build.xml 2007-09-02 14:11:58.000000000 +0900 +@@ -57,6 +57,16 @@ <property name="os" value="linux"/> - <property name="ws" value="motif"/> + <property name="ws" value="gtk"/> </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.freebsd.x86" target="${target}"> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.freebsd.x86" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> ++ <property name="ws" value="gtk"/> + </ant> - <ant antfile="build.xml" dir="../../plugins/org.apache.ant" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> -@@ -62,6 +67,11 @@ - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.amd64" target="${target}"> ++ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.freebsd.amd64" target="${target}"> + <property name="arch" value="amd64"/> + <property name="os" value="freebsd"/> + <property name="ws" value="gtk"/> + </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.solaris.sparc" target="${target}"> - <property name="arch" value="sparc"/> - <property name="os" value="solaris"/> -@@ -107,6 +117,11 @@ + <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.filesystem.linux.ppc" target="${target}"> + <property name="arch" value="ppc"/> <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.gtk.freebsd.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.solaris.sparc" target="${target}"> - <property name="arch" value="sparc"/> - <property name="os" value="solaris"/> -@@ -187,6 +202,11 @@ +@@ -127,6 +137,11 @@ <property name="os" value="linux"/> <property name="ws" value="gtk"/> </ant> @@ -45,81 +26,66 @@ + <property name="os" value="freebsd"/> + <property name="ws" value="gtk"/> + </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.jface.text" target="${target}"> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.ant.core" target="${target}"> <property name="arch" value="x86"/> <property name="os" value="win32"/> -@@ -222,6 +242,11 @@ - <property name="os" value="linux"/> - <property name="ws" value="gtk"/> - </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.core.resources.freebsd" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> - <ant antfile="build.xml" dir="../../plugins/org.eclipse.team.core" target="${target}"> - <property name="arch" value="x86"/> - <property name="os" value="win32"/> -@@ -450,7 +475,7 @@ - <copy todir="${feature.base}/features/org.eclipse.platform_3.1.0" failonerror="true" overwrite="false"> - <fileset dir="${basedir}" includes="epl-v10.html,eclipse_update_120.jpg,feature.xml,feature.properties,license.html" /> - </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.apache.ant,1.6.3,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,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.swt.carbon.macosx.ppc,3.1.0,org.eclipse.swt.gtk.linux.x86,3.1.0,org.eclipse.swt.gtk.linux.x86_64,3.1.0,org.eclipse.swt.gtk.linux.ppc,3.1.0,org.eclipse.swt.gtk.solaris.sparc,3.1.0,org.eclipse.swt.motif.aix.ppc,3.1.0,org.eclipse.swt.motif.hpux.PA_RISC,3.1.0,org.eclipse.swt.motif.linux.x86,3.1.0,org.eclipse.swt.motif.solaris.sparc,3.1.0,org.eclipse.swt.photon.qnx.x86,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.0,org.eclipse.ui.carbon,3.1.0,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.win32,3.1.0,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.platform_3.1.0/feature.xml" selfVersion="3.1.0" featureIds="" pluginIds="org.apache.ant,1.6.3,org.apache.lucene,1.4.3,org.eclipse.ant.core,3.1.0,org.eclipse.compare,3.1.0,org.eclipse.core.boot,3.0.0,org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.filebuffers,3.1.0,org.eclipse.core.resources,3.1.0,org.eclipse.core.resources.compatibility,3.1.0,org.eclipse.core.runtime,3.1.0,org.eclipse.core.runtime.compatibility,3.1.0,org.eclipse.osgi,3.1.0,org.eclipse.osgi.services,3.0.0,org.eclipse.osgi.util,3.0.0,org.eclipse.core.variables,3.1.0,org.eclipse.debug.core,3.1.0,org.eclipse.debug.ui,3.1.0,org.eclipse.help,3.1.0,org.eclipse.help.webapp,3.1.0,org.eclipse.help.base,3.1.0,org.eclipse.help.ui,3.1.0,org.eclipse.help.appserver,3.1.0,org.eclipse.jface,3.1.0,org.eclipse.ltk.core.refactoring,3.1.0,org.eclipse.ltk.ui.refactoring,3.1.0,org.eclipse.platform,3.1.0,org.eclipse.platform.doc.user,3.1.0,org.eclipse.search,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.team.core,3.1.0,org.eclipse.team.cvs.core,3.1.0,org.eclipse.team.cvs.ssh,3.1.0,org.eclipse.team.cvs.ssh2,3.1.0,org.eclipse.team.cvs.ui,3.1.0,org.eclipse.team.ui,3.1.0,org.eclipse.tomcat,4.1.30.1,org.eclipse.text,3.1.0,org.eclipse.jface.text,3.1.0,org.eclipse.ui,3.1.0,org.eclipse.ui.console,3.1.0,org.eclipse.ui.presentations.r21,3.1.0,org.eclipse.ui.intro,3.1.0,org.eclipse.ui.cheatsheets,3.1.0,org.eclipse.ui.browser,3.1.0,org.eclipse.ui.workbench,3.1.0,org.eclipse.ui.workbench.texteditor,3.1.0,org.eclipse.ui.views,3.1.0,org.eclipse.ui.editors,3.1.0,org.eclipse.ui.forms,3.1.0,org.eclipse.ui.externaltools,3.1.0,org.eclipse.ui.ide,3.1.0,org.eclipse.update.configurator,3.1.0,org.eclipse.update.core,3.1.0,org.eclipse.update.scheduler,3.1.0,org.eclipse.update.ui,3.1.0,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.freebsd,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.swt.carbon.macosx.ppc,3.1.0,org.eclipse.swt.gtk.linux.x86,3.1.0,org.eclipse.swt.gtk.freebsd.x86,3.1.0,org.eclipse.swt.gtk.linux.x86_64,3.1.0,org.eclipse.swt.gtk.freebsd.amd64,3.1.0,org.eclipse.swt.gtk.linux.ppc,3.1.0,org.eclipse.swt.gtk.solaris.sparc,3.1.0,org.eclipse.swt.motif.aix.ppc,3.1.0,org.eclipse.swt.motif.hpux.PA_RISC,3.1.0,org.eclipse.swt.motif.linux.x86,3.1.0,org.eclipse.swt.motif.freebsd.x86,3.1.0,org.eclipse.swt.motif.solaris.sparc,3.1.0,org.eclipse.swt.photon.qnx.x86,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.0,org.eclipse.ui.carbon,3.1.0,org.eclipse.ui.win32,3.1.0,org.eclipse.update.core.linux,3.1.0,org.eclipse.update.core.freebsd,3.1.0,org.eclipse.update.core.win32,3.1.0,"/> - <antcall target="rootFiles${os}_${ws}_${arch}"/> - </target> - <target name="rootFileswin32_win32_x86"> -@@ -473,6 +498,16 @@ - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="eclipse" /> +@@ -485,6 +500,50 @@ + <arg line="eclipse"/> + </exec> </target> + <target name="rootFilesfreebsd_gtk_x86"> -+ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**" /> -+ <fileset dir="${basedir}/gtk" includes="**" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> ++ <mkdir dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/about_files/freebsd.gtk.x86"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/x86"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/gtk"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> ++ <include name="startup.jar"/> ++ </fileset> + </copy> + <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.x86/${collectingFolder}" includes="*.so*" /> + </target> - <target name="rootFileslinux_gtk_ppc"> - <mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/> - <copy todir="${feature.base}/linux.gtk.ppc/${collectingFolder}" failonerror="true" overwrite="true"> -@@ -503,6 +538,16 @@ - </copy> - <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="eclipse" /> - </target> + <target name="rootFilesfreebsd_gtk_amd64"> -+ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**" /> -+ <fileset dir="${basedir}/gtk" includes="**" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> ++ <mkdir dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/"/> ++ <copy todir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}/" failonerror="true" overwrite="true"> ++ <fileset dir="${basedir}/about_files/freebsd.gtk.amd64"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../../features/org.eclipse.equinox.executable/bin/gtk/freebsd/amd64"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/gtk"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/rootfiles"> ++ <include name="**"/> ++ </fileset> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform"> ++ <include name="startup.jar"/> ++ </fileset> + </copy> + <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="eclipse" /> ++ <chmod perm="755" dir="${feature.base}/freebsd.gtk.amd64/${collectingFolder}" includes="*.so*" /> + </target> - <target name="rootFileslinux_motif_x86"> - <mkdir dir="${feature.base}/linux.motif.x86/${collectingFolder}"/> - <copy todir="${feature.base}/linux.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> -@@ -515,6 +560,19 @@ - </copy> - <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> -+ <target name="rootFilesfreebsd_motif_x86"> -+ <mkdir dir="${feature.base}/freebsd.motif.x86/${collectingFolder}"/> -+ <copy todir="${feature.base}/freebsd.motif.x86/${collectingFolder}" failonerror="true" overwrite="true"> -+ <fileset dir="${basedir}/freebsd.motif" includes="**" /> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/motif/freebsd/x86" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libXm.so.2" /> -+ <fileset dir="${basedir}/motif" includes="**" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ </copy> -+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="eclipse" /> -+ <chmod perm="755" dir="${feature.base}/freebsd.motif.x86/${collectingFolder}" includes="*.so*" /> - </target> - <target name="rootFilessolaris_motif_sparc"> - <mkdir dir="${feature.base}/solaris.motif.sparc/${collectingFolder}"/> + <target name="rootFileslinux_gtk_x86"> + <mkdir dir="${feature.base}/linux.gtk.x86/${collectingFolder}/"/> + <copy todir="${feature.base}/linux.gtk.x86/${collectingFolder}/" failonerror="true" overwrite="true"> +@@ -784,6 +843,8 @@ + <antcall target="rootFileswin32_win32_x86"/> + <antcall target="rootFileswin32_wpf_x86"/> + <antcall target="rootFilesmacosx_carbon_ppc"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFileslinux_gtk_x86"/> + <antcall target="rootFileslinux_gtk_ppc"/> + <antcall target="rootFileslinux_gtk_ppc64"/> |