Attachment 157461 Details for Bug 293830 – patch to remove wpf platforms from build

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

[patch] patch to remove wpf platforms from build

293830wpf.txt (text/plain), 37.30 KB, created by Kim Moir

on 2010-01-27 15:20:39 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2010-01-27 15:20:39 EST

Size: 37.30 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.114
>diff -u -r1.114 feature.xml
>--- feature.xml	6 Nov 2009 20:11:33 -0000	1.114
>+++ feature.xml	27 Jan 2010 20:19:14 -0000
>@@ -206,17 +206,6 @@
>          unpack="false"/>
> 
>    <plugin
>-         id="org.eclipse.swt.wpf.win32.x86"
>-         os="win32"
>-         ws="wpf"
>-         arch="x86"
>-         download-size="0"
>-         install-size="0"
>-         version="0.0.0"
>-         fragment="true"
>-         unpack="false"/>
>-
>-   <plugin
>          id="org.eclipse.swt.gtk.linux.x86"
>          os="linux"
>          ws="gtk"
>@@ -595,17 +584,7 @@
>          install-size="0"
>          version="0.0.0"
>          fragment="true"/>  
>-
>-   <plugin
>-         id="org.eclipse.equinox.launcher.wpf.win32.x86"
>-         os="win32"
>-         ws="wpf"
>-         arch="x86"
>-         download-size="0"
>-         install-size="0"
>-         version="0.0.0"
>-         fragment="true"/>
>-
>+ 
>    <plugin
>          id="org.eclipse.equinox.launcher.win32.win32.x86"
>          os="win32"
>#P org.eclipse.releng
>Index: maps/swt.map
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng/maps/swt.map,v
>retrieving revision 1.901
>diff -u -r1.901 swt.map
>--- maps/swt.map	26 Jan 2010 23:17:45 -0000	1.901
>+++ maps/swt.map	27 Jan 2010 20:19:15 -0000
>@@ -20,7 +20,6 @@
> fragment@org.eclipse.swt.photon.qnx.x86=v3631,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
> fragment@org.eclipse.swt.win32.wce_ppc.arm=v3631,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
> fragment@org.eclipse.swt.win32.win32.x86=v3631,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
>-fragment@org.eclipse.swt.wpf.win32.x86=v3631,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
> fragment@org.eclipse.swt.win32.win32.x86_64=v3631,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
> fragment@org.eclipse.swt.win32.win32.ia64=v3631,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
> 
>#P org.eclipse.releng.eclipsebuilder
>Index: buildAll.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/buildAll.xml,v
>retrieving revision 1.306
>diff -u -r1.306 buildAll.xml
>--- buildAll.xml	24 Jan 2010 20:15:16 -0000	1.306
>+++ buildAll.xml	27 Jan 2010 20:19:16 -0000
>@@ -501,7 +501,6 @@
> 		<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/sdk/builder/sdk.product" compress="true">
> 			<config os="win32" ws="win32" arch="x86" />
> 			<config os="win32" ws="win32" arch="x86_64" />
>-			<config os="win32" ws="wpf" arch="x86" />
> 			<config os="linux" ws="gtk" arch="x86" />
> 			<config os="linux" ws="gtk" arch="x86_64" />
> 			<config os="linux" ws="gtk" arch="ppc" />
>@@ -521,8 +520,7 @@
> 
> 		<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/platform/platform.product" compress="true">
> 			<config os="win32" ws="win32" arch="x86" />
>-			<config os="win32" ws="win32" arch="x86_64" />
>-			<config os="win32" ws="wpf" 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" />
>@@ -539,8 +537,7 @@
> 
> 		<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/platform.sdk/platform.product" compress="true">
> 			<config os="win32" ws="win32" arch="x86" />
>-			<config os="win32" ws="win32" arch="x86_64" />
>-			<config os="win32" ws="wpf" 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" />
>@@ -558,8 +555,7 @@
> 
> 		<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/rcp/rcp.product" compress="true">
> 			<config os="win32" ws="win32" arch="x86" />
>-			<config os="win32" ws="win32" arch="x86_64" />
>-			<config os="win32" ws="wpf" 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" />
>@@ -577,8 +573,7 @@
> 
> 		<p2.publish.product flavor="tooling" repository="file:${reposource}" productFile="${eclipse.build.configs}/rcp.sdk/rcp.product" compress="true">
> 			<config os="win32" ws="win32" arch="x86" />
>-			<config os="win32" ws="win32" arch="x86_64" />
>-			<config os="win32" ws="wpf" 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" />
>Index: eclipse/buildConfigs/master/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/master/build.properties,v
>retrieving revision 1.45
>diff -u -r1.45 build.properties
>--- eclipse/buildConfigs/master/build.properties	20 Nov 2009 21:03:35 -0000	1.45
>+++ eclipse/buildConfigs/master/build.properties	27 Jan 2010 20:19:16 -0000
>@@ -33,7 +33,6 @@
> parallelCompilation=true
> configs=\
> 	win32, win32, x86 &\
>-	win32, wpf, x86 &\
> 	win32, win32, x86_64 &\
> 	wce_ppc, win32, arm &\
> 	linux, 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.15
>diff -u -r1.15 build.properties
>--- eclipse/buildConfigs/org.eclipse.equinox.executable/build.properties	4 Nov 2009 16:46:58 -0000	1.15
>+++ eclipse/buildConfigs/org.eclipse.equinox.executable/build.properties	27 Jan 2010 20:19:16 -0000
>@@ -22,7 +22,6 @@
> collBase=.
> 
> configs=win32, win32, x86 &\
>-	win32, wpf, x86 &\
> 	win32, win32, x86_64 &\
> 	linux, gtk, x86 & \
> 	linux, gtk, ppc & \
>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.14
>diff -u -r1.14 build.properties
>--- eclipse/buildConfigs/rcp.config/build.properties	6 Nov 2009 14:35:58 -0000	1.14
>+++ eclipse/buildConfigs/rcp.config/build.properties	27 Jan 2010 20:19:16 -0000
>@@ -12,7 +12,6 @@
> root.permissions.755=eclipse
> root.win32.win32.x86=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/win32/win32/x86
> root.win32.win32.x86_64=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/win32/win32/x86_64
>-root.win32.wpf.x86=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/wpf/win32/x86
> root.aix.motif.ppc=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/motif/aix/ppc
> #root.hpux.motif.PA_RISC=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/motif/hpux/PA_RISC
> root.hpux.motif.ia64_32=absolute:${buildDirectory}/features/org.eclipse.equinox.executable/bin/motif/hpux/ia64_32
>Index: eclipse/buildConfigs/sdk.tests/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/build.properties,v
>retrieving revision 1.28
>diff -u -r1.28 build.properties
>--- eclipse/buildConfigs/sdk.tests/build.properties	20 Nov 2009 21:03:34 -0000	1.28
>+++ eclipse/buildConfigs/sdk.tests/build.properties	27 Jan 2010 20:19:17 -0000
>@@ -42,8 +42,7 @@
> # By default the value is *,*,*
> configs = *, *, *
> #configs=win32, win32, x86 & \
>-#	win32,win32,x86_64 & \
>-#	win32,win32,wpf & \
>+#	win32,win32,x86_64 & \S
> #	linux, gtk, ppc & \
> #	linux, gtk, x86 & \
> #	linux, gtk, x86_64 & \
>Index: eclipse/buildConfigs/sdk.tests/testScripts/test.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts/test.xml,v
>retrieving revision 1.93
>diff -u -r1.93 test.xml
>--- eclipse/buildConfigs/sdk.tests/testScripts/test.xml	18 Jan 2010 18:40:11 -0000	1.93
>+++ eclipse/buildConfigs/sdk.tests/testScripts/test.xml	27 Jan 2010 20:19:17 -0000
>@@ -167,14 +167,7 @@
> 				<equals arg1="${ws}" arg2="win32" />
> 				<equals arg1="${arch}" arg2="x86" />
> 			</and>
>-		</condition>
>-		<condition property="runtimeArchive" value="eclipse-SDK-${buildId}-win32-wpf.zip">
>-			<and>
>-				<equals arg1="${os}" arg2="win32" />
>-				<equals arg1="${ws}" arg2="wpf" />
>-				<equals arg1="${arch}" arg2="x86" />
>-			</and>
>-		</condition>
>+		</condition>		
> 		<condition property="runtimeArchive" value="eclipse-SDK-${buildId}-win32-x86_64.zip">
> 			<and>
> 				<equals arg1="${os}" arg2="win32" />
>Index: eclipse/buildConfigs/sdk/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/build.properties,v
>retrieving revision 1.34
>diff -u -r1.34 build.properties
>--- eclipse/buildConfigs/sdk/build.properties	6 Nov 2009 14:35:58 -0000	1.34
>+++ eclipse/buildConfigs/sdk/build.properties	27 Jan 2010 20:19:16 -0000
>@@ -26,7 +26,6 @@
> configs=\
> 	win32, win32, x86 &\
> 	win32, win32, x86_64 &\
>-	win32, wpf, x86 &\
> 	macosx, carbon, x86 & \
> 	macosx, cocoa, x86 & \
> 	macosx, cocoa, x86_64 & \
>@@ -45,7 +44,6 @@
> archivesFormat =\
> 	win32, win32, x86-zip &\
> 	win32, win32, x86_64-zip &\
>-	win32, wpf, x86-zip &\
> 	linux, gtk, x86-tar & \
> 	linux, gtk, ppc64-tar & \
> 	linux, gtk, x86_64-tar &\
>Index: eclipse/buildConfigs/sdk/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/customTargets.xml,v
>retrieving revision 1.97
>diff -u -r1.97 customTargets.xml
>--- eclipse/buildConfigs/sdk/customTargets.xml	20 Nov 2009 21:03:34 -0000	1.97
>+++ eclipse/buildConfigs/sdk/customTargets.xml	27 Jan 2010 20:19:16 -0000
>@@ -33,12 +33,7 @@
> 		<property name="archiveName" value="eclipse-SDK-${buildId}-win32-x86_64.zip" />
> 		<antcall target="assemble" />
> 	</target>
>-
>-	<target name="assemble.org.eclipse.sdk.win32.wpf.x86">
>-		<property name="archiveName" value="eclipse-SDK-${buildId}-win32-wpf.zip" />
>-		<antcall target="assemble" />
>-	</target>
>-
>+	
> 	<target name="assemble.org.eclipse.sdk.linux.motif.x86">
> 		<property name="archiveName" value="eclipse-SDK-${buildId}-linux-motif.tar.gz" />
> 		<antcall target="assemble" />
>Index: eclipse/buildConfigs/sdk/oldsrcBuild/build
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/oldsrcBuild/build,v
>retrieving revision 1.2
>diff -u -r1.2 build
>--- eclipse/buildConfigs/sdk/oldsrcBuild/build	23 Jul 2009 13:35:54 -0000	1.2
>+++ eclipse/buildConfigs/sdk/oldsrcBuild/build	27 Jan 2010 20:19:17 -0000
>@@ -52,7 +52,7 @@
>         exit 1
> fi
> 
>-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32"]  || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86_64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ]
>+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32"]  || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "macosx-carbon-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86_64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] || [ "$os-$ws-$arch" = "linux-gtk-s390" ] || [ "$os-$ws-$arch" = "linux-gtk-s390x" ]
> then
>                 ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH
>                 ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml -propertyfile build.properties
>Index: eclipse/buildConfigs/sdk/oldsrcBuild/build.bat
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/oldsrcBuild/build.bat,v
>retrieving revision 1.2
>diff -u -r1.2 build.bat
>--- eclipse/buildConfigs/sdk/oldsrcBuild/build.bat	23 Jul 2009 13:35:54 -0000	1.2
>+++ eclipse/buildConfigs/sdk/oldsrcBuild/build.bat	27 Jan 2010 20:19:17 -0000
>@@ -30,7 +30,6 @@
> if x%ws%==x goto usage 
> if x%arch%==x goto usage
> if %installOs%-%ws%-%arch%==win32-win32-x86 goto run
>-if %installOs%-%ws%-%arch%==win32-wpf-x86 goto run
> if %installOs%-%ws%-%arch%==linux-motif-x86 goto run
> if %installOs%-%ws%-%arch%==linux-gtk-x86 goto run
> if %installOs%-%ws%-%arch%==linux-gtk-ppc goto run
>Index: eclipse/buildConfigs/sdk/oldsrcBuild/fetch/instructions.html
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/oldsrcBuild/fetch/instructions.html,v
>retrieving revision 1.1
>diff -u -r1.1 instructions.html
>--- eclipse/buildConfigs/sdk/oldsrcBuild/fetch/instructions.html	10 Jun 2009 17:41:10 -0000	1.1
>+++ eclipse/buildConfigs/sdk/oldsrcBuild/fetch/instructions.html	27 Jan 2010 20:19:17 -0000
>@@ -75,12 +75,7 @@
>     <td width="48%">win32</td>
>     <td width="52%">win32</td>
>     <td width="52%">x86</td>
>-  </tr>
>-  <tr> 
>-    <td width="48%">win32</td>
>-    <td width="52%">wpf</td>
>-    <td width="52%">x86</td>
>-  </tr>
>+  </tr> 
>   <tr> 
>     <td width="48%">linux</td>
>     <td width="52%">gtk</td>
>Index: eclipse/buildConfigs/sdk/oldsrcBuild/incl/instructions.html
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/oldsrcBuild/incl/instructions.html,v
>retrieving revision 1.1
>diff -u -r1.1 instructions.html
>--- eclipse/buildConfigs/sdk/oldsrcBuild/incl/instructions.html	10 Jun 2009 17:41:10 -0000	1.1
>+++ eclipse/buildConfigs/sdk/oldsrcBuild/incl/instructions.html	27 Jan 2010 20:19:17 -0000
>@@ -86,12 +86,7 @@
>     <td width="48%">win32</td>
>     <td width="52%">win32</td>
>     <td width="52%">x86</td>
>-  </tr>
>-  <tr> 
>-    <td width="48%">win32</td>
>-    <td width="52%">wpf</td>
>-    <td width="52%">x86</td>
>-  </tr>
>+  </tr> 
>   <tr> 
>     <td width="48%">linux</td>
>     <td width="52%">gtk</td>
>Index: eclipse/buildConfigs/sdk/srcBuild/build
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build,v
>retrieving revision 1.31
>diff -u -r1.31 build
>--- eclipse/buildConfigs/sdk/srcBuild/build	6 Nov 2009 14:35:58 -0000	1.31
>+++ eclipse/buildConfigs/sdk/srcBuild/build	27 Jan 2010 20:19:17 -0000
>@@ -52,7 +52,7 @@
>         exit 1
> fi
> 
>-if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32"]  || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-wpf-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86_64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] 
>+if [ "$os-$ws-$arch" = "linux-motif-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86" ] || [ "$os-$ws-$arch" = "linux-gtk-x86_64" ] || [ "$os-$ws-$arch" = "solaris-motif-sparc" ] || [ "$os-$ws-$arch" = "solaris-gtk-x86" ] || [ "$os-$ws-$arch" = "solaris-gtk-sparc" ] || [ "$os-$ws-$arch" = "aix-motif-ppc" ] || [ "$os-$ws-$arch" = "hpux-motif-PA_RISC" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32"]  || [ "$os-$ws-$arch" = "qnx-photon-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86" ] || [ "$os-$ws-$arch" = "win32-win32-x86_64" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc" ] || [ "$os-$ws-$arch" = "linux-gtk-ppc64" ] || [ "$os-$ws-$arch" = "macosx-carbon-ppc" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86" ] || [ "$os-$ws-$arch" = "macosx-cocoa-x86_64" ] || [ "$os-$ws-$arch" = "hpux-motif-ia64_32" ] 
> then
> 			          
>                  if [ ! -r eclipse ]
>Index: eclipse/helper.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/helper.xml,v
>retrieving revision 1.139
>diff -u -r1.139 helper.xml
>--- eclipse/helper.xml	11 Nov 2009 14:16:00 -0000	1.139
>+++ eclipse/helper.xml	27 Jan 2010 20:19:16 -0000
>@@ -55,12 +55,7 @@
> 			</sequential>
> 		</parallel>
> 		<parallel failonany="true">
>-			<sequential>
>-				<antcall target="packageSwtStandalone">
>-					<param name="ws" value="wpf" />
>-					<param name="os" value="win32" />
>-					<param name="arch" value="x86" />
>-				</antcall>
>+			<sequential>			
> 				<antcall target="packageSwtStandalone">
> 					<param name="os" value="linux" />
> 					<param name="ws" value="motif" />
>Index: eclipse/publishingFiles/testManifest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/publishingFiles/testManifest.xml,v
>retrieving revision 1.87
>diff -u -r1.87 testManifest.xml
>--- eclipse/publishingFiles/testManifest.xml	11 Nov 2009 15:01:11 -0000	1.87
>+++ eclipse/publishingFiles/testManifest.xml	27 Jan 2010 20:19:17 -0000
>@@ -3,8 +3,7 @@
> <zipTypes>
> 	<zipType name="Eclipse SDK">
> 		<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="SWWPF" name="Windows (x86/WPF)  **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@-win32-wpf.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>
>@@ -50,7 +49,6 @@
> 	<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="PWWPF" name="Windows (x86/WPF)  **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-platform-@build@-win32-wpf.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>
>@@ -69,7 +67,6 @@
> 	<zipType name="Platform SDK">
> 		<platform id="PWSDK" 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-SDK-@build@-win32.zip"></platform>
> 		<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="PWSDKWPF" name="Windows (x86/WPF)  **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-platform-SDK-@build@-win32-wpf.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>
>@@ -121,8 +118,7 @@
> 
> 	<zipType name="SWT">
> 		<platform id="SWTW" name="Windows (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="swt-@build@-win32-win32-x86.zip"></platform>
>-		<platform id="SWTWX86_64" 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="swt-@build@-win32-win32-x86_64.zip"></platform>		
>-		<platform id="SWTWWPF" name="Windows (x86/WPF)  **early access** (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="swt-@build@-wpf-win32-x86.zip"></platform>		
>+		<platform id="SWTWX86_64" 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="swt-@build@-win32-win32-x86_64.zip"></platform>				
> 		<platform id="SWTWCE" name="Windows CE (ARM PocketPC) (&lt;a href=&quot;http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/platform-swt-home/faq.html#pocketpclibrary&quot;>Instructions&lt;/a>)" fileName="swt-@build@-win32-wce_ppc-arm-j2se.zip"></platform>
> 		<platform id="SWTWCEJ" name="Windows CE (ARM PocketPC, J2ME profile) (&lt;a href=&quot;http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/platform-swt-home/faq.html#pocketpclibrary&quot;>Instructions&lt;/a>)" fileName="swt-@build@-win32-wce_ppc-arm-j2me.zip"></platform>
> 		<platform id="SWTLG2" 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="swt-@build@-gtk-linux-x86.zip"></platform>
>@@ -348,8 +344,7 @@
> 	</logFile>
> 
> 	<logFile name="plugins\org.eclipse.swt.win32_*\ws\win32\swt.jar.bin.xml" type="compile">
>-		<effectedFile id="SW"></effectedFile>
>-		<effectedFile id="SWPF"></effectedFile>
>+		<effectedFile id="SW"></effectedFile>		
> 		<effectedFile id="PW"></effectedFile>
> 		<effectedFile id="PWSDK"></effectedFile>
> 		<effectedFile id="SWTW"></effectedFile>
>Index: equinox/buildConfigs/equinox-launchers/build.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml,v
>retrieving revision 1.7
>diff -u -r1.7 build.xml
>--- equinox/buildConfigs/equinox-launchers/build.xml	4 Nov 2009 16:46:57 -0000	1.7
>+++ equinox/buildConfigs/equinox-launchers/build.xml	27 Jan 2010 20:19:17 -0000
>@@ -14,8 +14,7 @@
> 	<target name="equinoxlaunchers">
> 		<property name="archiveRoot" value="launchers" />
> 		<buildRepos os="win32" ws="win32" arch="x86" archiveName="${archiveRoot}-win32.win32.x86.${buildId}.zip" />
>-		<buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" />
>-		<buildRepos os="win32" ws="wpf" arch="x86" archiveName="${archiveRoot}-win32.wpf.x86.${buildId}.zip" />
>+		<buildRepos os="win32" ws="win32" arch="x86_64" archiveName="${archiveRoot}-win32.win32.x86_64.${buildId}.zip" />		
> 		<buildRepos os="linux" ws="gtk" arch="x86" archiveName="${archiveRoot}-linux.gtk.x86.${buildId}.tar.gz" />
> 		<buildRepos os="linux" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-linux.gtk.x86_64.${buildId}.tar.gz" />
> 		<buildRepos os="linux" ws="gtk" arch="ppc" archiveName="${archiveRoot}-linux.gtk.ppc.${buildId}.tar.gz" />
>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.173
>diff -u -r1.173 run.xml
>--- equinox/buildConfigs/equinox.prov/run.xml	26 Jan 2010 15:20:58 -0000	1.173
>+++ equinox/buildConfigs/equinox.prov/run.xml	27 Jan 2010 20:19:17 -0000
>@@ -34,8 +34,6 @@
> 		<mkdir dir="${p2.sdk.install.win32.win32.x86}" />
> 		<property name="p2.sdk.install.win32.win32.x86_64" value="${p2.output.base}/sdk.install.win32.win32.x86_64" />
> 		<mkdir dir="${p2.sdk.install.win32.win32.x86_64}" />
>-		<property name="p2.sdk.install.win32.wpf.x86" value="${p2.output.base}/sdk.install.win32.wpf.x86" />
>-		<mkdir dir="${p2.sdk.install.win32.wpf.x86}" />
> 		<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" />
>@@ -66,8 +64,6 @@
> 		<mkdir dir="${p2.platform.install.win32.win32.x86}" />
> 		<property name="p2.platform.install.win32.win32.x86_64" value="${p2.output.base}/platform.install.win32.win32.x86_64" />
> 		<mkdir dir="${p2.platform.install.win32.win32.x86_64}" />
>-		<property name="p2.platform.install.win32.wpf.x86" value="${p2.output.base}/platform.install.win32.wpf.x86" />
>-		<mkdir dir="${p2.platform.install.win32.wpf.x86}" />
> 		<property name="p2.platform.install.linux.gtk.x86" value="${p2.output.base}/platform.install.linux.gtk.x86" />
> 		<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" />
>@@ -96,8 +92,6 @@
> 		<mkdir dir="${p2.platformsdk.install.win32.win32.x86}" />
> 		<property name="p2.platformsdk.install.win32.win32.x86_64" value="${p2.output.base}/platformsdk.install.win32.win32.x86_64" />
> 		<mkdir dir="${p2.platformsdk.install.win32.win32.x86_64}" />
>-		<property name="p2.platformsdk.install.win32.wpf.x86" value="${p2.output.base}/platformsdk.install.win32.wpf.x86" />
>-		<mkdir dir="${p2.platformsdk.install.win32.wpf.x86}" />
> 		<property name="p2.platformsdk.install.linux.gtk.x86" value="${p2.output.base}/platformsdk.install.linux.gtk.x86" />
> 		<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" />
>@@ -243,18 +237,6 @@
> 			<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.win32.wpf.x86}/eclipse" />
>-			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
>-			<param name="p2.os" value="win32" />
>-			<param name="p2.ws" value="wpf" />
>-			<param name="p2.arch" value="x86" />
>-			<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.gtk.x86}/eclipse" />
> 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
> 			<param name="p2.os" value="linux" />
>@@ -426,18 +408,6 @@
> 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
> 			<param name="p2.director.version" value="3.6.0.${buildId}" />
> 			<param name="p2.director.profile" value="PlatformProfile" />
>-			<param name="p2.director.install.path" value="${p2.platform.install.win32.wpf.x86}/eclipse" />
>-			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
>-			<param name="p2.os" value="win32" />
>-			<param name="p2.ws" value="wpf" />
>-			<param name="p2.arch" value="x86" />
>-			<param name="p2.repo" value="${buildRepo}" />
>-		</antcall>
>-
>-		<antcall target="run.director">
>-			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
>-			<param name="p2.director.version" value="3.6.0.${buildId}" />
>-			<param name="p2.director.profile" value="PlatformProfile" />
> 			<param name="p2.director.install.path" value="${p2.platform.install.linux.gtk.x86}/eclipse" />
> 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
> 			<param name="p2.os" value="linux" />
>@@ -597,18 +567,6 @@
> 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
> 			<param name="p2.director.version" value="3.6.0.${buildId}" />
> 			<param name="p2.director.profile" value="PlatformSDKProfile" />
>-			<param name="p2.director.install.path" value="${p2.platformsdk.install.win32.wpf.x86}/eclipse" />
>-			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
>-			<param name="p2.os" value="win32" />
>-			<param name="p2.ws" value="wpf" />
>-			<param name="p2.arch" value="x86" />
>-			<param name="p2.repo" value="${buildRepo}" />
>-		</antcall>
>-
>-		<antcall target="run.director">
>-			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
>-			<param name="p2.director.version" value="3.6.0.${buildId}" />
>-			<param name="p2.director.profile" value="PlatformSDKProfile" />
> 			<param name="p2.director.install.path" value="${p2.platformsdk.install.linux.gtk.x86}/eclipse" />
> 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
> 			<param name="p2.os" value="linux" />
>@@ -837,16 +795,6 @@
> 				<antcall target="generateChecksums">
> 					<param name="archiveName" value="eclipse-SDK-${buildId}-win32-x86_64.zip" />
> 				</antcall>
>-
>-				
>-				<delete file="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-win32-wpf.zip" failonerror="false" />
>-				<copy file="${equinox.build.configs}/equinox.prov/wpftemp/eclipse.ini" tofile="${p2.sdk.install.win32.wpf.x86}/eclipse/eclipse.ini" overwrite="true" failonerror="false" />
>-				<exec dir="${p2.sdk.install.win32.wpf.x86}" executable="zip">
>-					<arg line="-q ${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-win32-wpf.zip -r ." />
>-				</exec>
>-				<antcall target="generateChecksums">
>-					<param name="archiveName" value="eclipse-SDK-${buildId}-win32-wpf.zip" />
>-				</antcall>
> 			</sequential>
> 
> 			<sequential>
>@@ -953,17 +901,7 @@
> 				</exec>
> 				<antcall target="generateChecksums">
> 					<param name="archiveName" value="eclipse-platform-${buildId}-win32-x86_64.zip" />
>-				</antcall>
>-
>-				
>-				<delete file="${postingDirectory}/${buildLabel}/eclipse-platform-${buildId}-win32-wpf.zip" failonerror="false" />
>-				<copy file="${equinox.build.configs}/equinox.prov/wpftemp/eclipse.ini" tofile="${p2.platform.install.win32.wpf.x86}/eclipse/eclipse.ini" overwrite="true" failonerror="false" />
>-				<exec dir="${p2.platform.install.win32.wpf.x86}" executable="zip">
>-					<arg line="-q ${postingDirectory}/${buildLabel}/eclipse-platform-${buildId}-win32-wpf.zip -r ." />
>-				</exec>
>-				<antcall target="generateChecksums">
>-					<param name="archiveName" value="eclipse-platform-${buildId}-win32-wpf.zip" />
>-				</antcall>
>+				</antcall>		
> 			</sequential>
> 
> 			<sequential>
>@@ -1082,17 +1020,7 @@
> 				</exec>
> 				<antcall target="generateChecksums">
> 					<param name="archiveName" value="eclipse-platform-SDK-${buildId}-win32-x86_64.zip" />
>-				</antcall>
>-
>-				
>-				<delete file="${postingDirectory}/${buildLabel}/eclipse-platform-SDK-${buildId}-win32-wpf.zip" failonerror="false" />
>-				<copy file="${equinox.build.configs}/equinox.prov/wpftemp/eclipse.ini" tofile="${p2.platformsdk.install.win32.wpf.x86}/eclipse/eclipse.ini" overwrite="true" failonerror="false" />
>-				<exec dir="${p2.platformsdk.install.win32.wpf.x86}" executable="zip">
>-					<arg line="-q ${postingDirectory}/${buildLabel}/eclipse-platform-SDK-${buildId}-win32-wpf.zip -r ." />
>-				</exec>
>-				<antcall target="generateChecksums">
>-					<param name="archiveName" value="eclipse-platform-SDK-${buildId}-win32-wpf.zip" />
>-				</antcall>
>+				</antcall>			
> 			</sequential>
> 			<sequential>
> 				
>Index: equinox/publishingFiles/testManifest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/publishingFiles/testManifest.xml,v
>retrieving revision 1.79
>diff -u -r1.79 testManifest.xml
>--- equinox/publishingFiles/testManifest.xml	4 Nov 2009 16:46:57 -0000	1.79
>+++ equinox/publishingFiles/testManifest.xml	27 Jan 2010 20:19:17 -0000
>@@ -133,8 +133,6 @@
> 			</platform>
> 			<platform id="SW64" 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="launchers-win32.win32.x86_64.@buildid@.zip">
> 			</platform>
>-			<platform id="SWWPF" name="Windows WPF **early access** (&lt;a href=&quot;http://www.eclipse.org/projects/project-plan.php?projectid=eclipse#target_environments&quot;>Supported Versions&lt;/a>)" fileName="launchers-win32.wpf.x86.@buildid@.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="launchers-linux.gtk.x86.@buildid@.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="launchers-linux.gtk.x86_64.@buildid@.tar.gz">

Actions: View | Diff

Attachments on bug 293830: 157461