Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2010-02-04 14:50:52 -0500
committerAndrew Niefer2010-02-04 14:50:52 -0500
commit82e271045ff3d336de74b88be7f8cdf90edcb5d8 (patch)
tree79c77cdec5a6e42edf04455f588d2b3d20317a40
parent724a1c55218d81fea4465a4380bec8408263f05b (diff)
downloadrt.equinox.framework-82e271045ff3d336de74b88be7f8cdf90edcb5d8.tar.gz
rt.equinox.framework-82e271045ff3d336de74b88be7f8cdf90edcb5d8.tar.xz
rt.equinox.framework-82e271045ff3d336de74b88be7f8cdf90edcb5d8.zip
bug 292273 - moving ppc64 to bin
-rw-r--r--bundles/org.eclipse.equinox.executable/target.build.properties2
-rw-r--r--bundles/org.eclipse.equinox.executable/target.build.xml2
-rw-r--r--releng/org.eclipse.equinox.launcher.releng/build.xml1
3 files changed, 4 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.executable/target.build.properties b/bundles/org.eclipse.equinox.executable/target.build.properties
index 05d7464bc..3db7a229d 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.properties
+++ b/bundles/org.eclipse.equinox.executable/target.build.properties
@@ -25,6 +25,8 @@ 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
+
root.macosx.carbon.ppc=bin/carbon/macosx/ppc
root.macosx.carbon.ppc.permissions.755=${launcherName}.app/Contents/MacOS/${launcherName}
diff --git a/bundles/org.eclipse.equinox.executable/target.build.xml b/bundles/org.eclipse.equinox.executable/target.build.xml
index 45e115939..1b2911758 100644
--- a/bundles/org.eclipse.equinox.executable/target.build.xml
+++ b/bundles/org.eclipse.equinox.executable/target.build.xml
@@ -149,6 +149,8 @@
<target name="rootFileslinux_gtk_ppc64">
<mkdir dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}"/>
<copy todir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" failonerror="true" overwrite="true">
+ <fileset dir="${basedir}/bin/gtk/linux/ppc64" includes="**" />
+ <fileset dir="${basedir}/gtk_root" includes="**" />
</copy>
<chmod perm="755" dir="${feature.base}/linux.gtk.ppc64/${collectingFolder}" includes="launcher" />
</target>
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml
index 59f8f5e2b..506bb882c 100644
--- a/releng/org.eclipse.equinox.launcher.releng/build.xml
+++ b/releng/org.eclipse.equinox.launcher.releng/build.xml
@@ -50,7 +50,6 @@
<equals arg1="s390x" arg2="${arch}" />
<equals arg1="motif.sparc" arg2="${ws}.${arch}" />
<equals arg1="win32.ia64" arg2="${ws}.${arch}" />
- <equals arg1="gtk.ppc64" arg2="${ws}.${arch}" /> <!-- linux.gtk.ppc64 is contributed until M5 -->
</or>
</condition>
</target>

Back to the top