Attachment 171450 Details for Bug 316056 – patches

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

[patch] patches

316056.txt (text/plain), 25.32 KB, created by Kim Moir

on 2010-06-08 15:12:34 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2010-06-08 15:12:34 EDT

Size: 25.32 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.releng.eclipsebuilder
>Index: bootstrapHudsone4.sh
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/bootstrapHudsone4.sh,v
>retrieving revision 1.22.2.1
>diff -u -r1.22.2.1 bootstrapHudsone4.sh
>--- bootstrapHudsone4.sh	7 Jun 2010 20:48:36 -0000	1.22.2.1
>+++ bootstrapHudsone4.sh	8 Jun 2010 19:11:39 -0000
>@@ -55,7 +55,8 @@
> #buildProjectTags=v20100527a
> #buildProjectTags=v20100528a
> #buildProjectTags=v20100528d
>-buildProjectTags=v20100607b
>+#buildProjectTags=v20100607b
>+buildProjectTags=v20100608a
> 
> #updateSite property setting
> updateSite=""
>Index: buildAll.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/buildAll.xml,v
>retrieving revision 1.334
>diff -u -r1.334 buildAll.xml
>--- buildAll.xml	2 Jun 2010 17:50:57 -0000	1.334
>+++ buildAll.xml	8 Jun 2010 19:11:39 -0000
>@@ -73,10 +73,10 @@
> 				<antcall target="packageEclipseDistributables" />
> 				<ant antfile="${equinox.build.configs}/equinox.prov/run.xml" />
> 				<antcall target="packageRepos" />
>-				<antcall target="packageEquinoxDistributables" />
>+			
> 				<antcall target="apiTooling" />
> 				<antcall target="publishEclipse" />
>-				<antcall target="publishEquinox" />
>+			
> 			</sequential>
> 			<antcall target="testEclipse" />
> 		</parallel>
>@@ -448,9 +448,9 @@
> 
> 	<target name="publishEclipse">
> 		<parallel>
>-			<ant antfile="eclipse/helper.xml" target="rSyncWithSnzZrh" />
>+			
> 			<sequential>
>-				<ant antfile="eclipse/helper.xml" target="buildStandAloneSWT" />
>+			
> 				<ant antfile="eclipse/helper.xml" target="publish" />
> 			</sequential>
> 		</parallel>
>@@ -525,11 +525,11 @@
> 			<config os="win32" ws="win32" arch="x86_64" />
> 			<config os="linux" ws="gtk" arch="x86" />
> 			<config os="linux" ws="gtk" arch="x86_64" />
>-			<config os="linux" ws="gtk" arch="ppc" />
>+			
> 			<config os="linux" ws="gtk" arch="ppc64" />
>-			<config os="linux" ws="motif" arch="x86" />
>+			
> 			<config os="solaris" ws="gtk" arch="sparc" />
> 			<config os="solaris" ws="gtk" arch="x86" />
> 			<config os="macosx" ws="cocoa" arch="x86" />
>@@ -547,9 +547,9 @@
> 			<config os="win32" ws="win32" arch="x86_64" />
> 			<config os="linux" ws="gtk" arch="x86" />
> 			<config os="linux" ws="gtk" arch="x86_64" />
>-			<config os="linux" ws="gtk" arch="s390x" />
>+		
> 			<config os="solaris" ws="gtk" arch="sparc" />
> 			<config os="solaris" ws="gtk" arch="x86" />
> 			<config os="macosx" ws="cocoa" arch="x86" />
>@@ -565,11 +565,11 @@
> 			<config os="win32" ws="win32" arch="x86" />
> 			<config os="win32" ws="win32" arch="x86_64" />
> 			<config os="linux" ws="gtk" arch="x86" />
>-			<config os="linux" ws="gtk" arch="x86_64" />
>-			<config os="linux" ws="gtk" arch="ppc" />
>+			<config os="linux" ws="gtk" arch="x86_64" />			
> 			<config os="linux" ws="gtk" arch="ppc64" />
>+			
> 			<config os="solaris" ws="gtk" arch="sparc" />
> 			<config os="solaris" ws="gtk" arch="x86" />
> 			<config os="macosx" ws="cocoa" arch="x86" />
>@@ -585,11 +585,11 @@
> 			<config os="win32" ws="win32" arch="x86" />
> 			<config os="win32" ws="win32" arch="x86_64" />
> 			<config os="linux" ws="gtk" arch="x86" />
>-			<config os="linux" ws="gtk" arch="x86_64" />
>-			<config os="linux" ws="gtk" arch="ppc" />
>+			<config os="linux" ws="gtk" arch="x86_64" />			
> 			<config os="linux" ws="gtk" arch="ppc64" />
>+			
> 			<config os="solaris" ws="gtk" arch="sparc" />
> 			<config os="solaris" ws="gtk" arch="x86" />
> 			<config os="macosx" ws="cocoa" arch="x86" />
>@@ -674,7 +674,7 @@
> 
> 	<target name="packageRepos">
> 		
>-		<ant antfile="${eclipse.build.configs}/repos/build.xml" />
>+	
> 		<ant antfile="${eclipse.build.configs}/repos/platformrepo.xml" />
> 		<ant antfile="${eclipse.build.configs}/repos/rcprepo.xml" />
> 		<ant antfile="${eclipse.build.configs}/rcp.deltapack/build.xml" />
>Index: eclipse/publishingFiles/testManifest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/publishingFiles/testManifest.xml,v
>retrieving revision 1.90
>diff -u -r1.90 testManifest.xml
>--- eclipse/publishingFiles/testManifest.xml	19 May 2010 13:52:49 -0000	1.90
>+++ eclipse/publishingFiles/testManifest.xml	8 Jun 2010 19:11:39 -0000
>@@ -5,12 +5,12 @@
> 		<platform id="SW" name="Windows (&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@-win32.zip"></platform>
> 		<platform id="SWX8664" name="Windows (x86_64) (&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@-win32-x86_64.zip"></platform>		
> 		<platform id="SLG2" name="Linux (x86/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.tar.gz"></platform>
>-		<platform id="SLM" name="Linux (x86/Motif) **testing only**" fileName="eclipse-SDK-@build@-linux-motif.tar.gz"></platform>
>+		
> 		<platform id="SLG264" name="Linux (x86_64/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-x86_64.tar.gz"></platform>
>-	    <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>		
>@@ -23,7 +23,7 @@
> 		<platform id="SAA" name='Source Build (Source fetched via CVS) (&lt;a href="srcFetchBuildInstructions.html">instructions&lt;/a>)' fileName="eclipse-sourceBuild-srcFetch-@build@.zip"></platform>
> 	</zipType>
> 
>-	<zipType name="JUnit test plug-ins">
>+
> 
> 	<zipType name="Platform Runtime Binary">
> 		<platform id="PW" name="Windows (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-@build@-win32.zip"></platform>
> 		<platform id="PWX8664" name="Windows (x86_64) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-@build@-win32-x86_64.zip"></platform>		
> 		<platform id="PLG2" name="Linux (x86/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-platform-@build@-linux-gtk.tar.gz"></platform>
> 		<platform id="PLG264" name="Linux (x86_64/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-platform-@build@-linux-gtk-x86_64.tar.gz"></platform>
>-		<platform id="PLG2PPC" 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-platform-@build@-linux-gtk-ppc.tar.gz"></platform>
>+	
> 		<platform id="PLG2PPC64" 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-platform-@build@-linux-gtk-ppc64.tar.gz"></platform>
> 		<platform id="PSG" name="Solaris 10 (SPARC/GTK 2)" fileName="eclipse-platform-@build@-solaris-gtk.zip"></platform>
> 		<platform id="PSGX" name="Solaris 10 (x86/GTK 2)" fileName="eclipse-platform-@build@-solaris-gtk-x86.zip"></platform>
>@@ -71,7 +71,7 @@
> 		<platform id="PWSDKX8664" name="Windows (x86_64) (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-SDK-@build@-win32-x86_64.zip"></platform>
> 		<platform id="PLG2SDK" name="Linux (x86/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-platform-SDK-@build@-linux-gtk.tar.gz"></platform>
> 		<platform id="PLG264SDK" name="Linux (x86_64 64/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-platform-SDK-@build@-linux-gtk-x86_64.tar.gz"></platform>
>-		<platform id="PLG2PPCSDK" 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-platform-SDK-@build@-linux-gtk-ppc.tar.gz"></platform>
>+	
> 		<platform id="PSGSDK" name="Solaris 10 (SPARC/GTK 2)" fileName="eclipse-platform-SDK-@build@-solaris-gtk.zip"></platform>
> 		<platform id="PSGSDKX" name="Solaris 10 (x86/GTK 2)" fileName="eclipse-platform-SDK-@build@-solaris-gtk-x86.zip"></platform>
> 		<platform id="PHPUXSDK" name="HPUX (IA64_32/Motif)" fileName="eclipse-platform-SDK-@build@-hpux-motif-ia64_32.zip"></platform>
>@@ -83,7 +83,7 @@
> 		<platform id="PLSR" name="&lt;img src = &quot;repo.gif&quot;> Platform Source Repo " fileName="org.eclipse.platform.source-@build@.zip"></platform>
> 	</zipType>
> 
>-	<zipType name="JDT Runtime Binary">
>+	
> 
> </zipTypes>
> 
>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.177
>diff -u -r1.177 run.xml
>--- equinox/buildConfigs/equinox.prov/run.xml	19 May 2010 17:43:33 -0000	1.177
>+++ equinox/buildConfigs/equinox.prov/run.xml	8 Jun 2010 19:11:40 -0000
>@@ -36,18 +36,18 @@
> 		<mkdir dir="${p2.sdk.install.win32.win32.x86_64}" />
> 		<property name="p2.sdk.install.linux.gtk.x86" value="${p2.output.base}/sdk.install.linux.gtk.x86" />
> 		<mkdir dir="${p2.sdk.install.linux.gtk.x86}" />
>-		<property name="p2.sdk.install.linux.motif.x86" value="${p2.output.base}/sdk.install.linux.motif.x86" />
>-		<mkdir dir="${p2.sdk.install.linux.motif.x86}" />
>+		
> 		<property name="p2.sdk.install.linux.gtk.x86_64" value="${p2.output.base}/sdk.install.linux.gtk.x86_64" />
> 		<mkdir dir="${p2.sdk.install.linux.gtk.x86_64}" />
>-		<property name="p2.sdk.install.linux.gtk.ppc" value="${p2.output.base}/sdk.install.linux.gtk.ppc" />
>-		<mkdir dir="${p2.sdk.install.linux.gtk.ppc}" />
>+		
> 		<property name="p2.sdk.install.linux.gtk.ppc64" value="${p2.output.base}/sdk.install.linux.gtk.ppc64" />
> 		<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" />
>+
> 		<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" />
>@@ -72,8 +72,8 @@
> 		<mkdir dir="${p2.platform.install.linux.gtk.x86}" />
> 		<property name="p2.platform.install.linux.gtk.x86_64" value="${p2.output.base}/platform.install.linux.gtk.x86_64" />
> 		<mkdir dir="${p2.platform.install.linux.gtk.x86_64}" />
>-		<property name="p2.platform.install.linux.gtk.ppc" value="${p2.output.base}/platform.install.linux.gtk.ppc" />
>-		<mkdir dir="${p2.platform.install.linux.gtk.ppc}" />
>+		
> 		<property name="p2.platform.install.linux.gtk.ppc64" value="${p2.output.base}/platform.install.linux.gtk.ppc64" />
> 		<mkdir dir="${p2.platform.install.linux.gtk.ppc64}" />
> 		<property name="p2.platform.install.hpux.motif.ia64_32" value="${p2.output.base}/platform.install.hpux.motif.ia64_32" />
>@@ -100,8 +100,8 @@
> 		<mkdir dir="${p2.platformsdk.install.linux.gtk.x86}" />
> 		<property name="p2.platformsdk.install.linux.gtk.x86_64" value="${p2.output.base}/platformsdk.install.linux.gtk.x86_64" />
> 		<mkdir dir="${p2.platformsdk.install.linux.gtk.x86_64}" />
>-		<property name="p2.platformsdk.install.linux.gtk.ppc" value="${p2.output.base}/platformsdk.install.linux.gtk.ppc" />
>-		<mkdir dir="${p2.platformsdk.install.linux.gtk.ppc}" />
>+		
> 		<property name="p2.platformsdk.install.linux.gtk.ppc64" value="${p2.output.base}/platformsdk.install.linux.gtk.ppc64" />
> 		<mkdir dir="${p2.platformsdk.install.linux.gtk.ppc64}" />
> 		<property name="p2.platformsdk.install.hpux.motif.ia64_32" value="${p2.output.base}/platformsdk.install.hpux.motif.ia64_32" />
>@@ -249,7 +249,7 @@
> 			<param name="p2.repo" value="${buildRepo}" />
> 		</antcall>
> 
>-		<antcall target="run.director">
>+	
> 
> 		<antcall target="run.director">
> 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
>@@ -273,7 +273,7 @@
> 			<param name="p2.repo" value="${buildRepo}" />
> 		</antcall>
> 
>-		<antcall target="run.director">
>+		
> 
>-		<antcall target="run.director">
>+		
> 
> 		<antcall target="run.director">
> 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
>@@ -444,7 +444,7 @@
> 			<param name="p2.repo" value="${buildRepo}" />
> 		</antcall>
> 
>-		<antcall target="run.director">
>+	
> 
> 		<antcall target="run.director">
> 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
>@@ -603,7 +603,7 @@
> 			<param name="p2.repo" value="${buildRepo}" />
> 		</antcall>
> 
>-		<antcall target="run.director">
>+		
> 
> 		<antcall target="run.director">
> 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
>@@ -833,13 +833,13 @@
> 				</antcall>
> 
> 				
>-				<antcall target="p2.tar">
>+			
> 
> 				
> 				<antcall target="p2.tar">
>@@ -904,22 +904,22 @@
> 				</antcall>
> 
> 				
>-				<antcall target="p2.tar">
>+				
> 
> 				
>-				<antcall target="p2.tar">
>+			
> 
> 				
> 				<antcall target="p2.tar">
>@@ -960,13 +960,13 @@
> 					<param name="archiveName" value="eclipse-platform-${buildId}-linux-gtk.tar.gz" />
> 				</antcall>
> 				
>-				<antcall target="p2.tar">
>+			
> 				
> 				<antcall target="p2.tar">
> 					<param name="tar.base.dir" value="${p2.platform.install.linux.gtk.ppc64}" />
>@@ -1078,13 +1078,13 @@
> 					<param name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-gtk.tar.gz" />
> 				</antcall>
> 				
>-				<antcall target="p2.tar">
>+			
> 				
> 				<antcall target="p2.tar">
> 					<param name="tar.base.dir" value="${p2.platformsdk.install.linux.gtk.ppc64}" />

Actions: View | Diff

Attachments on bug 316056: 171335 | 171450 | 171572 | 171752