Attachment 118931 Details for Bug 256459 – patch

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

[patch] patch

256459.txt (text/plain), 119.56 KB, created by Kim Moir

on 2008-11-27 12:11:52 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Kim Moir

Created: 2008-11-27 12:11:52 EST

Size: 119.56 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.77
>diff -u -r1.77 feature.xml
>--- feature.xml	10 Nov 2008 21:40:48 -0000	1.77
>+++ feature.xml	27 Nov 2008 17:10:50 -0000
>@@ -286,6 +286,29 @@
>          id="org.eclipse.swt.carbon.macosx"
>          os="macosx"
>          ws="carbon"
>+         arch="ppc"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         fragment="true"
>+         unpack="false"/>
>+         
>+    <plugin
>+         id="org.eclipse.swt.carbon.macosx"
>+         os="macosx"
>+         ws="carbon"
>+         arch="x86"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         fragment="true"
>+         unpack="false"/>
>+         
>+    <plugin
>+         id="org.eclipse.swt.cocoa.macosx"
>+         os="macosx"
>+         ws="cocoa"
>+         arch="ppc"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>@@ -296,11 +319,23 @@
>          id="org.eclipse.swt.cocoa.macosx"
>          os="macosx"
>          ws="cocoa"
>+         arch="x86"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>          fragment="true"
>          unpack="false"/>
>+         
>+    <plugin
>+         id="org.eclipse.swt.cocoa.macosx.x86_64"
>+         os="macosx"
>+         ws="cocoa"
>+         arch="x86_64"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         fragment="true"
>+         unpack="false"/>           
> 
>    <plugin
>          id="org.eclipse.swt.motif.aix.ppc"
>@@ -442,15 +477,27 @@
>          id="org.eclipse.equinox.launcher.carbon.macosx"
>          os="macosx"
>          ws="carbon"
>+         arch="ppc"
>+         download-size="0"
>+         install-size="0"
>+         version="0.0.0"
>+         fragment="true"/>
>+         
>+    <plugin
>+         id="org.eclipse.equinox.launcher.carbon.macosx"
>+         os="macosx"
>+         ws="carbon"
>+         arch="x86"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>          fragment="true"/>
>          
>    <plugin
>-         id="org.eclipse.equinox.launcher.cocoa.macosx"
>+         id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
>          os="macosx"
>          ws="cocoa"
>+         arch="x86_64"
>          download-size="0"
>          install-size="0"
>          version="0.0.0"
>#P org.eclipse.releng.eclipsebuilder
>Index: eclipse/buildConfigs/platform.sdk/packager/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform.sdk/packager/customTargets.xml,v
>retrieving revision 1.19
>diff -u -r1.19 customTargets.xml
>--- eclipse/buildConfigs/platform.sdk/packager/customTargets.xml	8 Sep 2008 14:25:49 -0000	1.19
>+++ eclipse/buildConfigs/platform.sdk/packager/customTargets.xml	27 Nov 2008 17:10:51 -0000
>@@ -86,6 +86,12 @@
> 				<param name="archiveName" value="${archiveRoot}-macosx-cocoa-ppc.tar.gz" />
> 			</antcall>
> 	</target>	
>+	
>+	<target name="assemble.macosx.cocoa.x86_64.xml">
>+			<antcall target="assembler">
>+				<param name="archiveName" value="${archiveRoot}-macosx-cocoa-x86_64.tar.gz" />
>+			</antcall>
>+	</target>	
> 
> 	<target name="assembler">
> 		<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
>Index: eclipse/buildConfigs/platform.sdk/packager/packaging.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform.sdk/packager/packaging.properties,v
>retrieving revision 1.20
>diff -u -r1.20 packaging.properties
>--- eclipse/buildConfigs/platform.sdk/packager/packaging.properties	8 Sep 2008 14:25:49 -0000	1.20
>+++ eclipse/buildConfigs/platform.sdk/packager/packaging.properties	27 Nov 2008 17:10:51 -0000
>@@ -32,5 +32,7 @@
> root.macosx.cocoa.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
> root.macosx.cocoa.x86=eclipse,Eclipse.app/
> root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
>+root.macosx.cocoa.x86_64=eclipse,Eclipse.app/
>+root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
> root.aix.motif.ppc=eclipse
> root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm
>Index: eclipse/buildConfigs/platform.sdk/packager/packager.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform.sdk/packager/packager.properties,v
>retrieving revision 1.22
>diff -u -r1.22 packager.properties
>--- eclipse/buildConfigs/platform.sdk/packager/packager.properties	8 Sep 2008 14:25:49 -0000	1.22
>+++ eclipse/buildConfigs/platform.sdk/packager/packager.properties	27 Nov 2008 17:10:51 -0000
>@@ -51,7 +51,8 @@
> 	macosx, carbon, ppc & \
> 	macosx, carbon, x86 & \
> 	macosx, cocoa, ppc & \
>-	macosx, cocoa, x86
>+	macosx, cocoa, x86 & \
>+	macosx, cocoa, x86_64
> 
> archivesFormat =\
>  	win32, win32, x86-zip &\
>@@ -66,7 +67,8 @@
> 	macosx, carbon, ppc-tar & \
> 	macosx, carbon, x86-tar & \
> 	macosx, cocoa, ppc-tar & \
>-	macosx, cocoa, x86-tar
>+	macosx, cocoa, x86-tar & \
>+	macosx, cocoa, x86_64-tar
> 	
> 
> ################ FOLDERS ############################
>Index: equinox/buildConfigs/equinox-launchers/allElements.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/equinox-launchers/allElements.xml,v
>retrieving revision 1.8
>diff -u -r1.8 allElements.xml
>--- equinox/buildConfigs/equinox-launchers/allElements.xml	8 Sep 2008 14:25:49 -0000	1.8
>+++ equinox/buildConfigs/equinox-launchers/allElements.xml	27 Nov 2008 17:10:52 -0000
>@@ -67,6 +67,10 @@
> 		<property name="archiveName" value="launchers-macosx.cocoa.x86.${buildId}.tar.gz" />
> 		<antcall target="assemble" />
> 	</target>	
>+	<target name="assemble.org.eclipse.equinox.launchers-feature.macosx.cocoa.x86_64">
>+		<property name="archiveName" value="launchers-macosx.cocoa.x86_64.${buildId}.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>	
> 	
> 	<target name="assemble">
> 			 		 <mkdir dir="${equinoxPostingDirectory}/${buildLabel}/checksum" />
>Index: equinox/buildConfigs/equinox-launchers/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/equinox-launchers/customTargets.xml,v
>retrieving revision 1.13
>diff -u -r1.13 customTargets.xml
>--- equinox/buildConfigs/equinox-launchers/customTargets.xml	8 Sep 2008 14:25:49 -0000	1.13
>+++ equinox/buildConfigs/equinox-launchers/customTargets.xml	27 Nov 2008 17:10:52 -0000
>@@ -77,8 +77,8 @@
> 			buildDirectory="${buildDirectory}" 
> 			baseLocation="${baseLocation}" 
> 			verify="true" 
>-			configInfo="win32,win32,x86 &amp; win32,win32,x86_64 &amp; win32, wpf, x86 &amp; linux,gtk,x86 &amp; linux, gtk, ppc &amp; linux, gtk, ppc &amp; linux, gtk, x86_64 &amp; solaris, gtk, sparc &amp; aix, motif, ppc &amp; 	macosx, carbon, ppc &amp; macosx, cocoa, x86 &amp;	hpux, motif, ia64_32" 
>-			pluginList="org.eclipse.equinox.launcher, org.eclipse.equinox.launcher.gtk.solaris.sparc, org.eclipse.equinox.launcher.carbon.macosx, org.eclipse.equinox.launcher.motif.aix.ppc, org.eclipse.equinox.launcher.gtk.linux.ppc, org.eclipse.equinox.launcher.motif.hpux.PA_RISC, org.eclipse.equinox.launcher.win32.win32.x86, org.eclipse.equinox.launcher.win32.win32.x86_64, org.eclipse.equinox.launcher.gtk.linux.x86, org.eclipse.equinox.launcher.wpf.win32.x86, org.eclipse.equinox.launcher.win32.win32.x86_64, org.eclipse.equinox.launcher.gtk.linux.x86_64,org.eclipse.equinox.launcher.motif.hpux.ia64_32" 
>+			configInfo="win32,win32,x86 &amp; win32,win32,x86_64 &amp; win32, wpf, x86 &amp; linux,gtk,x86 &amp; linux, gtk, ppc &amp; linux, gtk, ppc &amp; linux, gtk, x86_64 &amp; solaris, gtk, sparc &amp; aix, motif, ppc &amp; macosx, carbon, ppc &amp; macosx, cocoa, x86 &amp; macosx, cocoa, x86_64 &amp; hpux, motif, ia64_32" 
>+			pluginList="org.eclipse.equinox.launcher, org.eclipse.equinox.launcher.gtk.solaris.sparc, org.eclipse.equinox.launcher.carbon.macosx, org.eclipse.equinox.launcher.cocoa.macosx, org.eclipse.equinox.launcher.cocoa.macosx.x86_64, org.eclipse.equinox.launcher.motif.aix.ppc, org.eclipse.equinox.launcher.gtk.linux.ppc, org.eclipse.equinox.launcher.motif.hpux.PA_RISC, org.eclipse.equinox.launcher.win32.win32.x86, org.eclipse.equinox.launcher.win32.win32.x86_64, org.eclipse.equinox.launcher.gtk.linux.x86, org.eclipse.equinox.launcher.wpf.win32.x86, org.eclipse.equinox.launcher.win32.win32.x86_64, org.eclipse.equinox.launcher.gtk.linux.x86_64,org.eclipse.equinox.launcher.motif.hpux.ia64_32" 
> 			featureList="master-root"
> 			includeLaunchers="false" />
> 		
>Index: equinox/buildConfigs/equinox-launchers/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/equinox-launchers/build.properties,v
>retrieving revision 1.16
>diff -u -r1.16 build.properties
>--- equinox/buildConfigs/equinox-launchers/build.properties	8 Sep 2008 14:25:49 -0000	1.16
>+++ equinox/buildConfigs/equinox-launchers/build.properties	27 Nov 2008 17:10:52 -0000
>@@ -47,7 +47,8 @@
> 	hpux, motif, ia64_32 &\
> 	aix, motif, ppc &\
> 	macosx, carbon, ppc &\
>-	macosx, cocoa, x86
>+	macosx, cocoa, x86 &\
>+	macosx, cocoa, x86_64
> #	linux, motif, x86 & \
> #	solaris, motif, sparc & \
> #	hpux, motif, PA_RISC & \
>@@ -68,7 +69,8 @@
> 	solaris, gtk, sparc-zip &\
> 	aix, motif, ppc-zip &\
> 	macosx, carbon, ppc-tar &\
>-	macosx, cocoa, x86-tar
>+	macosx, cocoa, x86-tar &\
>+	macosx, cocoa, x86_64-tar
> 	#	solaris, motif, sparc - antZip& \
> 	#	hpux, motif, PA_RISC - antZip& \
> 	
>Index: eclipse/buildConfigs/sdk.tests/testScripts/readme.html
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk.tests/testScripts/readme.html,v
>retrieving revision 1.7
>diff -u -r1.7 readme.html
>--- eclipse/buildConfigs/sdk.tests/testScripts/readme.html	8 Sep 2008 14:25:49 -0000	1.7
>+++ eclipse/buildConfigs/sdk.tests/testScripts/readme.html	27 Nov 2008 17:10:52 -0000
>@@ -154,6 +154,8 @@
>   <tr>
>     <td>macosx</td><td>cocoa</td><td>x86</td></tr>
>   <tr>
>+    <td>macosx</td><td>cocoa</td><td>x86_64</td></tr>
>+  <tr>
>     <td>solaris</td><td>gtk</td><td>sparc</td></tr>
>   <tr> 
>     <td>solaris</td><td>motif</td><td>sparc</td></tr>
>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.54
>diff -u -r1.54 test.xml
>--- eclipse/buildConfigs/sdk.tests/testScripts/test.xml	16 Nov 2008 23:41:46 -0000	1.54
>+++ eclipse/buildConfigs/sdk.tests/testScripts/test.xml	27 Nov 2008 17:10:52 -0000
>@@ -173,6 +173,13 @@
> 				<equals arg1="${arch}" arg2="x86" />
> 			</and>
> 		</condition>
>+		<condition property="runtimeArchive" value="eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz">
>+			<and>
>+				<equals arg1="${os}" arg2="macosx" />
>+				<equals arg1="${ws}" arg2="cocoa" />
>+				<equals arg1="${arch}" arg2="x86_64" />
>+			</and>
>+		</condition>
> 		<condition property="runtimeArchive" value="eclipse-SDK-${buildId}-hpux-motif.zip">
> 			<and>
> 				<equals arg1="${os}" arg2="hpux" />
>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.107
>diff -u -r1.107 run.xml
>--- equinox/buildConfigs/equinox.prov/run.xml	26 Nov 2008 20:06:08 -0000	1.107
>+++ equinox/buildConfigs/equinox.prov/run.xml	27 Nov 2008 17:10:52 -0000
>@@ -55,6 +55,8 @@
> 		<mkdir dir="${p2.sdk.install.macosx.carbon.x86}" />
> 		<property name="p2.sdk.install.macosx.cocoa.x86" value="${p2.output.base}/sdk.install.macosx.cocoa.x86" />
> 		<mkdir dir="${p2.sdk.install.macosx.cocoa.x86}" />
>+		<property name="p2.sdk.install.macosx.cocoa.x86_64" value="${p2.output.base}/sdk.install.macosx.cocoa.x86_64" />
>+		<mkdir dir="${p2.sdk.install.macosx.cocoa.x86_64}" />
> 
> 		
> 		<property name="p2.platform.install.win32.win32.x86" value="${p2.output.base}/platform.install.win32.win32.x86" />
>@@ -79,6 +81,8 @@
> 		<mkdir dir="${p2.platform.install.macosx.carbon.x86}" />
> 		<property name="p2.platform.install.macosx.cocoa.x86" value="${p2.output.base}/platform.install.macosx.cocoa.x86" />
> 		<mkdir dir="${p2.platform.install.macosx.cocoa.x86}" />
>+		<property name="p2.platform.install.macosx.cocoa.x86_64" value="${p2.output.base}/platform.install.macosx.cocoa.x86_64" />
>+		<mkdir dir="${p2.platform.install.macosx.cocoa.x86_64}" />
> 
> 		
> 		<property name="p2.platformsdk.install.win32.win32.x86" value="${p2.output.base}/platformsdk.install.win32.win32.x86" />
>@@ -103,6 +107,8 @@
> 		<mkdir dir="${p2.platformsdk.install.macosx.carbon.x86}" />
> 		<property name="p2.platformsdk.install.macosx.cocoa.x86" value="${p2.output.base}/platformsdk.install.macosx.cocoa.x86" />
> 		<mkdir dir="${p2.platformsdk.install.macosx.cocoa.x86}" />
>+		<property name="p2.platformsdk.install.macosx.cocoa.x86_64" value="${p2.output.base}/platformsdk.install.macosx.cocoa.x86_64" />
>+		<mkdir dir="${p2.platformsdk.install.macosx.cocoa.x86_64}" />
> 
> 		<property name="base" value="${p2.output.base}/base" />
> 		<mkdir dir="${base}" />
>@@ -314,6 +320,18 @@
> 			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
> 			<param name="p2.director.version" value="3.5.0.${buildId}" />
> 			<param name="p2.director.profile" value="SDKProfile" />
>+			<param name="p2.director.install.path" value="${p2.sdk.install.macosx.cocoa.x86_64}/eclipse" />
>+			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
>+			<param name="p2.os" value="macosx" />
>+			<param name="p2.ws" value="cocoa" />
>+			<param name="p2.arch" value="x86_64" />
>+			<param name="p2.repo" value="${updateSite}" />
>+		</antcall>
>+
>+		<antcall target="run.director">
>+			<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
>+			<param name="p2.director.version" value="3.5.0.${buildId}" />
>+			<param name="p2.director.profile" value="SDKProfile" />
> 			<param name="p2.director.install.path" value="${p2.sdk.install.hpux.motif.ia64_32}/eclipse" />
> 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
> 			<param name="p2.os" value="hpux" />
>@@ -449,6 +467,18 @@
> 			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
> 			<param name="p2.director.version" value="3.5.0.${buildId}" />
> 			<param name="p2.director.profile" value="PlatformProfile" />
>+			<param name="p2.director.install.path" value="${p2.platform.install.macosx.cocoa.x86_64}/eclipse" />
>+			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
>+			<param name="p2.os" value="macosx" />
>+			<param name="p2.ws" value="cocoa" />
>+			<param name="p2.arch" value="x86_64" />
>+			<param name="p2.repo" value="${updateSite}" />
>+		</antcall>
>+
>+		<antcall target="run.director">
>+			<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
>+			<param name="p2.director.version" value="3.5.0.${buildId}" />
>+			<param name="p2.director.profile" value="PlatformProfile" />
> 			<param name="p2.director.install.path" value="${p2.platform.install.hpux.motif.ia64_32}/eclipse" />
> 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
> 			<param name="p2.os" value="hpux" />
>@@ -584,6 +614,18 @@
> 			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
> 			<param name="p2.director.version" value="3.5.0.${buildId}" />
> 			<param name="p2.director.profile" value="PlatformSDKProfile" />
>+			<param name="p2.director.install.path" value="${p2.platformsdk.install.macosx.cocoa.x86_64}/eclipse" />
>+			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
>+			<param name="p2.os" value="macosx" />
>+			<param name="p2.ws" value="cocoa" />
>+			<param name="p2.arch" value="x86_64" />
>+			<param name="p2.repo" value="${updateSite}" />
>+		</antcall>
>+
>+		<antcall target="run.director">
>+			<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
>+			<param name="p2.director.version" value="3.5.0.${buildId}" />
>+			<param name="p2.director.profile" value="PlatformSDKProfile" />
> 			<param name="p2.director.install.path" value="${p2.platformsdk.install.hpux.motif.ia64_32}/eclipse" />
> 			<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
> 			<param name="p2.os" value="hpux" />
>@@ -844,6 +886,10 @@
> 				<exec dir="${p2.sdk.install.macosx.cocoa.x86}/eclipse" executable="ln">
> 					<arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />
> 				</exec>
>+				<delete file="${p2.sdk.install.macosx.cocoa.x86_64}/eclipse/eclipse" failonerror="false" />
>+				<exec dir="${p2.sdk.install.macosx.cocoa.x86_64}/eclipse" executable="ln">
>+					<arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />
>+				</exec>
> 				<antcall target="p2.tar">
> 					<param name="tar.base.dir" value="${p2.sdk.install.macosx.cocoa.x86}" />
> 					<param name="tar.base.filename" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-macosx-cocoa.tar" />
>@@ -851,6 +897,13 @@
> 				<antcall target="generateChecksums">
> 					<param name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa.tar.gz" />
> 				</antcall>
>+				<antcall target="p2.tar">
>+					<param name="tar.base.dir" value="${p2.sdk.install.macosx.cocoa.x86_64}" />
>+					<param name="tar.base.filename" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar" />
>+				</antcall>
>+				<antcall target="generateChecksums">
>+					<param name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz" />
>+				</antcall>
> 			</sequential>
> 
> 
>@@ -1056,6 +1109,19 @@
> 				<antcall target="generateChecksums">
> 					<param name="archiveName" value="eclipse-platform-${buildId}-macosx-cocoa.tar.gz" />
> 				</antcall>
>+
>+				
>+				<delete file="${p2.platform.install.macosx.cocoa.x86_64}/eclipse/eclipse" failonerror="false" />
>+				<exec dir="${p2.platform.install.macosx.cocoa.x86_64}/eclipse" executable="ln">
>+					<arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />
>+				</exec>
>+				<antcall target="p2.tar">
>+					<param name="tar.base.dir" value="${p2.platform.install.macosx.cocoa.x86_64}" />
>+					<param name="tar.base.filename" value="${postingDirectory}/${buildLabel}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar" />
>+				</antcall>
>+				<antcall target="generateChecksums">
>+					<param name="archiveName" value="eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz" />
>+				</antcall>
> 			</sequential>
> 		</parallel>
> 
>@@ -1167,6 +1233,19 @@
> 				<antcall target="generateChecksums">
> 					<param name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa.tar.gz" />
> 				</antcall>
>+
>+				
>+				<delete file="${p2.platformsdk.install.macosx.cocoa.x86_64}/eclipse/eclipse" failonerror="false" />
>+				<exec dir="${p2.platformsdk.install.macosx.cocoa.x86_64}/eclipse" executable="ln">
>+					<arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />
>+				</exec>
>+				<antcall target="p2.tar">
>+					<param name="tar.base.dir" value="${p2.platformsdk.install.macosx.cocoa.x86_64}" />
>+					<param name="tar.base.filename" value="${postingDirectory}/${buildLabel}/eclipse-platform-SDK-${buildId}-macosx-cocoa-x86_64.tar" />
>+				</antcall>
>+				<antcall target="generateChecksums">
>+					<param name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz" />
>+				</antcall>
> 			</sequential>
> 		</parallel>
> 
>Index: eclipse/buildConfigs/rcp.sdk/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.sdk/build.properties,v
>retrieving revision 1.20
>diff -u -r1.20 build.properties
>--- eclipse/buildConfigs/rcp.sdk/build.properties	8 Sep 2008 14:25:50 -0000	1.20
>+++ eclipse/buildConfigs/rcp.sdk/build.properties	27 Nov 2008 17:10:51 -0000
>@@ -36,6 +36,7 @@
> 	hpux, motif, ia64_32 & \
> 	macosx, carbon, ppc &\
> 	macosx, cocoa, x86 &\
>+	macosx, cocoa, x86_64 &\
> 	qnx, photon, x86
> 	
> #no qnx photon builds until 1.4 J9 vm becomes available	
>@@ -57,6 +58,7 @@
> 	hpux, motif, ia64_32-zip & \
> 	macosx, carbon, ppc-tar & \
> 	macosx, cocoa, x86-tar & \
>+	macosx, cocoa, x86_64-tar & \
> 	qnx, photon, x86-zip
> 
> bootclasspath=${java.home}/lib/rt.jar
>Index: eclipse/buildConfigs/rcp.sdk/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.sdk/customTargets.xml,v
>retrieving revision 1.20
>diff -u -r1.20 customTargets.xml
>--- eclipse/buildConfigs/rcp.sdk/customTargets.xml	8 Sep 2008 14:25:50 -0000	1.20
>+++ eclipse/buildConfigs/rcp.sdk/customTargets.xml	27 Nov 2008 17:10:51 -0000
>@@ -90,6 +90,12 @@
> 		<property name="archiveName" value="eclipse-RCP-SDK-${buildId}-macosx-cocoa.tar.gz" />
> 		<antcall target="assemble" />
> 	</target>
>+	
>+	<target name="assemble.org.eclipse.rcp.sdk.macosx.cocoa.x86_64">
>+		<property name="archiveName" value="eclipse-RCP-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>
>+
> 
> 	<target name="assemble">
> 		<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />
>Index: equinox/publishingFiles/testManifest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/publishingFiles/testManifest.xml,v
>retrieving revision 1.61
>diff -u -r1.61 testManifest.xml
>--- equinox/publishingFiles/testManifest.xml	14 Oct 2008 17:55:38 -0000	1.61
>+++ equinox/publishingFiles/testManifest.xml	27 Nov 2008 17:10:52 -0000
>@@ -146,7 +146,9 @@
> 			</platform>			
> 			<platform id="SMC" name="Mac OSX (Mac/Carbon) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="launchers-macosx.carbon.ppc.@buildid@.tar.gz">
> 			</platform>
>-			<platform id="SMCC" name="Mac OSX (Mac/Carbon) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="launchers-macosx.cocoa.x86.@buildid@.tar.gz">
>+			<platform id="SMCC" name="Mac OSX (Mac/Cocoa) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="launchers-macosx.cocoa.x86.@buildid@.tar.gz">
>+			</platform>
>+			<platform id="SMCC" name="Mac OSX (Mac/Cocoa/x86_64) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="launchers-macosx.cocoa.x86_64.@buildid@.tar.gz">
> 			</platform>
> 		</zipType>
> 
>Index: eclipse/publishingFiles/testManifest.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/publishingFiles/testManifest.xml,v
>retrieving revision 1.57
>diff -u -r1.57 testManifest.xml
>--- eclipse/publishingFiles/testManifest.xml	24 Nov 2008 19:24:29 -0000	1.57
>+++ eclipse/publishingFiles/testManifest.xml	27 Nov 2008 17:10:52 -0000
>@@ -15,6 +15,7 @@
> 		<platform id="SAM" name="AIX (PPC/Motif)" fileName="eclipse-SDK-@build@-aix-motif.zip"></platform>		
> 		<platform id="SMC" name="Mac OSX (Mac/Carbon) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-SDK-@build@-macosx-carbon.tar.gz"></platform>
> 		<platform id="SMCC" name="Mac OSX (Mac/Cocoa) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-SDK-@build@-macosx-cocoa.tar.gz"></platform>
>+		<platform id="SMCC64" name="Mac OSX (Mac/Cocoa/x86_64) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-SDK-@build@-macosx-cocoa-x86_64.tar.gz"></platform>
> 		<platform id="SAA2" name='Source Build (Source in .zip) (&lt;a href="srcIncludedBuildInstructions.html">instructions&lt;/a>)' fileName="eclipse-sourceBuild-srcIncluded-@build@.zip"></platform>
> 		<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>
>@@ -42,6 +43,7 @@
> 		<platform id="RCPAM" name="AIX (PPC/Motif)" fileName="eclipse-RCP-@build@-aix-motif.zip"></platform>	
> 		<platform id="RCPMC" name="Mac OSX (Mac/Carbon) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-RCP-@build@-macosx-carbon.tar.gz"></platform>
> 		<platform id="RCPMCC" name="Mac OSX (Mac/Cocoa) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-RCP-@build@-macosx-cocoa.tar.gz"></platform>
>+		<platform id="RCPMCC64" name="Mac OSX (Mac/Cocoa/x86_64) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-RCP-@build@-macosx-cocoa-x86_64.tar.gz"></platform>
> 	</zipType>
> 
> 	<zipType name="RCP SDK">
>@@ -58,6 +60,7 @@
> 		<platform id="RCPAMSDK" name="AIX (PPC/Motif)" fileName="eclipse-RCP-SDK-@build@-aix-motif.zip"></platform>		
> 		<platform id="RCPMCSDK" name="Mac OSX (Mac/Carbon) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-RCP-SDK-@build@-macosx-carbon.tar.gz"></platform>
> 		<platform id="RCPMCSDKC" name="Mac OSX (Mac/Cocoa) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-RCP-SDK-@build@-macosx-cocoa.tar.gz"></platform>
>+		<platform id="RCPMCSDKC64" name="Mac OSX (Mac/Cocoa/x86_64) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-RCP-SDK-@build@-macosx-cocoa-x86_64.tar.gz"></platform>
>     </zipType>		
> 		
>  	<zipType name="Delta Pack">
>@@ -81,6 +84,7 @@
> 		<platform id="PAM" name="AIX (PPC/Motif)" fileName="eclipse-platform-@build@-aix-motif.zip"></platform>
> 		<platform id="PMC" name="Mac OSX (Mac/Carbon) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-@build@-macosx-carbon.tar.gz"></platform>
> 		<platform id="PMCC" name="Mac OSX (Mac/Cocoa) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-@build@-macosx-cocoa.tar.gz"></platform>
>+		<platform id="PMCC64" name="Mac OSX (Mac/Cocoa/x86_64) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-@build@-macosx-cocoa-x86_64.tar.gz"></platform>
> 	</zipType>
> 
> 	<zipType name="Platform SDK">
>@@ -96,6 +100,7 @@
> 		<platform id="PAMSDK" name="AIX (PPC/Motif)" fileName="eclipse-platform-SDK-@build@-aix-motif.zip"></platform>		
> 		<platform id="PMCSDK" name="Mac OSX (Mac/Carbon) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-SDK-@build@-macosx-carbon.tar.gz"></platform>
> 		<platform id="PMCSDKC" name="Mac OSX (Mac/Cocoa) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-SDK-@build@-macosx-cocoa.tar.gz"></platform>
>+		<platform id="PMCSDKC64" name="Mac OSX (Mac/Cocoa/x86_64) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="eclipse-platform-SDK-@build@-macosx-cocoa-x86_64.tar.gz"></platform>
> 	</zipType>
> 
> 	<zipType name="JDT Runtime Binary">
>@@ -150,8 +155,9 @@
> 		<platform id="SWTHP" name="HPUX (IA64_32/Motif)" fileName="swt-@build@-motif-hpux-ia64_32.zip"></platform>
> 		<platform id="SWTNP" name="QNX (x86/Photon)" fileName="swt-@build@-photon-qnx-x86.zip"></platform>
> 		<platform id="SWTAM" name="AIX (PPC/Motif)" fileName="swt-@build@-motif-aix-ppc.zip"></platform>		
>-		<platform id="SWTMC" name="Mac OSX (Mac/Carbon) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="swt-@build@-carbon-macosx.zip"></platform>
>-		<platform id="SWTMCC" name="Mac OSX (Mac/Cocoa) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="swt-@build@-cocoa-macosx.zip"></platform>
>+		<platform id="SWTMC" name="Mac OSX (Mac/Carbon) (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="swt-@build@-carbon-macosx-ppc.zip"></platform>
>+		<platform id="SWTMCC" name="Mac OSX (Mac/Cocoa) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="swt-@build@-cocoa-macosx-x86.zip"></platform>
>+		<platform id="SWTMCC64" name="Mac OSX (Mac/Cocoa/x86_64) **early access** (&lt;a href=&quot;http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments&quot;>Supported Versions&lt;/a>)" fileName="swt-@build@-cocoa-macosx-x86_64.zip"></platform>
> 	</zipType>
> 
> 	<zipType name="RelEng Tool plug-in">
>Index: eclipse/buildConfigs/platform.sdk/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform.sdk/build.properties,v
>retrieving revision 1.21
>diff -u -r1.21 build.properties
>--- eclipse/buildConfigs/platform.sdk/build.properties	8 Sep 2008 14:25:50 -0000	1.21
>+++ eclipse/buildConfigs/platform.sdk/build.properties	27 Nov 2008 17:10:51 -0000
>@@ -36,6 +36,7 @@
> 	hpux, motif, ia64_32 & \
> 	macosx, carbon, ppc &\
> 	macosx, cocoa, x86 &\
>+	macosx, cocoa, x86_64 &\
> 	hpux, motif, ia64_32 & \
> 	qnx, photon, x86
> 
>@@ -58,6 +59,7 @@
> 	hpux, motif, ia64_32-zip & \
> 	macosx, carbon, ppc-tar & \
> 	macosx, cocoa, x86-tar & \
>+	macosx, cocoa, x86_64-tar & \
> 	qnx, photon, x86-zip
> 
> bootclasspath=${java.home}/lib/rt.jar
>Index: eclipse/buildConfigs/platform.sdk/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform.sdk/customTargets.xml,v
>retrieving revision 1.19
>diff -u -r1.19 customTargets.xml
>--- eclipse/buildConfigs/platform.sdk/customTargets.xml	8 Sep 2008 14:25:50 -0000	1.19
>+++ eclipse/buildConfigs/platform.sdk/customTargets.xml	27 Nov 2008 17:10:51 -0000
>@@ -1,7 +1,7 @@
> <project name="Build specific targets and properties" default="noDefault" basedir=".">
> 
> 	<property name="postingDirectory" value="${buildDirectory}" />
>-	
>+
> 	
> 	
> 	
>@@ -24,17 +24,17 @@
> 		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32.zip" />
> 		<antcall target="assemble" />
> 	</target>
>-	
>+
> 	<target name="assemble.org.eclipse.platform.sdk.win32.win32.x86_64">
>-			<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32-x86_64.zip" />
>-			<antcall target="assemble" />
>-		</target>
>+		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32-x86_64.zip" />
>+		<antcall target="assemble" />
>+	</target>
> 
> 	<target name="assemble.org.eclipse.platform.sdk.win32.wpf.x86">
>-			<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32-wpf.zip" />
>-			<antcall target="assemble" />
>-		</target>
>-	
>+		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32-wpf.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+
> 	<target name="assemble.org.eclipse.platform.sdk.linux.motif.x86">
> 		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-motif.tar.gz" />
> 		<antcall target="assemble" />
>@@ -49,25 +49,25 @@
> 		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-gtk-x86_64.tar.gz" />
> 		<antcall target="assemble" />
> 	</target>
>-	
>-	<target name="assemble.org.eclipse.platform.sdk.linux.gtk.ia64"/>
>+
>+	<target name="assemble.org.eclipse.platform.sdk.linux.gtk.ia64" />
> 	<target name="assemble.org.eclipse.platform.sdk.linux.gtk.ppc">
>-	<target name="assemble.org.eclipse.platform.sdk.solaris.motif.sparc"/>		
>-		
>-	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-gtk-ppc.tar.gz" />
>+		<target name="assemble.org.eclipse.platform.sdk.solaris.motif.sparc" />
>+
>+		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-gtk-ppc.tar.gz" />
> 		<antcall target="assemble" />
> 	</target>
>-	
>+
> 	<target name="assemble.org.eclipse.platform.sdk.hpux.motif.ia64_32">
>-			<property name="archiveName" value="eclipse-platform-SDK-${buildId}-hpux-motif-ia64_32.zip" />
>-			<antcall target="assemble" />
>+		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-hpux-motif-ia64_32.zip" />
>+		<antcall target="assemble" />
> 	</target>
>-	
>+
> 	<target name="assemble.org.eclipse.platform.sdk.solaris.gtk.sparc">
> 		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-solaris-gtk.zip" />
> 		<antcall target="assemble" />
> 	</target>
>-	
>+
> 	<target name="assemble.org.eclipse.platform.sdk.qnx.photon.x86" />
> 
> 	<target name="assemble.org.eclipse.platform.sdk.aix.motif.ppc">
>@@ -75,31 +75,36 @@
> 		<antcall target="assemble" />
> 	</target>
> 
>-	<target name="assemble.org.eclipse.platform.sdk.hpux.motif.PA_RISC"/>	
>+	<target name="assemble.org.eclipse.platform.sdk.hpux.motif.PA_RISC" />
> 
> 	<target name="assemble.org.eclipse.platform.sdk.macosx.carbon.ppc">
> 		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-carbon.tar.gz" />
> 		<antcall target="assemble" />
> 	</target>
>-	
>+
> 	<target name="assemble.org.eclipse.platform.sdk.macosx.cocoa.x86">
>-			<property name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa.tar.gz" />
>-			<antcall target="assemble" />
>+		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.platform.sdk.macosx.cocoa.x86_64">
>+		<property name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz" />
>+		<antcall target="assemble" />
> 	</target>
> 
> 	<target name="assemble">
> 		<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />
> 		<ant antfile="${assembleScriptName}" />
> 	</target>
>-		<target name="postPackage">
>-			<mkdir dir="${buildDirectory}/${buildLabel}/checksum"/>
>-			<exec executable="sh" dir="${buildDirectory}/${buildLabel}">
>-				<arg line="${eclipse.build.configs}/../../extras/produceChecksum" />
>-			</exec>
>-			<move todir="${postingDirectory}/${buildLabel}">
>-				<fileset dir="${buildDirectory}/${buildLabel}" />
>-			</move>
>-		</target>
>+	<target name="postPackage">
>+		<mkdir dir="${buildDirectory}/${buildLabel}/checksum" />
>+		<exec executable="sh" dir="${buildDirectory}/${buildLabel}">
>+			<arg line="${eclipse.build.configs}/../../extras/produceChecksum" />
>+		</exec>
>+		<move todir="${postingDirectory}/${buildLabel}">
>+			<fileset dir="${buildDirectory}/${buildLabel}" />
>+		</move>
>+	</target>
> 
> 	
> 	
>@@ -120,7 +125,7 @@
> 	</target>
> 
> 	<target name="compareMapFiles" if="compareMaps">
>-		<property file="${mapTag.properties}"/>
>+		<property file="${mapTag.properties}" />
> 		<property name="cvsDiffFile" value="${buildDirectory}/cvsDiff.txt" />
> 		<cvs cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="diff -w -r ${lastMapTag}" output="${cvsDiffFile}" />
> 		<modifiedMaps mapDiffFile="${cvsDiffFile}" />
>@@ -135,9 +140,7 @@
> 	</target>
> 
> 	<target name="getPrebuiltElements">
>-		<generateBaseFetchScript
>-			mapfile="${buildDirectory}/maps/org.eclipse.releng/maps/base.map"
>-			outputfile="${buildDirectory}/fetchbase.xml"/>
>+		<generateBaseFetchScript mapfile="${buildDirectory}/maps/org.eclipse.releng/maps/base.map" outputfile="${buildDirectory}/fetchbase.xml" />
> 		<ant antfile="${buildDirectory}/fetchbase.xml" />
> 	</target>
> 
>@@ -176,7 +179,7 @@
> 			<property name="id" value="org.eclipse.equinox.executable" />
> 		</ant>
> 		
>-		<zip destfile="${buildDirectory}/plugins/org.eclipse.platform/launchersrc.zip" basedir="${buildDirectory}/features/org.eclipse.equinox.executable" includes="library/**" />		
>+		<zip destfile="${buildDirectory}/plugins/org.eclipse.platform/launchersrc.zip" basedir="${buildDirectory}/features/org.eclipse.equinox.executable" includes="library/**" />
> 
> 	</target>
> 
>Index: eclipse/buildConfigs/platform/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform/customTargets.xml,v
>retrieving revision 1.19
>diff -u -r1.19 customTargets.xml
>--- eclipse/buildConfigs/platform/customTargets.xml	8 Sep 2008 14:25:50 -0000	1.19
>+++ eclipse/buildConfigs/platform/customTargets.xml	27 Nov 2008 17:10:51 -0000
>@@ -84,6 +84,11 @@
> 		<property name="archiveName" value="eclipse-platform-${buildId}-macosx-cocoa.tar.gz" />
> 		<antcall target="assemble" />
> 	</target>
>+	
>+	<target name="assemble.org.eclipse.platform.macosx.cocoa.x86_64">
>+			<property name="archiveName" value="eclipse-platform-${buildId}-macosx-cocoa.x86_64.tar.gz" />
>+			<antcall target="assemble" />
>+	</target>
> 
> 	<target name="assemble">
> 		<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />
>Index: eclipse/buildConfigs/platform/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform/build.properties,v
>retrieving revision 1.21
>diff -u -r1.21 build.properties
>--- eclipse/buildConfigs/platform/build.properties	9 Sep 2008 14:09:29 -0000	1.21
>+++ eclipse/buildConfigs/platform/build.properties	27 Nov 2008 17:10:51 -0000
>@@ -36,6 +36,7 @@
> 	hpux, motif, ia64_32 & \
> 	macosx, carbon, ppc &\
> 	macosx, cocoa, x86 &\
>+		macosx, cocoa, x86_64 &\
> 	hpux, motif, ia64_32 & \
> 	qnx, photon, x86
> 
>@@ -55,6 +56,7 @@
> 	hpux, motif, ia64_32-zip & \
> 	macosx, carbon, ppc-tar & \
> 	macosx, cocoa, x86-tar & \
>+	macosx, cocoa, x86_64-tar & \
> 	qnx, photon, x86-zip
> 
> #no qnx photon builds until 1.4 J9 vm becomes available	
>Index: eclipse/buildConfigs/master-root/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/master-root/build.properties,v
>retrieving revision 1.25
>diff -u -r1.25 build.properties
>--- eclipse/buildConfigs/master-root/build.properties	8 Sep 2008 14:25:49 -0000	1.25
>+++ eclipse/buildConfigs/master-root/build.properties	27 Nov 2008 17:10:51 -0000
>@@ -36,6 +36,7 @@
> 	launcher-aix, motif, ppc & \
> 	launcher-macosx, carbon, ppc & \
> 	launcher-macosx, cocoa, x86 & \
>+	launcher-macosx, cocoa, x86_64 & \
> 	\
> 	sdk-win32, win32, x86 &\
> 	sdk-win32, win32, x86_64 &\
>@@ -49,6 +50,7 @@
> 	sdk-aix, motif, ppc & \
> 	sdk-macosx, carbon, ppc & \
> 	sdk-macosx, cocoa, x86 & \
>+	sdk-macosx, cocoa, x86_64 & \
> 	\
> 	platform-win32, win32, x86 &\
> 	platform-win32, win32, x86_64 &\
>@@ -61,6 +63,7 @@
> 	platform-aix, motif, ppc & \
> 	platform-macosx, carbon, ppc &\
> 	platform-macosx, cocoa, x86 &\
>+	platform-macosx, cocoa, x86_64 &\
> 	\
> 	rcp-common, common, common&\
> 	\
>@@ -82,6 +85,7 @@
> 	launcher-aix, motif, ppc-zip & \
> 	launcher-macosx, carbon, ppc-zip& \
> 	launcher-macosx, cocoa, x86-zip& \
>+	launcher-macosx, cocoa, x86_64-zip& \
> 	\
> 	sdk-win32, win32, x86-zip &\
> 	sdk-win32, win32, x86_64-zip &\
>@@ -95,6 +99,7 @@
> 	sdk-aix, motif, ppc-zip & \
> 	sdk-macosx, carbon, ppc-zip& \
> 	sdk-macosx, cocoa, x86-zip& \
>+	sdk-macosx, cocoa, x86_64-zip& \
> 	\
> 	platform-win32, win32, x86-zip &\
> 	platform-win32, win32, x86_64-zip &\
>@@ -107,6 +112,7 @@
> 	platform-aix, motif, ppc-zip & \
> 	platform-macosx, carbon, ppc-zip&\
> 	platform-macosx, cocoa, x86-zip&\
>+	platform-macosx, cocoa, x86_64-zip&\
> 	\
> 	rcp-common, common, common-zip&\
> 	\
>Index: eclipse/buildConfigs/master-root/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/master-root/customTargets.xml,v
>retrieving revision 1.17
>diff -u -r1.17 customTargets.xml
>--- eclipse/buildConfigs/master-root/customTargets.xml	8 Sep 2008 14:25:49 -0000	1.17
>+++ eclipse/buildConfigs/master-root/customTargets.xml	27 Nov 2008 17:10:51 -0000
>@@ -1,4 +1,4 @@
>-<project name="Build specific targets and properties" default="noDefault" >
>+<project name="Build specific targets and properties" default="noDefault">
> 
> 
> 	<property name="postingDirectory" value="${buildDirectory}" />
>@@ -11,7 +11,7 @@
> 	
> 	<target name="allElements">
>-		<ant antfile="${genericTargets}" target="${target}" >
>+		<ant antfile="${genericTargets}" target="${target}">
> 			<property name="type" value="feature" />
> 			<property name="id" value="master-root" />
> 		</ant>
>@@ -21,163 +21,175 @@
> 	
> 	
> 	<target name="assemble.master-root.common.common.common">
>-		<property name="archiveName" value="master-root-${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.launcher-common.common.common">
>-		<property name="archiveName" value="master-root-launcher-${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-launcher-${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.launcher-linux.gtk.x86">
>-		<property name="archiveName" value="master-root-launcher-linux.gtk.x86.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-launcher-linux.gtk.x86.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.launcher-linux.motif.x86">
>-			<property name="archiveName" value="master-root-launcher-linux.motif.x86.${buildId}.zip"/>
>-			<antcall target="assemble" />
>+		<property name="archiveName" value="master-root-launcher-linux.motif.x86.${buildId}.zip" />
>+		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.launcher-win32.win32.x86">
>-		<property name="archiveName" value="master-root-launcher-win32.win32.x86.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-launcher-win32.win32.x86.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.launcher-win32.win32.x86_64">
>-			<property name="archiveName" value="master-root-launcher-win32.win32.x86_64.${buildId}.zip"/>
>-			<antcall target="assemble" />
>-		</target>
>+		<property name="archiveName" value="master-root-launcher-win32.win32.x86_64.${buildId}.zip" />
>+		<antcall target="assemble" />
>+	</target>
> 	<target name="assemble.master-root.launcher-win32.wpf.x86">
>-			<property name="archiveName" value="master-root-launcher-win32.wpf.x86.${buildId}.zip"/>
>-			<antcall target="assemble" />
>-	</target>	
>+		<property name="archiveName" value="master-root-launcher-win32.wpf.x86.${buildId}.zip" />
>+		<antcall target="assemble" />
>+	</target>
> 	<target name="assemble.master-root.launcher-linux.gtk.x86_64">
>-		<property name="archiveName" value="master-root-launcher-linux.gtk.x86_64.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-launcher-linux.gtk.x86_64.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.launcher-linux.gtk.ppc">
>-		<property name="archiveName" value="master-root-launcher-linux.gtk.ppc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-launcher-linux.gtk.ppc.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.launcher-hpux.motif.ia64_32">
>-			<property name="archiveName" value="master-root-launcher-hpux.motif.ia64_32.${buildId}.zip"/>
>-			<antcall target="assemble" />
>-		</target>
>+		<property name="archiveName" value="master-root-launcher-hpux.motif.ia64_32.${buildId}.zip" />
>+		<antcall target="assemble" />
>+	</target>
> 	<target name="assemble.master-root.launcher-solaris.gtk.sparc">
>-		<property name="archiveName" value="master-root-launcher-solaris.gtk.sparc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-launcher-solaris.gtk.sparc.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.launcher-aix.motif.ppc">
>-		<property name="archiveName" value="master-root-launcher-aix.motif.ppc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-launcher-aix.motif.ppc.${buildId}.zip" />
> 		<antcall target="assemble" />
>-	</target>	
>+	</target>
> 	<target name="assemble.master-root.launcher-macosx.carbon.ppc">
>-		<property name="archiveName" value="master-root-launcher-macosx.carbon.ppc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-launcher-macosx.carbon.ppc.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.launcher-macosx.cocoa.x86">
>-		<property name="archiveName" value="master-root-launcher-macosx.cocoa.x86.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-launcher-macosx.cocoa.x86.${buildId}.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+	<target name="assemble.master-root.launcher-macosx.cocoa.x86_64">
>+		<property name="archiveName" value="master-root-launcher-macosx.cocoa.x86_64.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.sdk-linux.gtk.x86">
>-		<property name="archiveName" value="master-root-sdk-linux.gtk.x86.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-sdk-linux.gtk.x86.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.sdk-linux.motif.x86">
>-			<property name="archiveName" value="master-root-sdk-linux.motif.x86.${buildId}.zip"/>
>-			<antcall target="assemble" />
>-		</target>
>+		<property name="archiveName" value="master-root-sdk-linux.motif.x86.${buildId}.zip" />
>+		<antcall target="assemble" />
>+	</target>
> 	<target name="assemble.master-root.sdk-win32.wpf.x86">
>-			<property name="archiveName" value="master-root-sdk-win32.wpf.x86.${buildId}.zip"/>
>-			<antcall target="assemble"/>
>+		<property name="archiveName" value="master-root-sdk-win32.wpf.x86.${buildId}.zip" />
>+		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.sdk-win32.win32.x86">
>-		<property name="archiveName" value="master-root-sdk-win32.win32.x86.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-sdk-win32.win32.x86.${buildId}.zip" />
> 		<antcall target="assemble" />
>-	</target>	
>+	</target>
> 	<target name="assemble.master-root.sdk-win32.win32.x86_64">
>-			<property name="archiveName" value="master-root-sdk-win32.win32.x86_64.${buildId}.zip"/>
>-			<antcall target="assemble" />
>-		</target>	
>+		<property name="archiveName" value="master-root-sdk-win32.win32.x86_64.${buildId}.zip" />
>+		<antcall target="assemble" />
>+	</target>
> 	<target name="assemble.master-root.sdk-linux.gtk.x86_64">
>-		<property name="archiveName" value="master-root-sdk-linux.gtk.x86_64.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-sdk-linux.gtk.x86_64.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.sdk-linux.gtk.ppc">
>-		<property name="archiveName" value="master-root-sdk-linux.gtk.ppc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-sdk-linux.gtk.ppc.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.sdk-hpux.motif.ia64_32">
>-		<property name="archiveName" value="master-root-sdk-hpux.motif.ia64_32.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-sdk-hpux.motif.ia64_32.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.sdk-solaris.gtk.sparc">
>-		<property name="archiveName" value="master-root-sdk-solaris.gtk.sparc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-sdk-solaris.gtk.sparc.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.sdk-aix.motif.ppc">
>-		<property name="archiveName" value="master-root-sdk-aix.motif.ppc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-sdk-aix.motif.ppc.${buildId}.zip" />
> 		<antcall target="assemble" />
>-	</target>	
>+	</target>
> 	<target name="assemble.master-root.sdk-macosx.carbon.ppc">
>-		<property name="archiveName" value="master-root-sdk-macosx.carbon.ppc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-sdk-macosx.carbon.ppc.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.sdk-macosx.cocoa.x86">
>-		<property name="archiveName" value="master-root-sdk-macosx.cocoa.x86.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-sdk-macosx.cocoa.x86.${buildId}.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+	<target name="assemble.master-root.sdk-macosx.cocoa.x86_64">
>+		<property name="archiveName" value="master-root-sdk-macosx.cocoa.x86_64.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.platform-linux.gtk.x86">
>-		<property name="archiveName" value="master-root-platform-linux.gtk.x86.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-platform-linux.gtk.x86.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.platform-win32.win32.x86">
>-		<property name="archiveName" value="master-root-platform-win32.win32.x86.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-platform-win32.win32.x86.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.platform-win32.win32.x86_64">
>-			<property name="archiveName" value="master-root-platform-win32.win32.x86_64.${buildId}.zip"/>
>-			<antcall target="assemble" />
>-		</target>
>+		<property name="archiveName" value="master-root-platform-win32.win32.x86_64.${buildId}.zip" />
>+		<antcall target="assemble" />
>+	</target>
> 	<target name="assemble.master-root.platform-win32.wpf.x86">
>-			<property name="archiveName" value="master-root-platform-win32.wpf.x86.${buildId}.zip"/>
>-			<antcall target="assemble" />
>+		<property name="archiveName" value="master-root-platform-win32.wpf.x86.${buildId}.zip" />
>+		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.platform-linux.gtk.x86_64">
>-		<property name="archiveName" value="master-root-platform-linux.gtk.x86_64.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-platform-linux.gtk.x86_64.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.platform-linux.gtk.ppc">
>-		<property name="archiveName" value="master-root-platform-linux.gtk.ppc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-platform-linux.gtk.ppc.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.platform-linux.motif.x86">
>-		<property name="archiveName" value="master-root-platform-linux.motif.x86.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-platform-linux.motif.x86.${buildId}.zip" />
> 		<antcall target="assemble" />
>-	</target>	
>+	</target>
> 	<target name="assemble.master-root.platform-hpux.motif.ia64_32">
>-			<property name="archiveName" value="master-root-platform-hpux.motif.ia64_32.${buildId}.zip"/>
>-			<antcall target="assemble" />
>+		<property name="archiveName" value="master-root-platform-hpux.motif.ia64_32.${buildId}.zip" />
>+		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.platform-solaris.gtk.sparc">
>-		<property name="archiveName" value="master-root-platform-solaris.gtk.sparc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-platform-solaris.gtk.sparc.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.platform-aix.motif.ppc">
>-		<property name="archiveName" value="master-root-platform-aix.motif.ppc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-platform-aix.motif.ppc.${buildId}.zip" />
> 		<antcall target="assemble" />
>-	</target>	
>+	</target>
> 	<target name="assemble.master-root.platform-macosx.carbon.ppc">
>-		<property name="archiveName" value="master-root-platform-macosx.carbon.ppc.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-platform-macosx.carbon.ppc.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.platform-macosx.cocoa.x86">
>-		<property name="archiveName" value="master-root-platform-macosx.cocoa.x86.${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-platform-macosx.cocoa.x86.${buildId}.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+	<target name="assemble.master-root.platform-macosx.cocoa.x86_64">
>+		<property name="archiveName" value="master-root-platform-macosx.cocoa.x86_64.${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.rcp-common.common.common">
>-		<property name="archiveName" value="master-root-rcp-${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-rcp-${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.examples-common.common.common">
>-		<property name="archiveName" value="master-root-examples-${buildId}.zip"/>
>+		<property name="archiveName" value="master-root-examples-${buildId}.zip" />
> 		<antcall target="assemble" />
> 	</target>
> 	<target name="assemble.master-root.equinox-launcher-linux.gtk.x86">
>@@ -189,12 +201,12 @@
> 		<antcall target="assemble.equinox" />
> 	</target>
> 	<target name="assemble.master-root.equinox-launcher-win32.win32.x86_64">
>-			<property name="archiveName" value="launchers-win32.win32.x86_64.${buildId}.zip" />
>-			<antcall target="assemble.equinox" />
>+		<property name="archiveName" value="launchers-win32.win32.x86_64.${buildId}.zip" />
>+		<antcall target="assemble.equinox" />
> 	</target>
> 	<target name="assemble.master-root.equinox-launcher-win32.wpf.x86">
>-			<property name="archiveName" value="launchers-win32.wpf.x86.${buildId}.zip" />
>-			<antcall target="assemble.equinox" />
>+		<property name="archiveName" value="launchers-win32.wpf.x86.${buildId}.zip" />
>+		<antcall target="assemble.equinox" />
> 	</target>
> 	<target name="assemble.master-root.equinox-launcher-linux.gtk.x86_64">
> 		<property name="archiveName" value="launchers-linux.gtk.x86_64.${buildId}.tar.gz" />
>@@ -205,13 +217,13 @@
> 		<antcall target="assemble.equinox" />
> 	</target>
> 	<target name="assemble.master-root.equinox-launcher-hpux.motif.ia64_32">
>-			<property name="archiveName" value="launchers-hpux.motif.ia64_32.${buildId}.zip" />
>-			<antcall target="assemble.equinox" />
>+		<property name="archiveName" value="launchers-hpux.motif.ia64_32.${buildId}.zip" />
>+		<antcall target="assemble.equinox" />
> 	</target>
> 	<target name="assemble.master-root.equinox-launcher-linux.motif.x86">
> 		<property name="archiveName" value="launchers-linux.motif.x86.${buildId}.tar.gz" />
> 		<antcall target="assemble.equinox" />
>-	</target>	
>+	</target>
> 	<target name="assemble.master-root.equinox-launcher-solaris.gtk.sparc">
> 		<property name="archiveName" value="launchers-solaris.gtk.sparc.${buildId}.zip" />
> 		<antcall target="assemble.equinox" />
>@@ -219,7 +231,7 @@
> 	<target name="assemble.master-root.equinox-launcher-aix.motif.ppc">
> 		<property name="archiveName" value="launchers-aix.motif.ppc.${buildId}.zip" />
> 		<antcall target="assemble.equinox" />
>-	</target>	
>+	</target>
> 	<target name="assemble.master-root.equinox-launcher-macosx.carbon.ppc">
> 		<property name="archiveName" value="launchers-macosx.carbon.ppc.${buildId}.tar.gz" />
> 		<antcall target="assemble.equinox" />
>@@ -232,7 +244,7 @@
> 		<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />
> 		<ant antfile="${assembleScriptName}" />
> 	</target>
>-	
>+
> 	<target name="assemble.equinox">
> 		<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />
> 		<ant antfile="${assembleScriptName}" />
>@@ -250,11 +262,7 @@
> 		
> 		<property name="mapCvsRoot" value=":pserver:anonymous@dev.eclipse.org:/home/eclipse" />
> 		<property name="mapVersionTag" value="HEAD" />
>-		<cvs cvsRoot="${mapCvsRoot}"
>-		package="org.eclipse.releng"
>-		dest="${buildDirectory}/maps"
>-		tag="${mapVersionTag}"
>-	/>
>+		<cvs cvsRoot="${mapCvsRoot}" package="org.eclipse.releng" dest="${buildDirectory}/maps" tag="${mapVersionTag}" />
> 		
> 		<antcall target="compareMapFiles" />
> 		
>@@ -262,7 +270,7 @@
> 	</target>
> 
> 	<target name="compareMapFiles" if="compareMaps">
>-		<property file="${mapTag.properties}"/>
>+		<property file="${mapTag.properties}" />
> 		<property name="cvsDiffFile" value="${buildDirectory}/cvsDiff.txt" />
> 		<cvs cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="diff -w -r ${lastMapTag}" output="${cvsDiffFile}" />
> 		<modifiedMaps mapDiffFile="${cvsDiffFile}" />
>@@ -285,7 +293,7 @@
> 	
> 	
> 	
>-	<target name="postSetup" >
>+	<target name="postSetup">
> 	</target>
> 
> 	
>Index: eclipse/buildConfigs/rcp.sdk/packager/packaging.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.sdk/packager/packaging.properties,v
>retrieving revision 1.17
>diff -u -r1.17 packaging.properties
>--- eclipse/buildConfigs/rcp.sdk/packager/packaging.properties	8 Sep 2008 14:25:49 -0000	1.17
>+++ eclipse/buildConfigs/rcp.sdk/packager/packaging.properties	27 Nov 2008 17:10:51 -0000
>@@ -28,6 +28,8 @@
> root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
> root.macosx.cocoa.x86=eclipse,Eclipse.app/
> root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
>+root.macosx.cocoa.x86_64=eclipse,Eclipse.app/
>+root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
> root.aix.motif.ppc=eclipse
> root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm
> root.solaris.motif.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm
>Index: eclipse/buildConfigs/rcp.sdk/packager/packager.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.sdk/packager/packager.properties,v
>retrieving revision 1.17
>diff -u -r1.17 packager.properties
>--- eclipse/buildConfigs/rcp.sdk/packager/packager.properties	8 Sep 2008 14:25:49 -0000	1.17
>+++ eclipse/buildConfigs/rcp.sdk/packager/packager.properties	27 Nov 2008 17:10:51 -0000
>@@ -40,7 +40,8 @@
> 	solaris, motif, sparc & \
> 	aix, motif, ppc & \
> 	macosx, carbon, ppc & \
>-	macosx, cocoa, x86 
>+	macosx, cocoa, x86 & \
>+	macosx, cocoa, x86_64
> 
> archivesFormat =\
>  	win32, win32, x86-zip &\
>@@ -53,7 +54,8 @@
> 	solaris, gtk, sparc-zip & \
> 	aix, motif, ppc-zip & \
> 	macosx, carbon, ppc-tar & \
>-	macosx, cocoa, x86-tar
>+	macosx, cocoa, x86-tar & \
>+	macosx, cocoa, x86_64-tar
> 
> ################ FOLDERS ############################
> #The directory used as a base for the all process
>Index: eclipse/buildConfigs/rcp.sdk/packager/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.sdk/packager/customTargets.xml,v
>retrieving revision 1.18
>diff -u -r1.18 customTargets.xml
>--- eclipse/buildConfigs/rcp.sdk/packager/customTargets.xml	8 Sep 2008 14:25:49 -0000	1.18
>+++ eclipse/buildConfigs/rcp.sdk/packager/customTargets.xml	27 Nov 2008 17:10:51 -0000
>@@ -82,41 +82,47 @@
> 			<param name="archiveName" value="${archiveRoot}-macosx-carbon.tar.gz" />
> 		</antcall>
> 	</target>
>-	
>+
> 	<target name="assemble.macosx.cocoa.x86.xml">
> 		<antcall target="assembler">
> 			<param name="archiveName" value="${archiveRoot}-macosx-cocoa.tar.gz" />
> 		</antcall>
> 	</target>
> 
>+	<target name="assemble.macosx.cocoa.x86_64.xml">
>+		<antcall target="assembler">
>+			<param name="archiveName" value="${archiveRoot}-macosx-cocoa-x86_64.tar.gz" />
>+		</antcall>
>+	</target>
>+
> 	<target name="assembler">
>-			<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
>-			<property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" />
>-			<ant antfile="${assembleScriptName}" />
>-			<condition property="hpuxperm">
>-				<equals arg1="${archiveName}" arg2="${archiveRoot}-hpux-motif-ia64_32.zip" />
>-			</condition>
>-			<antcall target="fixhpux" />
>-			<checksum file="${archiveFullPath}" property="md5" />
>-			<checksum file="${archiveFullPath}" algorithm="SHA" property="sha" />
>-			<echo message="${md5} *${archiveName}" file="${postingDirectory}/${buildLabel}/checksum/${archiveName}.md5" />
>-			<echo message="${sha} *${archiveName}" file="${postingDirectory}/${buildLabel}/checksum/${archiveName}.sha1" />
>-		</target>
>-
>-		<target name="fixhpux" if="hpuxperm">
>-			<property name="hpuxtemp" value="${buildDirectory}/hpuxtemp" />
>-			<delete dir="${hpuxtemp}" />
>-			<mkdir dir="${hpuxtemp}" />
>-			<unzip src="${archiveFullPath}" dest="${hpuxtemp}">
>-				<patternset>
>-					<include name="eclipse/plugins/org.eclipse.equinox.launcher.motif.hpux.ia64_32_*/*.so" />
>-				</patternset>
>-			</unzip>
>-			<chmod dir="${hpuxtemp}" perm="755" includes="**/*.so" />
>-			<exec executable="zip" dir="${hpuxtemp}">
>-				<arg line="-r ${postingDirectory}/${buildLabel}/${archiveName} *" />
>-			</exec>
>-		</target>
>+		<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
>+		<property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" />
>+		<ant antfile="${assembleScriptName}" />
>+		<condition property="hpuxperm">
>+			<equals arg1="${archiveName}" arg2="${archiveRoot}-hpux-motif-ia64_32.zip" />
>+		</condition>
>+		<antcall target="fixhpux" />
>+		<checksum file="${archiveFullPath}" property="md5" />
>+		<checksum file="${archiveFullPath}" algorithm="SHA" property="sha" />
>+		<echo message="${md5} *${archiveName}" file="${postingDirectory}/${buildLabel}/checksum/${archiveName}.md5" />
>+		<echo message="${sha} *${archiveName}" file="${postingDirectory}/${buildLabel}/checksum/${archiveName}.sha1" />
>+	</target>
>+
>+	<target name="fixhpux" if="hpuxperm">
>+		<property name="hpuxtemp" value="${buildDirectory}/hpuxtemp" />
>+		<delete dir="${hpuxtemp}" />
>+		<mkdir dir="${hpuxtemp}" />
>+		<unzip src="${archiveFullPath}" dest="${hpuxtemp}">
>+			<patternset>
>+				<include name="eclipse/plugins/org.eclipse.equinox.launcher.motif.hpux.ia64_32_*/*.so" />
>+			</patternset>
>+		</unzip>
>+		<chmod dir="${hpuxtemp}" perm="755" includes="**/*.so" />
>+		<exec executable="zip" dir="${hpuxtemp}">
>+			<arg line="-r ${postingDirectory}/${buildLabel}/${archiveName} *" />
>+		</exec>
>+	</target>
> 
> 
> </project>
>Index: eclipse/buildConfigs/jdt/packager/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/jdt/packager/customTargets.xml,v
>retrieving revision 1.7
>diff -u -r1.7 customTargets.xml
>--- eclipse/buildConfigs/jdt/packager/customTargets.xml	10 Sep 2008 15:59:04 -0000	1.7
>+++ eclipse/buildConfigs/jdt/packager/customTargets.xml	27 Nov 2008 17:10:51 -0000
>@@ -22,12 +22,6 @@
> 		<param name="archiveName" value="${archiveRoot}-macosx.tar.gz"/>
> 	</antcall>
> </target>
>-			
>-
> 
> <target name="assembler">
> 	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
>Index: eclipse/buildConfigs/sdk/packager/packaging.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/packager/packaging.properties,v
>retrieving revision 1.20
>diff -u -r1.20 packaging.properties
>--- eclipse/buildConfigs/sdk/packager/packaging.properties	8 Sep 2008 14:25:49 -0000	1.20
>+++ eclipse/buildConfigs/sdk/packager/packaging.properties	27 Nov 2008 17:10:52 -0000
>@@ -16,6 +16,7 @@
> root.permissions.755=eclipse,*.so*
> root.macosx.carbon.ppc.permissions.755=Eclipse.app/Contents/MacOS/eclipse
> root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse
>+root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
> root.win32.win32.x86=eclipse.exe,eclipsec.exe
> root.win32.win32.x86_64=eclipse.exe,eclipsec.exe
> root.win32.wpf.x86=eclipse.exe,eclipsec.exe
>@@ -32,5 +33,7 @@
> root.macosx.cocoa.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
> root.macosx.cocoa.x86=eclipse,Eclipse.app/
> root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
>+root.macosx.cocoa.x86_64=eclipse,Eclipse.app/
>+root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
> root.aix.motif.ppc=eclipse
> root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm
>\ No newline at end of file
>Index: eclipse/buildConfigs/sdk/packager/packager.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/packager/packager.properties,v
>retrieving revision 1.29
>diff -u -r1.29 packager.properties
>--- eclipse/buildConfigs/sdk/packager/packager.properties	8 Sep 2008 14:25:49 -0000	1.29
>+++ eclipse/buildConfigs/sdk/packager/packager.properties	27 Nov 2008 17:10:52 -0000
>@@ -46,6 +46,7 @@
> 	macosx, carbon, x86 &\
> 	macosx, cocoa, ppc &\
> 	macosx, cocoa, x86 &\
>+	macosx, cocoa, x86_64 &\
> 	linux, gtk, x86 &\
> 	linux, gtk, ppc & \
> 	linux, motif, x86 & \
>@@ -68,7 +69,8 @@
> 	macosx, carbon, ppc-tar & \
> 	macosx, carbon, x86-tar & \
> 	macosx, cocoa, ppc-tar & \
>-	macosx, cocoa, x86-tar
>+	macosx, cocoa, x86-tar & \
>+	macosx, cocoa, x86_64-tar
> 
> ################ FOLDERS ############################
> #The directory used as a base for the all process
>Index: eclipse/buildConfigs/sdk/packager/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/packager/customTargets.xml,v
>retrieving revision 1.21
>diff -u -r1.21 customTargets.xml
>--- eclipse/buildConfigs/sdk/packager/customTargets.xml	9 Sep 2008 14:09:29 -0000	1.21
>+++ eclipse/buildConfigs/sdk/packager/customTargets.xml	27 Nov 2008 17:10:52 -0000
>@@ -95,6 +95,11 @@
> 		</antcall>
> 	</target>
> 
>+	<target name="assemble.macosx.cocoa.x86_64.xml">
>+		<antcall target="assembler">
>+			<param name="archiveName" value="${archiveRoot}-macosx-cocoa-x86_64.tar.gz" />
>+		</antcall>
>+	</target>
> 
> 	<target name="assembler">
> 		<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
>Index: eclipse/buildConfigs/sdk/srcBuild/build
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build,v
>retrieving revision 1.18
>diff -u -r1.18 build
>--- eclipse/buildConfigs/sdk/srcBuild/build	14 Nov 2008 16:18:42 -0000	1.18
>+++ eclipse/buildConfigs/sdk/srcBuild/build	27 Nov 2008 17:10:52 -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" = "linux-gtk-ia64" ] || [ "$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-ia64" ] || [ "$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-cocoa-x86" ] || [ "$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" = "linux-gtk-ia64" ] || [ "$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-ia64" ] || [ "$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-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/srcBuild/build.bat
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/srcBuild/build.bat,v
>retrieving revision 1.13
>diff -u -r1.13 build.bat
>--- eclipse/buildConfigs/sdk/srcBuild/build.bat	8 Sep 2008 14:25:49 -0000	1.13
>+++ eclipse/buildConfigs/sdk/srcBuild/build.bat	27 Nov 2008 17:10:52 -0000
>@@ -48,6 +48,7 @@
> if %installOs%-%ws%-%arch%==hpux-motif-ia64_32 goto run
> if %installOs%-%ws%-%arch%==macosx-carbon-ppc goto run
> if %installOs%-%ws%-%arch%==macosx-cocoa-x86 goto run
>+if %installOs%-%ws%-%arch%==macosx-cocoa-x86_64 goto run
> 
> ECHO The ws os arch combination entered is not valid.
> goto end
>Index: equinox/buildConfigs/equinox-launchers/equinox-launchers-buildinfo/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/equinox/buildConfigs/equinox-launchers/equinox-launchers-buildinfo/build.properties,v
>retrieving revision 1.9
>diff -u -r1.9 build.properties
>--- equinox/buildConfigs/equinox-launchers/equinox-launchers-buildinfo/build.properties	8 Sep 2008 14:25:49 -0000	1.9
>+++ equinox/buildConfigs/equinox-launchers/equinox-launchers-buildinfo/build.properties	27 Nov 2008 17:10:52 -0000
>@@ -43,5 +43,8 @@
> 
> root.macosx.cocoa.x86=../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc
> root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
>+root.macosx.cocoa.x86_64=../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc
>+root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
>+
> root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt
> 
>Index: eclipse/buildConfigs/platform/packager/packaging.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform/packager/packaging.properties,v
>retrieving revision 1.19
>diff -u -r1.19 packaging.properties
>--- eclipse/buildConfigs/platform/packager/packaging.properties	8 Sep 2008 14:25:50 -0000	1.19
>+++ eclipse/buildConfigs/platform/packager/packaging.properties	27 Nov 2008 17:10:51 -0000
>@@ -29,8 +29,8 @@
> root.macosx.carbon.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
> root.macosx.cocoa.x86=eclipse,Eclipse.app/
> root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
>-root.macosx.cocoa.x86=eclipse,Eclipse.app/
>-root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
>+root.macosx.cocoa.x86_64=eclipse,Eclipse.app/
>+root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
> root.aix.motif.ppc=eclipse
> root.hpux.motif.PA_RISC=eclipse
> root.hpux.motif.ia64_32=eclipse
>Index: eclipse/buildConfigs/platform/packager/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform/packager/customTargets.xml,v
>retrieving revision 1.21
>diff -u -r1.21 customTargets.xml
>--- eclipse/buildConfigs/platform/packager/customTargets.xml	8 Sep 2008 14:25:50 -0000	1.21
>+++ eclipse/buildConfigs/platform/packager/customTargets.xml	27 Nov 2008 17:10:51 -0000
>@@ -82,47 +82,53 @@
> 			<param name="archiveName" value="${archiveRoot}-macosx-carbon.x86.tar.gz" />
> 		</antcall>
> 	</target>
>-	
>+
> 	<target name="assemble.macosx.cocoa.x86.xml">
> 		<antcall target="assembler">
> 			<param name="archiveName" value="${archiveRoot}-macosx-cocoa.tar.gz" />
> 		</antcall>
> 	</target>
>-	
>+
> 	<target name="assemble.macosx.cocoa.ppc.xml">
>-			<antcall target="assembler">
>-				<param name="archiveName" value="${archiveRoot}-macosx-cocoa.ppc.tar.gz" />
>-			</antcall>
>+		<antcall target="assembler">
>+			<param name="archiveName" value="${archiveRoot}-macosx-cocoa.ppc.tar.gz" />
>+		</antcall>
> 	</target>
>-	
>+
>+	<target name="assemble.macosx.cocoa.x86_64.xml">
>+		<antcall target="assembler">
>+			<param name="archiveName" value="${archiveRoot}-macosx-cocoa.x86_64.tar.gz" />
>+		</antcall>
>+	</target>
>+
> 	<target name="assembler">
>-			<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
>-			<property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" />
>-			<ant antfile="${assembleScriptName}" />
>-			<condition property="hpuxperm">
>-				<equals arg1="${archiveName}" arg2="${archiveRoot}-hpux-motif-ia64_32.zip" />
>-			</condition>
>-			<antcall target="fixhpux" />
>+		<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
>+		<property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" />
>+		<ant antfile="${assembleScriptName}" />
>+		<condition property="hpuxperm">
>+			<equals arg1="${archiveName}" arg2="${archiveRoot}-hpux-motif-ia64_32.zip" />
>+		</condition>
>+		<antcall target="fixhpux" />
> 		
>-		</target>
>+	</target>
> 
>-		<target name="fixhpux" if="hpuxperm">
>-			<property name="hpuxtemp" value="${buildDirectory}/hpuxtemp" />
>-			<delete dir="${hpuxtemp}" />
>-			<mkdir dir="${hpuxtemp}" />
>-			<unzip src="${archiveFullPath}" dest="${hpuxtemp}">
>-				<patternset>
>-					<include name="eclipse/plugins/org.eclipse.equinox.launcher.motif.hpux.ia64_32_*/*.so" />
>-				</patternset>
>-			</unzip>
>-			<chmod dir="${hpuxtemp}" perm="755" includes="**/*.so" />
>-			<exec executable="zip" dir="${hpuxtemp}">
>-				<arg line="-r ${postingDirectory}/${buildLabel}/${archiveName} *" />
>-			</exec>
>-		</target>
>+	<target name="fixhpux" if="hpuxperm">
>+		<property name="hpuxtemp" value="${buildDirectory}/hpuxtemp" />
>+		<delete dir="${hpuxtemp}" />
>+		<mkdir dir="${hpuxtemp}" />
>+		<unzip src="${archiveFullPath}" dest="${hpuxtemp}">
>+			<patternset>
>+				<include name="eclipse/plugins/org.eclipse.equinox.launcher.motif.hpux.ia64_32_*/*.so" />
>+			</patternset>
>+		</unzip>
>+		<chmod dir="${hpuxtemp}" perm="755" includes="**/*.so" />
>+		<exec executable="zip" dir="${hpuxtemp}">
>+			<arg line="-r ${postingDirectory}/${buildLabel}/${archiveName} *" />
>+		</exec>
>+	</target>
> 
> 
> </project>
>Index: eclipse/buildConfigs/platform/packager/packager.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/platform/packager/packager.properties,v
>retrieving revision 1.27
>diff -u -r1.27 packager.properties
>--- eclipse/buildConfigs/platform/packager/packager.properties	10 Sep 2008 15:51:42 -0000	1.27
>+++ eclipse/buildConfigs/platform/packager/packager.properties	27 Nov 2008 17:10:51 -0000
>@@ -52,7 +52,8 @@
> 	macosx, carbon, ppc & \
> 	macosx, carbon, x86 & \
> 	macosx, cocoa, ppc & \
>-	macosx, cocoa, x86
>+	macosx, cocoa, x86 & \
>+	macosx, cocoa, x86_64
> 
> archivesFormat =\
>  	win32, win32, x86-zip &\
>@@ -67,6 +68,7 @@
> 	macosx, carbon, ppc-tar & \
> 	macosx, carbon, x86-tar & \
> 	macosx, cocoa, ppc-tar & \
>+	macosx, cocoa, x86_64-tar & \
> 	macosx, cocoa, x86-tar
> 
> ################ FOLDERS ############################
>Index: eclipse/buildConfigs/rcp/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp/build.properties,v
>retrieving revision 1.17
>diff -u -r1.17 build.properties
>--- eclipse/buildConfigs/rcp/build.properties	8 Sep 2008 14:25:50 -0000	1.17
>+++ eclipse/buildConfigs/rcp/build.properties	27 Nov 2008 17:10:51 -0000
>@@ -54,6 +54,7 @@
> 	hpux, motif, ia64-zip & \
> 	macosx, carbon, ppc-tar & \
> 	macosx, cocoa, x86-tar & \
>+	macosx, cocoa, x86_64-tar & \
> 	qnx, photon, x86-zip
> 	
> bootclasspath=${java.home}/lib/rt.jar
>Index: eclipse/buildConfigs/rcp/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp/customTargets.xml,v
>retrieving revision 1.20
>diff -u -r1.20 customTargets.xml
>--- eclipse/buildConfigs/rcp/customTargets.xml	8 Sep 2008 14:25:50 -0000	1.20
>+++ eclipse/buildConfigs/rcp/customTargets.xml	27 Nov 2008 17:10:51 -0000
>@@ -1,305 +1,301 @@
> <project name="Build specific targets and properties" default="noDefault" basedir=".">
> 
>-<property name="postingDirectory" value="${buildDirectory}" />
>+	<property name="postingDirectory" value="${buildDirectory}" />
>+
>+	
>+	
>+	
>+	<target name="allElements">
>+		<ant antfile="${genericTargets}" target="${target}">
>+			<property name="type" value="feature" />
>+			<property name="id" value="org.eclipse.rcp" />
>+		</ant>
>+	</target>
>+
>+	
>+	
>+	
>+	
>+	
>+	
>+
>+	
>+	<target name="assemble.org.eclipse.rcp.win32.win32.x86">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-win32.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.win32.win32.x86_64">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-win32-x86_64.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.win32.wpf.x86">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-win32-wpf.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.linux.motif.x86">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-linux-motif.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.linux.gtk.x86">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-linux-gtk.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.linux.gtk.ppc">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-linux-gtk-ppc.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.linux.gtk.x86_64">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-linux-gtk-x86_64.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.hpux.motif.ia64_32">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-hpux-motif-ia64_32.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+
>+	<target name="assemble.org.eclipse.rcp.solaris.gtk.sparc">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-solaris-gtk.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.solaris.motif.sparc">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-solaris-motif.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.qnx.photon.x86" />
>+	<target name="assemble.org.eclipse.rcp.hpux.motif.PA_RISC" />
>+	<target name="assemble.org.eclipse.rcp.linux.gtk.ia64" />
>+
>+	<target name="assemble.org.eclipse.rcp.aix.motif.ppc">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-aix-motif.zip" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.macosx.carbon.ppc">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-macosx-carbon.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.macosx.cocoa.x86">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-macosx-cocoa.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.rcp.macosx.cocoa.x86_64">
>+		<property name="archiveName" value="eclipse-RCP-${buildId}-macosx-cocoa-x86_64.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>
> 
>-
>-
>-
>-<target name="allElements">
>-	<ant antfile="${genericTargets}" target="${target}" >
>-		<property name="type" value="feature" />
>-		<property name="id" value="org.eclipse.rcp" />
>-	</ant>
>-</target>
>-
>-
>-
>-
>-
>-
>-
>-
>-
>-<target name="assemble.org.eclipse.rcp.win32.win32.x86">
>-	<property name="archiveName" value="eclipse-RCP-${buildId}-win32.zip"/>
>-	<antcall target="assemble" />
>-</target>
>-	
>-<target name="assemble.org.eclipse.rcp.win32.win32.x86_64">
>-		<property name="archiveName" value="eclipse-RCP-${buildId}-win32-x86_64.zip"/>
>-		<antcall target="assemble" />
>-</target>
>-	
>-<target name="assemble.org.eclipse.rcp.win32.wpf.x86">
>-		<property name="archiveName" value="eclipse-RCP-${buildId}-win32-wpf.zip"/>
>-		<antcall target="assemble" />
>-</target>
>-
>-<target name="assemble.org.eclipse.rcp.linux.motif.x86">
>-	<property name="archiveName" value="eclipse-RCP-${buildId}-linux-motif.tar.gz"/>
>-	<antcall target="assemble" />
>-</target>
>-
>-<target name="assemble.org.eclipse.rcp.linux.gtk.x86">
>-	<property name="archiveName" value="eclipse-RCP-${buildId}-linux-gtk.tar.gz"/>
>-	<antcall target="assemble" />
>-</target>
>-	
>-<target name="assemble.org.eclipse.rcp.linux.gtk.ppc">
>-		<property name="archiveName" value="eclipse-RCP-${buildId}-linux-gtk-ppc.tar.gz"/>
>-		<antcall target="assemble" />
>-</target>
>-
>-<target name="assemble.org.eclipse.rcp.linux.gtk.x86_64">
>-	<property name="archiveName" value="eclipse-RCP-${buildId}-linux-gtk-x86_64.tar.gz"/>
>-	<antcall target="assemble" />
>-</target>	
>-	
>-<target name="assemble.org.eclipse.rcp.hpux.motif.ia64_32">
>-	<property name="archiveName" value="eclipse-RCP-${buildId}-hpux-motif-ia64_32.zip"/>
>-	<antcall target="assemble" />
>-</target>
>-	
>-	
>-<target name="assemble.org.eclipse.rcp.solaris.gtk.sparc">
>-	<property name="archiveName" value="eclipse-RCP-${buildId}-solaris-gtk.zip"/>
>-	<antcall target="assemble" />
>-</target>
>-	
>-<target name="assemble.org.eclipse.rcp.solaris.motif.sparc">
>-	<property name="archiveName" value="eclipse-RCP-${buildId}-solaris-motif.zip"/>
>-	<antcall target="assemble" />
>-</target>
>-	
>-<target name="assemble.org.eclipse.rcp.qnx.photon.x86"/>
>-<target name="assemble.org.eclipse.rcp.hpux.motif.PA_RISC"/>
>-<target name="assemble.org.eclipse.rcp.linux.gtk.ia64" />
>-
>-<target name="assemble.org.eclipse.rcp.aix.motif.ppc">
>-	<property name="archiveName" value="eclipse-RCP-${buildId}-aix-motif.zip"/>
>-	<antcall target="assemble" />
>-</target>
>-
>-
>-
>-<target name="assemble.org.eclipse.rcp.macosx.carbon.ppc">
>-	<property name="archiveName" value="eclipse-RCP-${buildId}-macosx-carbon.tar.gz"/>
>-	<antcall target="assemble" />
>-</target>
>-	
>-<target name="assemble.org.eclipse.rcp.macosx.cocoa.x86">
>-	<property name="archiveName" value="eclipse-RCP-${buildId}-macosx-cocoa.tar.gz"/>
>-	<antcall target="assemble" />
>-</target>
> 
> 	<target name="assemble">
> 		<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />
> 		<ant antfile="${assembleScriptName}" />
> 	</target>
>-		<target name="postPackage">
>-			<mkdir dir="${buildDirectory}/${buildLabel}/checksum"/>
>-			<exec executable="sh" dir="${buildDirectory}/${buildLabel}">
>-				<arg line="${eclipse.build.configs}/../../extras/produceChecksum" />
>-			</exec>
>-			<move todir="${postingDirectory}/${buildLabel}">
>-				<fileset dir="${buildDirectory}/${buildLabel}" />
>-			</move>
>-		</target>
>-
>-
>-
>-
>-
>-
>-<target name="checkLocal">
>-	<available property="mapsLocal" file="${buildDirectory}/maps/org.eclipse.releng" />
>-</target>
>-<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
>-
>-	
>-	<property name="mapCvsRoot" value=":pserver:anonymous@dev.eclipse.org:/home/eclipse" />
>-	<property name="mapVersionTag" value="HEAD" />
>-	<cvs cvsRoot="${mapCvsRoot}"
>-		package="org.eclipse.releng"
>-		dest="${buildDirectory}/maps"
>-		tag="${mapVersionTag}"
>-	/>
>-	
>-	<antcall target="tagMapFiles" />
>-	<antcall target="getPrebuiltElements" />
>-</target>
>-
>-<target name="compareMapFiles" if="compareMaps">
>-	<property file="${mapTag.properties}"/>
>-	<property name="cvsDiffFile" value="${buildDirectory}/cvsDiff.txt" />
>-	<cvs cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="diff -w -r ${lastMapTag}" output="${cvsDiffFile}" />
>-	<modifiedMaps mapDiffFile="${cvsDiffFile}" />
>-</target>
>-
>-<target name="tagMapFiles" if="tagMaps">
>-	
>-	<echo file="${mapTag.properties}">
>+	<target name="postPackage">
>+		<mkdir dir="${buildDirectory}/${buildLabel}/checksum" />
>+		<exec executable="sh" dir="${buildDirectory}/${buildLabel}">
>+			<arg line="${eclipse.build.configs}/../../extras/produceChecksum" />
>+		</exec>
>+		<move todir="${postingDirectory}/${buildLabel}">
>+			<fileset dir="${buildDirectory}/${buildLabel}" />
>+		</move>
>+	</target>
>+
>+
>+	
>+	
>+	
>+	
>+	<target name="checkLocal">
>+		<available property="mapsLocal" file="${buildDirectory}/maps/org.eclipse.releng" />
>+	</target>
>+	<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">
>+
>+		
>+		<property name="mapCvsRoot" value=":pserver:anonymous@dev.eclipse.org:/home/eclipse" />
>+		<property name="mapVersionTag" value="HEAD" />
>+		<cvs cvsRoot="${mapCvsRoot}" package="org.eclipse.releng" dest="${buildDirectory}/maps" tag="${mapVersionTag}" />
>+		
>+		<antcall target="tagMapFiles" />
>+		<antcall target="getPrebuiltElements" />
>+	</target>
>+
>+	<target name="compareMapFiles" if="compareMaps">
>+		<property file="${mapTag.properties}" />
>+		<property name="cvsDiffFile" value="${buildDirectory}/cvsDiff.txt" />
>+		<cvs cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="diff -w -r ${lastMapTag}" output="${cvsDiffFile}" />
>+		<modifiedMaps mapDiffFile="${cvsDiffFile}" />
>+	</target>
>+
>+	<target name="tagMapFiles" if="tagMaps">
>+		
>+		<echo file="${mapTag.properties}">
> 	lastMapTag=${buildId}
> </echo>
>-	<cvs dest="${buildDirectory}/maps/org.eclipse.releng" command="tag ${buildId}" />
>-</target>
>+		<cvs dest="${buildDirectory}/maps/org.eclipse.releng" command="tag ${buildId}" />
>+	</target>
>+
>+	<target name="getPrebuiltElements">
>+		<generateBaseFetchScript mapfile="${buildDirectory}/maps/org.eclipse.releng/maps/base.map" outputfile="${buildDirectory}/fetchbase.xml" />
>+		<ant antfile="${buildDirectory}/fetchbase.xml" />
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="preSetup">
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="postSetup">
>+		
>+		<property name="featureOnly" value="false" />
>+		<property name="featureAndPlugins" value="true" />
>+		<property name="featuresRecursively" value="false" />
>+		<ant antfile="genericTargets.xml" dir="${eclipse.pdebuild.scripts}" target="fetchElement">
>+			<property name="type" value="fragment" />
>+			<property name="id" value="org.eclipse.swt.gtk.linux.x86_64" />
>+		</ant>
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="preFetch">
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="postFetch">
>+		<ant antfile="${genericTargets}" target="fetchElement">
>+			<property name="type" value="feature" />
>+			<property name="id" value="org.eclipse.equinox.executable" />
>+		</ant>
>+
>+		
>+		<property name="linux.motif.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.motif.x86" />
>+		<mkdir dir="${linux.motif.rootfiles}" />
>+		<copy tofile="${linux.motif.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.motif.linux.x86/about.html" />
>+		<copy todir="${linux.motif.rootfiles}">
>+			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.motif.linux.x86" />
>+		</copy>
>+
>+		
>+		<property name="linux.gtk.x86.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86" />
>+		<mkdir dir="${linux.gtk.x86.rootfiles}" />
>+		<copy tofile="${linux.gtk.x86.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86/about.html" />
>+
>+		<copy todir="${linux.gtk.x86.rootfiles}">
>+			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86" />
>+		</copy>
>+
>+		
>+		<property name="linux.gtk.x86_64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86_64" />
>+		<mkdir dir="${linux.gtk.x86_64.rootfiles}" />
>+		<copy tofile="${linux.gtk.x86_64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86_64/about_launcher_libraries.html" />
>+
>+		<copy todir="${linux.gtk.x86_64.rootfiles}">
>+			<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86_64" includes="	
>+			about_files/mpl-v11.txt" />
>+		</copy>
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="preGenerate">
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="postGenerate">
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="preAssemble">
>+
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="postAssemble">
>+	</target>
> 
>-<target name="getPrebuiltElements">
>-	<generateBaseFetchScript
>-		mapfile="${buildDirectory}/maps/org.eclipse.releng/maps/base.map"
>-		outputfile="${buildDirectory}/fetchbase.xml"/>
>-	<ant antfile="${buildDirectory}/fetchbase.xml" />
>-</target>
>-
>-
>-
>-
>-<target name="preSetup">
>-</target>
>-
>-
>-
>-
>-<target name="postSetup">
>-	
>-	<property name="featureOnly" value="false"/>
>-	<property name="featureAndPlugins" value="true"/>
>-	<property name="featuresRecursively" value="false"/>
>-	<ant antfile="genericTargets.xml" dir="${eclipse.pdebuild.scripts}" target="fetchElement">
>-		<property name="type" value="fragment" />
>-		<property name="id" value="org.eclipse.swt.gtk.linux.x86_64" />
>-	</ant>
>-</target>
>-
>-
>-
>-
>-<target name="preFetch">
>-</target>
>-
>-
>-
>-
>-<target name="postFetch">
>-	<ant antfile="${genericTargets}" target="fetchElement">
>-		<property name="type" value="feature" />
>-		<property name="id" value="org.eclipse.equinox.executable" />
>-	</ant>	
>-	
>-	
>-	<property name="linux.motif.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.motif.x86" />
>-	<mkdir dir="${linux.motif.rootfiles}" />
>-	<copy tofile="${linux.motif.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.motif.linux.x86/about.html" />
>-	<copy todir="${linux.motif.rootfiles}">
>-		<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.motif.linux.x86"/>
>-	</copy>
>-	
>-	
>-	<property name="linux.gtk.x86.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86" />
>-	<mkdir dir="${linux.gtk.x86.rootfiles}" />
>-	<copy tofile="${linux.gtk.x86.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86/about.html" />
>-
>-	<copy todir="${linux.gtk.x86.rootfiles}">
>-		<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86"/>
>-	</copy>
>-	
>-	
>-	<property name="linux.gtk.x86_64.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.gtk.x86_64" />
>-	<mkdir dir="${linux.gtk.x86_64.rootfiles}" />
>-	<copy tofile="${linux.gtk.x86_64.rootfiles}/about.html" file="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86_64/about_launcher_libraries.html" />
>-
>-	<copy todir="${linux.gtk.x86_64.rootfiles}">
>-		<fileset dir="${buildDirectory}/plugins/org.eclipse.swt.gtk.linux.x86_64"
>-			includes="	
>-			about_files/mpl-v11.txt"
>-		/>
>-	</copy>
>-</target>
>-
>-
>-
>-
>-<target name="preGenerate">
>-</target>
>-
>-
>-
>-
>-<target name="postGenerate">
>-</target>
>-
>-
>-
>-
>-<target name="preAssemble">
>-
>-</target>
>-
>-
>-
>-
>-<target name="postAssemble">
>-</target>
>-
>-
>-
>-
>-
>-
>-<target name="preProcess">
>-	<replace dir="${buildDirectory}/plugins" value="${buildId}" token="@build@">
>-		<include name="**/about.mappings" />
>-	</replace>
>-	<replace dir="${buildDirectory}/features/org.eclipse.rcp" value="${buildId}" token="@build@">
>-		<include name="**/config.ini" />
>-	</replace>
>-</target>
>-
>-
>-
>-
>-<target name="postProcess">
>-	<condition property="logsAvailable">
>-		<istrue value="${javacVerbose}"/> 
>-	</condition>
>-	<antcall target="gatherLogs" />
>-</target>
>+
>+
>+	
>+	
>+	
>+	<target name="preProcess">
>+		<replace dir="${buildDirectory}/plugins" value="${buildId}" token="@build@">
>+			<include name="**/about.mappings" />
>+		</replace>
>+		<replace dir="${buildDirectory}/features/org.eclipse.rcp" value="${buildId}" token="@build@">
>+			<include name="**/config.ini" />
>+		</replace>
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="postProcess">
>+		<condition property="logsAvailable">
>+			<istrue value="${javacVerbose}" />
>+		</condition>
>+		<antcall target="gatherLogs" />
>+	</target>
> 
> 	<target name="prePackage" />
> 
>-
>-
>-
>-
>-<target name="postBuild">
>-</target>
>-
>-
>-
>-
>-<target name="gatherLogs" if="logsAvailable">
>-
>-	<mkdir dir="${postingDirectory}/${buildLabel}/compilelogs" />
>-	<antcall target="allElements">
>-		<param name="target" value="gatherLogs" />
>-	</antcall>
>-
>-	<unzip dest="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
>-		<fileset dir="${buildDirectory}/features/org.eclipse.rcp">
>-			<include name="*.log.zip" />
>-		</fileset>
>-	</unzip>
>-</target>
>-<target name="clean" unless="noclean">
>-	<antcall target="allElements">
>-		<param name="target" value="cleanElement" />
>-	</antcall>
>-</target>
>-
>-
>-
>-<target name="noDefault">
>-	<echo message="You must specify a target when invoking this file" />
>-</target>
>+	
>+	
>+	
>+	
>+	<target name="postBuild">
>+	</target>
>+
>+	
>+	
>+	
>+	<target name="gatherLogs" if="logsAvailable">
>+
>+		<mkdir dir="${postingDirectory}/${buildLabel}/compilelogs" />
>+		<antcall target="allElements">
>+			<param name="target" value="gatherLogs" />
>+		</antcall>
>+
>+		<unzip dest="${postingDirectory}/${buildLabel}/compilelogs" overwrite="true">
>+			<fileset dir="${buildDirectory}/features/org.eclipse.rcp">
>+				<include name="*.log.zip" />
>+			</fileset>
>+		</unzip>
>+	</target>
>+	<target name="clean" unless="noclean">
>+		<antcall target="allElements">
>+			<param name="target" value="cleanElement" />
>+		</antcall>
>+	</target>
>+	
>+	
>+	
>+	<target name="noDefault">
>+		<echo message="You must specify a target when invoking this file" />
>+	</target>
> 
> </project>
>Index: eclipse/buildConfigs/rcp/packager/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp/packager/customTargets.xml,v
>retrieving revision 1.19
>diff -u -r1.19 customTargets.xml
>--- eclipse/buildConfigs/rcp/packager/customTargets.xml	8 Sep 2008 14:25:49 -0000	1.19
>+++ eclipse/buildConfigs/rcp/packager/customTargets.xml	27 Nov 2008 17:10:51 -0000
>@@ -95,6 +95,12 @@
> 		</antcall>
> 	</target>
> 
>+	<target name="assemble.macosx.cocoa.x86_64.xml">
>+		<antcall target="assembler">
>+			<param name="archiveName" value="${archiveRoot}-macosx-cocoa-x86_64.tar.gz" />
>+		</antcall>
>+	</target>
>+
> 	<target name="assembler">
> 		<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
> 		<property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" />
>Index: eclipse/buildConfigs/rcp/packager/packager.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp/packager/packager.properties,v
>retrieving revision 1.19
>diff -u -r1.19 packager.properties
>--- eclipse/buildConfigs/rcp/packager/packager.properties	8 Sep 2008 14:25:49 -0000	1.19
>+++ eclipse/buildConfigs/rcp/packager/packager.properties	27 Nov 2008 17:10:51 -0000
>@@ -40,7 +40,8 @@
> 	macosx, carbon, ppc & \
> 	macosx, carbon, x86 & \
> 	macosx, cocoa, ppc & \
>-	macosx, cocoa, x86
>+	macosx, cocoa, x86 & \
>+	macosx, cocoa, x86_64
> 
> archivesFormat =\
>  	win32, win32, x86-zip &\
>@@ -55,7 +56,8 @@
> 	macosx, carbon, ppc-tar & \
> 	macosx, carbon, x86-tar & \
> 	macosx, cocoa, ppc-tar & \
>-	macosx, cocoa, x86-tar
>+	macosx, cocoa, x86-tar	& \
>+	macosx, cocoa, x86_64-tar
> 
> ################ FOLDERS ############################
> #The directory used as a base for the all process
>Index: eclipse/buildConfigs/rcp/packager/packaging.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp/packager/packaging.properties,v
>retrieving revision 1.21
>diff -u -r1.21 packaging.properties
>--- eclipse/buildConfigs/rcp/packager/packaging.properties	8 Sep 2008 14:25:49 -0000	1.21
>+++ eclipse/buildConfigs/rcp/packager/packaging.properties	27 Nov 2008 17:10:51 -0000
>@@ -16,6 +16,7 @@
> root.permissions.755=eclipse,*.so*
> root.macosx.carbon.ppc.permissions.755=Eclipse.app/Contents/MacOS/eclipse
> root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse
>+root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
> root.win32.win32.x86=eclipse.exe,eclipsec.exe
> root.win32.win32.x86_64=eclipse.exe,eclipsec.exe
> root.win32.wpf.x86=eclipse.exe,eclipsec.exe
>@@ -32,6 +33,8 @@
> root.macosx.cocoa.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
> root.macosx.cocoa.x86=eclipse,Eclipse.app/
> root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
>+root.macosx.cocoa.x86_64=eclipse,Eclipse.app/
>+root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
> root.aix.motif.ppc=eclipse
> root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm
> 
>Index: eclipse/buildConfigs/sdk/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/build.properties,v
>retrieving revision 1.23
>diff -u -r1.23 build.properties
>--- eclipse/buildConfigs/sdk/build.properties	8 Sep 2008 14:25:49 -0000	1.23
>+++ eclipse/buildConfigs/sdk/build.properties	27 Nov 2008 17:10:51 -0000
>@@ -30,6 +30,7 @@
> 	win32, win32, ia64 &\
> 	macosx, carbon, ppc & \
> 	macosx, cocoa, x86 & \
>+	macosx, cocoa, x86_64 & \
> 	linux, gtk, x86 & \
> 	linux, gtk, ppc & \
> 	linux, gtk, x86_64 &\
>@@ -65,6 +66,7 @@
> 	hpux, motif, ia64_32-zip & \
> 	macosx, carbon, ppc-tar & \
> 	macosx, cocoa, x86-tar & \
>+	macosx, cocoa, x86_64-tar & \
> 	qnx, photon, x86-zip
> 
> javacFailOnError=false
>Index: eclipse/buildConfigs/sdk/customTargets.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/sdk/customTargets.xml,v
>retrieving revision 1.49
>diff -u -r1.49 customTargets.xml
>--- eclipse/buildConfigs/sdk/customTargets.xml	8 Sep 2008 14:25:49 -0000	1.49
>+++ eclipse/buildConfigs/sdk/customTargets.xml	27 Nov 2008 17:10:52 -0000
>@@ -48,10 +48,15 @@
> 		<property name="archiveName" value="eclipse-SDK-${buildId}-macosx-carbon.tar.gz" />
> 		<antcall target="assemble" />
> 	</target>
>-	
>+
> 	<target name="assemble.org.eclipse.sdk.macosx.cocoa.x86">
>-			<property name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa.tar.gz" />
>-			<antcall target="assemble" />
>+		<property name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa.tar.gz" />
>+		<antcall target="assemble" />
>+	</target>
>+
>+	<target name="assemble.org.eclipse.sdk.macosx.cocoa.x86_64">
>+		<property name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz" />
>+		<antcall target="assemble" />
> 	</target>
> 
> 	<target name="assemble.org.eclipse.sdk.linux.gtk.x86">
>@@ -183,15 +188,15 @@
> 	
> 	
> 	<target name="postFetch">
>-		<concat	destfile="${buildDirectory}/plugins/org.eclipse.platform/build.properties" append="true">qualifier=v${timestamp}</concat>
>-		<concat	destfile="${buildDirectory}/plugins/org.eclipse.sdk/build.properties" append="true">qualifier=v${timestamp}</concat>
>-		
>+		<concat destfile="${buildDirectory}/plugins/org.eclipse.platform/build.properties" append="true">qualifier=v${timestamp}</concat>
>+		<concat destfile="${buildDirectory}/plugins/org.eclipse.sdk/build.properties" append="true">qualifier=v${timestamp}</concat>
>+
> 		<ant antfile="${genericTargets}" target="fetchElement">
> 			<property name="type" value="feature" />
> 			<property name="id" value="org.eclipse.equinox.executable" />
> 		</ant>
> 		<zip zipfile="${buildDirectory}/plugins/org.eclipse.platform/launchersrc.zip" basedir="${buildDirectory}/features/org.eclipse.equinox.executable" includes="library/" />
>-		
>+
> 		
> 		<property name="linux.motif.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.motif.x86" />
> 		<mkdir dir="${linux.motif.rootfiles}" />
>Index: eclipse/buildConfigs/master/build.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/master/build.properties,v
>retrieving revision 1.27
>diff -u -r1.27 build.properties
>--- eclipse/buildConfigs/master/build.properties	10 Oct 2008 21:14:41 -0000	1.27
>+++ eclipse/buildConfigs/master/build.properties	27 Nov 2008 17:10:51 -0000
>@@ -41,6 +41,7 @@
> 	hpux, motif, ia64_32 & \
> 	macosx, carbon, ppc & \
> 	macosx, cocoa, x86 & \
>+	macosx, cocoa, x86_64 & \
> 	qnx, photon, x86
> 
> archivesFormat =group,group,group-zip
>Index: eclipse/helper.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/helper.xml,v
>retrieving revision 1.101
>diff -u -r1.101 helper.xml
>--- eclipse/helper.xml	26 Nov 2008 18:34:27 -0000	1.101
>+++ eclipse/helper.xml	27 Nov 2008 17:10:51 -0000
>@@ -112,12 +112,17 @@
> 				<antcall target="packageSwtStandalone">
> 					<param name="os" value="macosx" />
> 					<param name="ws" value="carbon" />
>-					<param name="arch" value="" />
>+					<param name="arch" value="ppc" />
>+				</antcall>
>+				<antcall target="packageSwtStandalone">
>+					<param name="os" value="macosx" />
>+					<param name="ws" value="cocoa" />
>+					<param name="arch" value="x86" />
> 				</antcall>
> 				<antcall target="packageSwtStandalone">
> 					<param name="os" value="macosx" />
> 					<param name="ws" value="cocoa" />
>-					<param name="arch" value="" />
>+					<param name="arch" value="x86_64" />
> 				</antcall>
> 				<antcall target="packageSwtStandalone">
> 					<param name="os" value="linux" />
>Index: eclipse/buildConfigs/rcp.deltapack/packager/packager.properties
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/eclipse/buildConfigs/rcp.deltapack/packager/packager.properties,v
>retrieving revision 1.16
>diff -u -r1.16 packager.properties
>--- eclipse/buildConfigs/rcp.deltapack/packager/packager.properties	8 Sep 2008 14:25:49 -0000	1.16
>+++ eclipse/buildConfigs/rcp.deltapack/packager/packager.properties	27 Nov 2008 17:10:51 -0000
>@@ -56,6 +56,7 @@
> 	aix, motif, ppc & \
> 	macosx, carbon, ppc & \
> 	macosx, cocoa, x86 & \
>+	macosx, cocoa, x86_64 & \
> 	delta, delta, delta
> 	
> deltaPack = true
>Index: packaging.map
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.releng.eclipsebuilder/packaging.map,v
>retrieving revision 1.25
>diff -u -r1.25 packaging.map
>--- packaging.map	8 Sep 2008 14:25:49 -0000	1.25
>+++ packaging.map	27 Nov 2008 17:10:51 -0000
>@@ -17,6 +17,7 @@
> master-root-launcher-aix.motif.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | aix,motif,ppc | eclipse/ | runtime | root-launcher
> master-root-launcher-macosx.carbon.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | macosx,carbon,ppc & macosx,carbon,x86| eclipse/ | runtime | root-launcher
> master-root-launcher-macosx.cocoa.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | macosx,cocoa,ppc & macosx,cocoa,x86| eclipse/ | runtime | root-launcher
>+master-root-launcher-macosx.cocoa.x86_64.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ |  macosx,cocoa,x86_64| eclipse/ | runtime | root-launcher
> 
> #primarily contain configuration directories
> master-root-sdk-win32.win32.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | win32,win32,x86 | eclipse/ | runtime | root-sdk
>@@ -32,6 +33,7 @@
> master-root-sdk-aix.motif.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | aix,motif,ppc | eclipse/ | runtime | root-sdk
> master-root-sdk-macosx.carbon.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | macosx,carbon,ppc & macosx,carbon,x86| eclipse/ | runtime | root-sdk
> master-root-sdk-macosx.cocoa.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | macosx,cocoa,ppc & macosx,cocoa,x86| eclipse/ | runtime | root-sdk
>+master-root-sdk-macosx.cocoa.x86_64.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | macosx,cocoa,x86_64| eclipse/ | runtime | root-sdk
> 
> master-root-platform-win32.win32.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | win32,win32,x86 | eclipse/ | runtime | root-platform
> master-root-platform-win32.win32.x86_64.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | win32,win32,x86_64 | eclipse/ | runtime | root-platform
>@@ -46,6 +48,7 @@
> master-root-platform-aix.motif.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | aix,motif,ppc | eclipse/ | runtime | root-platform
> master-root-platform-macosx.carbon.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | macosx,carbon,ppc & macosx,carbon,x86| eclipse/ | runtime | root-platform
> master-root-platform-macosx.cocoa.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | macosx,cocoa,ppc & macosx,cocoa,x86| eclipse/ | runtime | root-platform
>+master-root-platform-macosx.cocoa.x86_64.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | macosx,cocoa,x86_64 | eclipse/ | runtime | root-platform
> 
> master-root-rcp-@buildId@.zip=file:${buildDirectory}/${buildLabel}/ | | eclipse/ | runtime | root-rcp
>

Actions: View | Diff

Attachments on bug 256459: 118931 | 119059 | 119060 | 119177 | 119214 | 119228 | 119261 | 119494 | 119519 | 119576 | 119665