Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Williams2013-01-24 10:52:35 -0500
committerDavid Williams2013-01-24 10:52:35 -0500
commitf4419ab7505e52ab179c8d02b3869ac4a0a75bd6 (patch)
treed623ea264b2845ffd67f24963e10111f3312cddf
parent32f4c4e16791d23682d5ad75bd1ac8358b708174 (diff)
downloadeclipse.platform.releng.aggregator-f4419ab7505e52ab179c8d02b3869ac4a0a75bd6.tar.gz
eclipse.platform.releng.aggregator-f4419ab7505e52ab179c8d02b3869ac4a0a75bd6.tar.xz
eclipse.platform.releng.aggregator-f4419ab7505e52ab179c8d02b3869ac4a0a75bd6.zip
Bug 398756 - [CBI] Carry PPC changes over to CBI scripts
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.p2.inf2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf5
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties2
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml19
-rw-r--r--eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf5
6 files changed, 30 insertions, 5 deletions
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties
index c859e0a4..e2a01eaf 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/osgistarter.config.launcher/build.properties
@@ -27,6 +27,8 @@ root.solaris.gtk.x86.permissions.755=eclipse
root.linux.gtk.x86=target/resources/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
+root.linux.gtk.ppc=target/resources/linux.gtk.ppc,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
+root.linux.gtk.ppc.permissions.755=eclipse
root.linux.gtk.ppc64=target/resources/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64
root.linux.gtk.ppc64.permissions.755=eclipse
root.linux.gtk.x86_64=target/resources/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.p2.inf
index 6ba05891..76f99a92 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform.sdk/platform.p2.inf
@@ -40,6 +40,6 @@ units.2.instructions.unconfigure=setProgramProperty(propName:osgi.instance.area.
# Restrict range so we are not an automatic update for 3.x.
update.id = org.eclipse.platform.sdk
-update.range = [4.0,4.3)
+update.range = [4.0,$version$)
update.severity = 0
update.description = An update for 4.x generation Eclipse SDK
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
index 471f0520..41361b9a 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/platform/platform.p2.inf
@@ -55,7 +55,8 @@ units.3.touchpoint.version=1.0.0
units.3.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
units.3.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
+# Restrict range so we are not an automatic update for 3.x.
update.id = org.eclipse.platform.ide
-update.range = [4.0,4.3)
+update.range = [4.0,$version$)
update.severity = 0
-update.description = Restrict range so we are not an update for 3.x.
+update.description = An update for 4.x generation Eclipse SDK.
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
index 2f5e9be3..74ede4be 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
@@ -27,6 +27,8 @@ root.solaris.gtk.x86.permissions.755=eclipse
root.linux.gtk.x86=target/resources/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
+root.linux.gtk.ppc=target/resources/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc
+root.linux.gtk.ppc.permissions.755=eclipse
root.linux.gtk.ppc64=target/resources/linux.gtk.ppc64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/ppc64
root.linux.gtk.ppc64.permissions.755=eclipse
root.linux.gtk.x86_64=target/resources/linux.gtk.x86_64,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86_64
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
index 9f1f06be..c6da42bc 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/pom.xml
@@ -60,6 +60,25 @@
</configuration>
</execution>
<execution>
+ <id>copy-resources-gtk.linux.ppc</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/resources/linux.gtk.ppc</outputDirectory>
+ <resources>
+ <resource>
+ <directory>../../eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.linux.ppc</directory>
+ <includes>
+ <include>about_files/*</include>
+ <include>about.html</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
<id>copy-resources-gtk.linux.ppc64</id>
<phase>validate</phase>
<goals>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
index 90fd73ec..6acc574c 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
+++ b/eclipse.platform.releng.tychoeclipsebuilder/sdk/sdk.p2.inf
@@ -89,7 +89,8 @@ units.5.touchpoint.version=1.0.0
units.5.instructions.configure=setProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo,propValue:true);
units.5.instructions.unconfigure=removeProgramProperty(propName:org.eclipse.swt.internal.gtk.useCairo);
+# Restrict range so we are not an automatic update for 3.x.
update.id= org.eclipse.sdk.ide
-update.range = [4.0,4.3)
+update.range = [4.0,$version$)
update.severity = 0
-update.description = Restrict range so we are not an update for 3.x.
+update.description = An update for 4.x generation Eclipse SDK.

Back to the top