aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSilenio Quarti2012-08-13 10:26:30 (EDT)
committerSilenio Quarti2012-08-13 10:26:30 (EDT)
commit37c776f53cd3fd61f89f1e3c2a5a8ec7eaf88042 (patch)
treedeaf754c978f217467305d8083567ec521663bdd
parent38b181cc48bbb76b3667a8c49fbd6569529795be (diff)
downloadrt.equinox.framework-37c776f53cd3fd61f89f1e3c2a5a8ec7eaf88042.zip
rt.equinox.framework-37c776f53cd3fd61f89f1e3c2a5a8ec7eaf88042.tar.gz
rt.equinox.framework-37c776f53cd3fd61f89f1e3c2a5a8ec7eaf88042.tar.bz2
Bug 387083 - Nightly build failing at point of provisioning osgi starter kit
-rw-r--r--bundles/org.eclipse.equinox.executable/target.build.properties5
-rw-r--r--bundles/org.eclipse.equinox.executable/target.build.xml5
2 files changed, 2 insertions, 8 deletions
diff --git a/bundles/org.eclipse.equinox.executable/target.build.properties b/bundles/org.eclipse.equinox.executable/target.build.properties
index 4baa9bb..0ad13d7 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.properties
+++ b/bundles/org.eclipse.equinox.executable/target.build.properties
@@ -20,10 +20,8 @@ root.win32.win32.ia64=file:contributed/win32/win32/ia64/launcher.exe
root.win32.wpf.x86=file:bin/wpf/win32/x86/launcher.exe
root.linux.gtk.x86=bin/gtk/linux/x86,gtk_root
-root.linux.gtk.x86.permissions.755=libcairo-swt.so
root.linux.gtk.ppc=bin/gtk/linux/ppc,gtk_root
-root.linux.gtk.ppc.permissions.755=libcairo-swt.so
root.linux.gtk.ppc64=bin/gtk/linux/ppc64,gtk_root
@@ -55,12 +53,11 @@ root.solaris.gtk.x86=bin/gtk/solaris/x86
root.solaris.gtk.sparc=bin/gtk/solaris/sparc
root.linux.gtk.x86_64=bin/gtk/linux/x86_64,gtk_root
-root.linux.gtk.x86_64.permissions.755=libcairo-swt.so
root.qnx.photon.x86=bin/photon/qnx/x86
root.linux.motif.x86=bin/motif/linux/x86,motif_root
-root.linux.motif.x86.permissions.755=libXm.so.2,libcairo-swt.so
+root.linux.motif.x86.permissions.755=libXm.so.2
root.linux.gtk.s390x=contributed/gtk/linux/s390x,gtk_root
root.linux.gtk.s390=contributed/gtk/linux/s390,gtk_root
diff --git a/bundles/org.eclipse.equinox.executable/target.build.xml b/bundles/org.eclipse.equinox.executable/target.build.xml
index 1d06b9b..39d5919 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.xml
+++ b/bundles/org.eclipse.equinox.executable/target.build.xml
@@ -135,7 +135,6 @@
<fileset dir="${basedir}/gtk_root" includes="**" />
</copy>
<chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="launcher" />
- <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="libcairo-swt.so" />
</target>
<target name="rootFileslinux_gtk_ppc">
<mkdir dir="${feature.base}/linux.gtk.ppc/${collectingFolder}"/>
@@ -144,7 +143,6 @@
<fileset dir="${basedir}/gtk_root" includes="**" />
</copy>
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc/${collectingFolder}" includes="launcher" />
- <chmod perm="755" dir="${feature.base}/linux.gtk.x86/${collectingFolder}" includes="libcairo-swt.so" />
</target>
<target name="rootFileslinux_gtk_ppc64">
<mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}"/>
@@ -177,7 +175,6 @@
<fileset dir="${basedir}/gtk_root" includes="**" />
</copy>
<chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="launcher" />
- <chmod perm="755" dir="${feature.base}/linux.gtk.x86_64/${collectingFolder}" includes="libcairo-swt.so" />
</target>
<target name="rootFileslinux_gtk_ia64">
<mkdir dir="${feature.base}/linux.gtk.ia64/${collectingFolder}"/>
@@ -207,7 +204,7 @@
<fileset dir="${basedir}/bin/motif/linux/x86" includes="**" />
<fileset dir="${basedir}/motif_root" includes="**" />
</copy>
- <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="libXm.so.2,libcairo-swt.so" />
+ <chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="libXm.so.2" />
<chmod perm="755" dir="${feature.base}/linux.motif.x86/${collectingFolder}" includes="launcher" />
</target>
<target name="rootFilessolaris_gtk_sparc">