diff options
Diffstat (limited to 'java/eclipse/files/patch-features-rcp-build.xml')
| -rw-r--r-- | java/eclipse/files/patch-features-rcp-build.xml | 127 |
1 files changed, 61 insertions, 66 deletions
diff --git a/java/eclipse/files/patch-features-rcp-build.xml b/java/eclipse/files/patch-features-rcp-build.xml index 583292602655..f76a76f03d53 100644 --- a/java/eclipse/files/patch-features-rcp-build.xml +++ b/java/eclipse/files/patch-features-rcp-build.xml @@ -1,80 +1,75 @@ ---- features/org.eclipse.rcp/build.xml.orig Wed Jan 18 16:09:14 2006 -+++ features/org.eclipse.rcp/build.xml Sun Jan 29 20:51:40 2006 -@@ -127,6 +127,21 @@ - <property name="os" value="win32"/> - <property name="ws" value="win32"/> +--- features/org.eclipse.rcp/build.xml.orig Thu Sep 21 10:55:42 2006 ++++ features/org.eclipse.rcp/build.xml Tue Oct 3 14:51:03 2006 +@@ -77,6 +77,11 @@ + <property name="os" value="linux"/> + <property name="ws" value="gtk"/> </ant> -+ <ant antfile="build.xml" dir="../../plugins/org.eclipse.swt.motif.freebsd.x86" target="${target}"> -+ <property name="arch" value="x86"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="motif"/> -+ </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> ++ <property name="arch" value="x86"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> + <ant antfile="build.xml" dir="../../plugins/org.eclipse.osgi" target="${target}"> + <property name="arch" value="x86"/> + <property name="os" value="win32"/> +@@ -167,6 +172,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}"> -+ <property name="arch" value="amd64"/> -+ <property name="os" value="freebsd"/> -+ <property name="ws" value="gtk"/> -+ </ant> ++ <property name="arch" value="amd64"/> ++ <property name="os" value="freebsd"/> ++ <property name="ws" value="gtk"/> ++ </ant> </target> <target name="all.features" depends="init"> </target> -@@ -185,7 +200,7 @@ - <copy todir="${feature.base}/features/org.eclipse.rcp_3.1.2" failonerror="true" overwrite="false"> +@@ -225,7 +235,7 @@ + <copy todir="${feature.base}/features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg" failonerror="true" overwrite="false"> <fileset dir="${basedir}" includes="feature.xml,license.html,epl-v10.html,feature.properties,eclipse_update_120.jpg" /> </copy> -- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.2,org.eclipse.osgi,3.1.2,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.1,org.eclipse.ui,3.1.2,org.eclipse.ui.workbench,3.1.2,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.2,org.eclipse.swt.gtk.linux.x86,3.1.1,org.eclipse.swt.gtk.solaris.sparc,3.1.1,org.eclipse.swt.gtk.linux.ppc,3.1.1,org.eclipse.swt.gtk.linux.x86_64,3.1.1,org.eclipse.swt.carbon.macosx.ppc,3.1.1,org.eclipse.swt.motif.aix.ppc,3.1.1,org.eclipse.swt.motif.hpux.PA_RISC,3.1.1,org.eclipse.swt.motif.linux.x86,3.1.1,org.eclipse.swt.gtk.linux.ia64,3.1.1,org.eclipse.swt.motif.solaris.sparc,3.1.1,org.eclipse.swt.photon.qnx.x86,3.1.1,org.eclipse.swt.motif.hpux.ia64_32,3.1.1,org.eclipse.rcp,3.1.0,"/> -+ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.1.2/feature.xml" selfVersion="3.1.2" featureIds="" pluginIds="org.eclipse.core.commands,3.1.0,org.eclipse.core.expressions,3.1.0,org.eclipse.core.runtime,3.1.2,org.eclipse.osgi,3.1.2,org.eclipse.help,3.1.0,org.eclipse.swt,3.1.0,org.eclipse.jface,3.1.1,org.eclipse.ui,3.1.2,org.eclipse.ui.workbench,3.1.2,org.eclipse.update.configurator,3.1.0,org.eclipse.swt.win32.win32.x86,3.1.2,org.eclipse.swt.gtk.linux.x86,3.1.1,org.eclipse.swt.gtk.freebsd.x86,3.1.1,org.eclipse.swt.gtk.solaris.sparc,3.1.1,org.eclipse.swt.gtk.linux.ppc,3.1.1,org.eclipse.swt.gtk.linux.x86_64,3.1.1,org.eclipse.swt.gtk.freebsd.amd64,3.1.1,org.eclipse.swt.carbon.macosx.ppc,3.1.1,org.eclipse.swt.motif.aix.ppc,3.1.1,org.eclipse.swt.motif.hpux.PA_RISC,3.1.1,org.eclipse.swt.motif.linux.x86,3.1.1,org.eclipse.swt.motif.freebsd.x86,3.1.1,org.eclipse.swt.gtk.linux.ia64,3.1.1,org.eclipse.swt.motif.solaris.sparc,3.1.1,org.eclipse.swt.photon.qnx.x86,3.1.1,org.eclipse.swt.motif.hpux.ia64_32,3.1.1,org.eclipse.rcp,3.1.0,"/> +- <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/feature.xml" selfVersion="3.2.1.r321_v20060801-clWbqCmjexIWDqg" featureIds="" pluginIds="com.ibm.icu,3.4.5,org.eclipse.core.commands,3.2.0.I20060605-1400,org.eclipse.core.jobs,3.2.0.v20060603,org.eclipse.core.expressions,3.2.1.r321_v20060721,org.eclipse.core.runtime,3.2.0.v20060603,org.eclipse.core.runtime.compatibility.auth,3.2.0.v20060601,org.eclipse.osgi,3.2.1.R32x_v20060919,org.eclipse.help,3.2.1.R321_v20060920,org.eclipse.swt,3.2.1.v3235e,org.eclipse.jface,3.2.1.M20060908-1000,org.eclipse.jface.databinding,1.0.0.I20060605-1400,org.eclipse.ui,3.2.1.M20060913-0800,org.eclipse.ui.workbench,3.2.1.M20060906-0800,org.eclipse.update.configurator,3.2.1.v20092006,org.eclipse.swt.win32.win32.x86,3.2.1.v3235,org.eclipse.swt.gtk.linux.x86,3.2.1.v3235,org.eclipse.swt.gtk.solaris.sparc,3.2.1.v3235,org.eclipse.swt.gtk.solaris.x86,3.2.0.R3_2_maintenance,org.eclipse.swt.gtk.linux.ppc,3.2.1.v3235,org.eclipse.swt.gtk.linux.x86_64,3.2.1.v3235,org.eclipse.swt.carbon.macosx,3.2.1.v3235,org.eclipse.swt.motif.aix.ppc,3.2.1.v3235,org.eclipse.swt.motif.hpux.PA_RISC,3.2.1.v3235,org.eclipse.swt.motif.linux.x86,3.2.1.v3235,org.eclipse.swt.gtk.linux.ia64,3.2.0.R3_2_maintenance,org.eclipse.swt.motif.solaris.sparc,3.2.1.v3235,org.eclipse.swt.photon.qnx.x86,3.2.1.v3235,org.eclipse.swt.motif.hpux.ia64_32,3.2.1,org.eclipse.rcp,3.2.0.v20060605,org.eclipse.core.contenttype,3.2.0.v20060603,org.eclipse.equinox.common,3.2.0.v20060603,org.eclipse.equinox.preferences,3.2.1.R32x_v20060717,org.eclipse.equinox.registry,3.2.1.R32x_v20060814,"/> ++ <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.rcp_3.2.1.r321_v20060801-clWbqCmjexIWDqg/feature.xml" selfVersion="3.2.1.r321_v20060801-clWbqCmjexIWDqg" featureIds="" pluginIds="com.ibm.icu,3.4.5,org.eclipse.core.commands,3.2.0.I20060605-1400,org.eclipse.core.jobs,3.2.0.v20060603,org.eclipse.core.expressions,3.2.1.r321_v20060721,org.eclipse.core.runtime,3.2.0.v20060603,org.eclipse.core.runtime.compatibility.auth,3.2.0.v20060601,org.eclipse.osgi,3.2.1.R32x_v20060919,org.eclipse.help,3.2.1.R321_v20060920,org.eclipse.swt,3.2.1.v3235e,org.eclipse.jface,3.2.1.M20060908-1000,org.eclipse.jface.databinding,1.0.0.I20060605-1400,org.eclipse.ui,3.2.1.M20060913-0800,org.eclipse.ui.workbench,3.2.1.M20060906-0800,org.eclipse.update.configurator,3.2.1.v20092006,org.eclipse.swt.win32.win32.x86,3.2.1.v3235,org.eclipse.swt.gtk.linux.x86,3.2.1.v3235,org.eclipse.swt.gtk.freebsd.x86,3.2.1.v3235,org.eclipse.swt.gtk.solaris.sparc,3.2.1.v3235,org.eclipse.swt.gtk.solaris.x86,3.2.0.R3_2_maintenance,org.eclipse.swt.gtk.linux.ppc,3.2.1.v3235,org.eclipse.swt.gtk.linux.x86_64,3.2.1.v3235,org.eclipse.swt.gtk.freebsd.amd64,3.2.1.v3235,org.eclipse.swt.carbon.macosx,3.2.1.v3235,org.eclipse.swt.motif.aix.ppc,3.2.1.v3235,org.eclipse.swt.motif.hpux.PA_RISC,3.2.1.v3235,org.eclipse.swt.motif.linux.x86,3.2.1.v3235,org.eclipse.swt.gtk.linux.ia64,3.2.0.R3_2_maintenance,org.eclipse.swt.motif.solaris.sparc,3.2.1.v3235,org.eclipse.swt.photon.qnx.x86,3.2.1.v3235,org.eclipse.swt.motif.hpux.ia64_32,3.2.1,org.eclipse.rcp,3.2.0.v20060605,org.eclipse.core.contenttype,3.2.0.v20060603,org.eclipse.equinox.common,3.2.0.v20060603,org.eclipse.equinox.preferences,3.2.1.R32x_v20060717,org.eclipse.equinox.registry,3.2.1.R32x_v20060814,"/> <antcall target="rootFiles${os}_${ws}_${arch}"/> </target> <target name="rootFileswin32_win32_x86"> -@@ -353,6 +368,46 @@ - </copy> - <chmod perm="755" dir="${feature.base}/qnx.photon.x86/${collectingFolder}" includes="eclipse" /> +@@ -320,6 +330,30 @@ + <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_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/about_files/freebsd.gtk.x86" includes="**" /> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.freebsd.x86" includes="libcairo.so.1" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ </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> ++ <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/about_files/freebsd.gtk.x86" includes="**" /> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/x86" includes="**" /> ++ <fileset dir="${basedir}/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> ++ </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="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/about_files/freebsd.gtk.amd64" includes="**" /> -+ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.swt.gtk.freebsd.amd64" includes="libcairo.so.1" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> -+ </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="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}/../../features/org.eclipse.platform/about_files/freebsd.motif.x86" 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}/../../plugins/org.eclipse.swt.motif.freebsd.x86" includes="libcairo.so.1" /> -+ <fileset dir="${basedir}/rootfiles" includes="**" /> -+ <fileset dir="${basedir}/../org.eclipse.platform/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="zip.distribution" depends="init" description="Create a zip containing all the plug-ins and features for the feature: org.eclipse.rcp."> - <delete dir="${feature.temp.folder}"/> ++ <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/about_files/freebsd.gtk.amd64" includes="**" /> ++ <fileset dir="${basedir}/../../features/org.eclipse.platform.launchers/bin/gtk/freebsd/amd64" includes="**" /> ++ <fileset dir="${basedir}/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../org.eclipse.platform/rootfiles" includes="**" /> ++ <fileset dir="${basedir}/../../plugins/org.eclipse.platform" includes="startup.jar" /> ++ </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="rootFilessolaris_gtk_sparc"> + <mkdir dir="${feature.base}/solaris.gtk.sparc/${collectingFolder}"/> + <copy todir="${feature.base}/solaris.gtk.sparc/${collectingFolder}" failonerror="true" overwrite="true"> +@@ -406,6 +440,8 @@ + <antcall target="rootFileslinux_gtk_x86_64"/> + <antcall target="rootFileslinux_gtk_ia64"/> + <antcall target="rootFileslinux_motif_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_x86"/> ++ <antcall target="rootFilesfreebsd_gtk_amd64"/> + <antcall target="rootFilessolaris_gtk_sparc"/> + <antcall target="rootFilessolaris_gtk_x86"/> + <antcall target="rootFilessolaris_motif_sparc"/> |