Attachment 168986 Details for Bug 313414 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

313414.txt (text/plain), 10.74 KB, created by Kim Moir

on 2010-05-18 14:01:12 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2010-05-18 14:01:12 EDT

Size: 10.74 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rcp
>Index: feature.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.sdk-feature/features/org.eclipse.rcp/feature.xml,v
>retrieving revision 1.116
>diff -u -r1.116 feature.xml
>--- feature.xml	23 Apr 2010 14:30:40 -0000	1.116
>+++ feature.xml	18 May 2010 18:00:22 -0000
>@@ -226,6 +226,17 @@
>          version="0.0.0"
>          fragment="true"
>          unpack="false"/>
>+         
>+    <plugin
>+         id="org.eclipse.swt.gtk.linux.s390"
>+         os="linux"
>+         ws="gtk"
>+         arch="s390"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         fragment="true"
>+         unpack="false"/>
> 
>    <plugin
>          id="org.eclipse.swt.gtk.solaris.sparc"
>@@ -565,6 +576,16 @@
>          install-size="0"
>          version="0.0.0"
>          fragment="true"/>
>+         
>+   <plugin
>+         id="org.eclipse.equinox.launcher.gtk.linux.s390"
>+         os="linux"
>+         ws="gtk"
>+         arch="s390"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         fragment="true"/>
> 
>    <plugin
>          id="org.eclipse.equinox.launcher.motif.linux.x86"
>#P org.eclipse.releng.eclipsebuilder
>Index: buildAll.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/buildAll.xml,v
>retrieving revision 1.323
>diff -u -r1.323 buildAll.xml
>--- buildAll.xml	17 May 2010 18:16:45 -0000	1.323
>+++ buildAll.xml	18 May 2010 18:00:24 -0000
>@@ -527,6 +527,7 @@
> 			<config os="linux" ws="gtk" arch="ppc64" />
> 			<config os="linux" ws="motif" arch="x86" />
> 			<config os="linux" ws="gtk" arch="s390x" />
>+			<config os="linux" ws="gtk" arch="s390" />
> 			<config os="solaris" ws="gtk" arch="sparc" />
> 			<config os="solaris" ws="gtk" arch="x86" />
> 			<config os="macosx" ws="cocoa" arch="x86" />
>@@ -545,6 +546,7 @@
> 			<config os="linux" ws="gtk" arch="x86" />
> 			<config os="linux" ws="gtk" arch="x86_64" />
> 			<config os="linux" ws="gtk" arch="s390x" />
>+			<config os="linux" ws="gtk" arch="s390" />
> 			<config os="linux" ws="gtk" arch="ppc" />
> 			<config os="solaris" ws="gtk" arch="sparc" />
> 			<config os="solaris" ws="gtk" arch="x86" />
>@@ -565,6 +567,7 @@
> 			<config os="linux" ws="gtk" arch="ppc" />
> 			<config os="linux" ws="gtk" arch="ppc64" />
> 			<config os="linux" ws="gtk" arch="s390x" />
>+			<config os="linux" ws="gtk" arch="s390" />
> 			<config os="solaris" ws="gtk" arch="sparc" />
> 			<config os="solaris" ws="gtk" arch="x86" />
> 			<config os="macosx" ws="cocoa" arch="x86" />
>@@ -584,6 +587,7 @@
> 			<config os="linux" ws="gtk" arch="ppc" />
> 			<config os="linux" ws="gtk" arch="ppc64" />
> 			<config os="linux" ws="gtk" arch="s390x" />
>+			<config os="linux" ws="gtk" arch="s390" />
> 			<config os="solaris" ws="gtk" arch="sparc" />
> 			<config os="solaris" ws="gtk" arch="x86" />
> 			<config os="macosx" ws="cocoa" arch="x86" />
>@@ -602,6 +606,7 @@
> 			<config os="linux" ws="gtk" arch="x86_64" />
> 			<config os="linux" ws="gtk" arch="ppc" />
> 			<config os="linux" ws="gtk" arch="s390x" />
>+			<config os="linux" ws="gtk" arch="s390" />
> 			<config os="solaris" ws="gtk" arch="sparc" />
> 			<config os="solaris" ws="gtk" arch="x86" />
> 			<config os="macosx" ws="cocoa" arch="x86" />
>Index: eclipse/buildConfigs/master/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/master/build.properties,v
>retrieving revision 1.48
>diff -u -r1.48 build.properties
>--- eclipse/buildConfigs/master/build.properties	23 Apr 2010 14:30:41 -0000	1.48
>+++ eclipse/buildConfigs/master/build.properties	18 May 2010 18:00:24 -0000
>@@ -41,6 +41,7 @@
> 	linux, gtk, ppc64 & \
> 	linux, gtk, x86_64 &\
> 	linux, gtk, s390x &\
>+	linux, gtk, s390 &\
> 	linux, motif, x86 & \
> 	solaris, gtk, sparc & \
> 	solaris, gtk, x86 & \
>Index: eclipse/buildConfigs/org.eclipse.equinox.executable/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/org.eclipse.equinox.executable/build.properties,v
>retrieving revision 1.17
>diff -u -r1.17 build.properties
>--- eclipse/buildConfigs/org.eclipse.equinox.executable/build.properties	5 May 2010 13:42:35 -0000	1.17
>+++ eclipse/buildConfigs/org.eclipse.equinox.executable/build.properties	18 May 2010 18:00:24 -0000
>@@ -28,6 +28,7 @@
> 	linux, gtk, ppc64 & \
> 	linux, gtk, x86_64 &\
> 	linux, gtk, s390x &\
>+	linux, gtk, s390 &\
> 	linux, motif, x86 & \
> 	hpux, motif, ia64_32 & \
> 	solaris, gtk, x86 & \
>Index: eclipse/buildConfigs/rcp.config/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.config/build.properties,v
>retrieving revision 1.17
>diff -u -r1.17 build.properties
>--- eclipse/buildConfigs/rcp.config/build.properties	23 Apr 2010 14:30:41 -0000	1.17
>+++ eclipse/buildConfigs/rcp.config/build.properties	18 May 2010 18:00:24 -0000
>@@ -29,6 +29,8 @@
> root.linux.gtk.x86_64.permissions.755=*.so*
> root.linux.gtk.s390x=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.s390x,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/contributed/gtk/linux/s390x
> root.linux.gtk.s390x.permissions.755=*.so*
>+root.linux.gtk.s390=absolute:${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.s390,absolute:${buildDirectory}/features/org.eclipse.equinox.executable/contributed/gtk/linux/s390
>+root.linux.gtk.s390.permissions.755=*.so*
> 
> #root.linux.gtk.ia64=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/gtk/linux/ia64
> # Need to be fixed to reflect eventual change into feature.xml
>Index: eclipse/buildConfigs/sdk/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/build.properties,v
>retrieving revision 1.37
>diff -u -r1.37 build.properties
>--- eclipse/buildConfigs/sdk/build.properties	5 May 2010 20:40:44 -0000	1.37
>+++ eclipse/buildConfigs/sdk/build.properties	18 May 2010 18:00:24 -0000
>@@ -34,6 +34,7 @@
> 	linux, gtk, ppc64 & \
> 	linux, gtk, x86_64 &\
> 	linux, gtk, s390x &\
>+	linux, gtk, s390 &\
> 	linux, motif, x86 & \
> 	solaris, gtk, sparc & \
> 	solaris, gtk, x86 & \
>@@ -49,6 +50,7 @@
> 	linux, gtk, ppc64-tar & \
> 	linux, gtk, x86_64-tar &\
> 	linux, gtk, s390x-tar &\
>+	linux, gtk, s390-tar &\
> 	linux, motif, x86-tar & \
> 	solaris, gtk, sparc-zip & \
> 	solaris, motif, sparc-zip & \
>Index: eclipse/publishingFiles/testManifest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/publishingFiles/testManifest.xml,v
>retrieving revision 1.89
>diff -u -r1.89 testManifest.xml
>--- eclipse/publishingFiles/testManifest.xml	12 May 2010 01:53:52 -0000	1.89
>+++ eclipse/publishingFiles/testManifest.xml	18 May 2010 18:00:24 -0000
>@@ -10,6 +10,7 @@
> 	    <platform id="SLG2PPC" name="Linux (PPC/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-SDK-@build@-linux-gtk-ppc.tar.gz"></platform>	
> 	    <platform id="SLG2PPC64" name="Linux (PPC64/GTK 2) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-SDK-@build@-linux-gtk-ppc64.tar.gz"></platform>
> 	    <platform id="SLG2S390X" name="Linux (s390x/GTK 2) **early access** (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-SDK-@build@-linux-gtk-s390x.tar.gz"></platform>
>+	    <platform id="SLG2S390" name="Linux (s390/GTK 2) **early access** (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-SDK-@build@-linux-gtk-s390.tar.gz"></platform>
> 		<platform id="SSG" name="Solaris 10 (SPARC/GTK 2)" fileName="eclipse-SDK-@build@-solaris-gtk.zip"></platform>
> 		<platform id="SSGX" name="Solaris 10 (x86/GTK 2)" fileName="eclipse-SDK-@build@-solaris-gtk-x86.zip"></platform>
> 		<platform id="SSHPUX" name="HP-UX (IA64_32/Motif)" fileName="eclipse-SDK-@build@-hpux-motif-ia64_32.zip"></platform>		
>Index: equinox/buildConfigs/equinox.prov/run.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/equinox.prov/run.xml,v
>retrieving revision 1.175
>diff -u -r1.175 run.xml
>--- equinox/buildConfigs/equinox.prov/run.xml	12 May 2010 01:53:51 -0000	1.175
>+++ equinox/buildConfigs/equinox.prov/run.xml	18 May 2010 18:00:24 -0000
>@@ -46,6 +46,8 @@
> 		<mkdir dir="${p2.sdk.install.linux.gtk.ppc64}" />
> 		<property name="p2.sdk.install.linux.gtk.s390x" value="${p2.output.base}/sdk.install.linux.gtk.s390x" />
> 		<mkdir dir="${p2.sdk.install.linux.gtk.s390x}" />
>+		<property name="p2.sdk.install.linux.gtk.s390" value="${p2.output.base}/sdk.install.linux.gtk.s390" />
>+		<mkdir dir="${p2.sdk.install.linux.gtk.s390}" />
> 		<property name="p2.sdk.install.hpux.motif.ia64_32" value="${p2.output.base}/sdk.install.hpux.motif.ia64_32" />
> 		<mkdir dir="${p2.sdk.install.hpux.motif.ia64_32}" />
> 		<property name="p2.sdk.install.solaris.gtk.sparc" value="${p2.output.base}/sdk.install.solaris.gtk.sparc" />
>@@ -287,6 +289,18 @@
> 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
> 			<param name="p2.director.version" value="3.6.0.${buildId}" />
> 			<param name="p2.director.profile" value="SDKProfile" />
>+			<param name="p2.director.install.path" value="${p2.sdk.install.linux.gtk.s390}/eclipse" />
>+			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
>+			<param name="p2.os" value="linux" />
>+			<param name="p2.ws" value="gtk" />
>+			<param name="p2.arch" value="s390" />
>+			<param name="p2.repo" value="${buildRepo}" />
>+		</antcall>
>+
>+		<antcall target="run.director">
>+			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
>+			<param name="p2.director.version" value="3.6.0.${buildId}" />
>+			<param name="p2.director.profile" value="SDKProfile" />
> 			<param name="p2.director.install.path" value="${p2.sdk.install.linux.motif.x86}/eclipse" />
> 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
> 			<param name="p2.os" value="linux" />

Actions: View | Diff

Attachments on bug 313414: 168986 | 169162