Attachment #118931 for bug #256459

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




         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"

         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"

         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.x86_64"
         os="macosx"
         ws="cocoa"
         arch="x86_64"
         download-size="0"
         install-size="0"
         version="0.0.0"

Lines 86-91 Link Here

(-)eclipse/buildConfigs/platform.sdk/packager/customTargets.xml (+6 lines)
86	<param name="archiveName" value="${archiveRoot}-macosx-cocoa-ppc.tar.gz" />	86	<param name="archiveName" value="${archiveRoot}-macosx-cocoa-ppc.tar.gz" />
87	</antcall>	87	</antcall>
88	</target>	88	</target>
		89
		90	<target name="assemble.macosx.cocoa.x86_64.xml">
		91	<antcall target="assembler">
		92	<param name="archiveName" value="${archiveRoot}-macosx-cocoa-x86_64.tar.gz" />
		93	</antcall>
		94	</target>
89		95
90	<target name="assembler">	96	<target name="assembler">
91	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />	97	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />

Lines 32-36 Link Here

(-)eclipse/buildConfigs/platform.sdk/packager/packaging.properties (+2 lines)
32	root.macosx.cocoa.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS	32	root.macosx.cocoa.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
33	root.macosx.cocoa.x86=eclipse,Eclipse.app/	33	root.macosx.cocoa.x86=eclipse,Eclipse.app/
34	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS	34	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
		35	root.macosx.cocoa.x86_64=eclipse,Eclipse.app/
		36	root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
35	root.aix.motif.ppc=eclipse	37	root.aix.motif.ppc=eclipse
36	root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm	38	root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm




	macosx, carbon, ppc & \
	macosx, carbon, x86 & \
	macosx, cocoa, ppc & \
	macosx, cocoa, x86 & \
	macosx, cocoa, x86_64

archivesFormat =\
 	win32, win32, x86-zip &\

	macosx, carbon, ppc-tar & \
	macosx, carbon, x86-tar & \
	macosx, cocoa, ppc-tar & \
	macosx, cocoa, x86-tar & \
	macosx, cocoa, x86_64-tar
	

################ FOLDERS ############################

Lines 67-72 Link Here

(-)equinox/buildConfigs/equinox-launchers/allElements.xml (+4 lines)
67	<property name="archiveName" value="launchers-macosx.cocoa.x86.${buildId}.tar.gz" />	67	<property name="archiveName" value="launchers-macosx.cocoa.x86.${buildId}.tar.gz" />
68	<antcall target="assemble" />	68	<antcall target="assemble" />
69	</target>	69	</target>
		70	<target name="assemble.org.eclipse.equinox.launchers-feature.macosx.cocoa.x86_64">
		71	<property name="archiveName" value="launchers-macosx.cocoa.x86_64.${buildId}.tar.gz" />
		72	<antcall target="assemble" />
		73	</target>
70		74
71	<target name="assemble">	75	<target name="assemble">
72	<mkdir dir="${equinoxPostingDirectory}/${buildLabel}/checksum" />	76	<mkdir dir="${equinoxPostingDirectory}/${buildLabel}/checksum" />

Lines 77-84 Link Here

(-)equinox/buildConfigs/equinox-launchers/customTargets.xml (-2 / +2 lines)
77	buildDirectory="${buildDirectory}"	77	buildDirectory="${buildDirectory}"
78	baseLocation="${baseLocation}"	78	baseLocation="${baseLocation}"
79	verify="true"	79	verify="true"
80	configInfo="win32,win32,x86 & win32,win32,x86_64 & win32, wpf, x86 & linux,gtk,x86 & linux, gtk, ppc & linux, gtk, ppc & linux, gtk, x86_64 & solaris, gtk, sparc & aix, motif, ppc & macosx, carbon, ppc & macosx, cocoa, x86 & hpux, motif, ia64_32"	80	configInfo="win32,win32,x86 & win32,win32,x86_64 & win32, wpf, x86 & linux,gtk,x86 & linux, gtk, ppc & linux, gtk, ppc & linux, gtk, x86_64 & solaris, gtk, sparc & aix, motif, ppc & macosx, carbon, ppc & macosx, cocoa, x86 & macosx, cocoa, x86_64 & hpux, motif, ia64_32"
81	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"	81	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"
82	featureList="master-root"	82	featureList="master-root"
83	includeLaunchers="false" />	83	includeLaunchers="false" />
84	<!-- copy build.properties to generated feature -->	84	<!-- copy build.properties to generated feature -->




	hpux, motif, ia64_32 &\
	aix, motif, ppc &\
	macosx, carbon, ppc &\
	macosx, cocoa, x86 &\
	macosx, cocoa, x86_64
#	linux, motif, x86 & \
#	solaris, motif, sparc & \
#	hpux, motif, PA_RISC & \

	solaris, gtk, sparc-zip &\
	aix, motif, ppc-zip &\
	macosx, carbon, ppc-tar &\
	macosx, cocoa, x86-tar &\
	macosx, cocoa, x86_64-tar
	#	solaris, motif, sparc - antZip& \
	#	hpux, motif, PA_RISC - antZip& \
	

Lines 154-159 Link Here

(-)eclipse/buildConfigs/sdk.tests/testScripts/readme.html (+2 lines)
154	<tr>	154	<tr>
155	<td>macosx</td><td>cocoa</td><td>x86</td></tr>	155	<td>macosx</td><td>cocoa</td><td>x86</td></tr>
156	<tr>	156	<tr>
		157	<td>macosx</td><td>cocoa</td><td>x86_64</td></tr>
		158	<tr>
157	<td>solaris</td><td>gtk</td><td>sparc</td></tr>	159	<td>solaris</td><td>gtk</td><td>sparc</td></tr>
158	<tr>	160	<tr>
159	<td>solaris</td><td>motif</td><td>sparc</td></tr>	161	<td>solaris</td><td>motif</td><td>sparc</td></tr>

Lines 173-178 Link Here

(-)eclipse/buildConfigs/sdk.tests/testScripts/test.xml (+7 lines)
173	<equals arg1="${arch}" arg2="x86" />	173	<equals arg1="${arch}" arg2="x86" />
174	</and>	174	</and>
175	</condition>	175	</condition>
		176	<condition property="runtimeArchive" value="eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz">
		177	<and>
		178	<equals arg1="${os}" arg2="macosx" />
		179	<equals arg1="${ws}" arg2="cocoa" />
		180	<equals arg1="${arch}" arg2="x86_64" />
		181	</and>
		182	</condition>
176	<condition property="runtimeArchive" value="eclipse-SDK-${buildId}-hpux-motif.zip">	183	<condition property="runtimeArchive" value="eclipse-SDK-${buildId}-hpux-motif.zip">
177	<and>	184	<and>
178	<equals arg1="${os}" arg2="hpux" />	185	<equals arg1="${os}" arg2="hpux" />

Lines 55-60 Link Here

(-)equinox/buildConfigs/equinox.prov/run.xml (+79 lines)
55	<mkdir dir="${p2.sdk.install.macosx.carbon.x86}" />	55	<mkdir dir="${p2.sdk.install.macosx.carbon.x86}" />
56	<property name="p2.sdk.install.macosx.cocoa.x86" value="${p2.output.base}/sdk.install.macosx.cocoa.x86" />	56	<property name="p2.sdk.install.macosx.cocoa.x86" value="${p2.output.base}/sdk.install.macosx.cocoa.x86" />
57	<mkdir dir="${p2.sdk.install.macosx.cocoa.x86}" />	57	<mkdir dir="${p2.sdk.install.macosx.cocoa.x86}" />
		58	<property name="p2.sdk.install.macosx.cocoa.x86_64" value="${p2.output.base}/sdk.install.macosx.cocoa.x86_64" />
		59	<mkdir dir="${p2.sdk.install.macosx.cocoa.x86_64}" />
58		60
59	<!--platform zips-->	61	<!--platform zips-->
60	<property name="p2.platform.install.win32.win32.x86" value="${p2.output.base}/platform.install.win32.win32.x86" />	62	<property name="p2.platform.install.win32.win32.x86" value="${p2.output.base}/platform.install.win32.win32.x86" />
Lines 79-84 Link Here
79	<mkdir dir="${p2.platform.install.macosx.carbon.x86}" />	81	<mkdir dir="${p2.platform.install.macosx.carbon.x86}" />
80	<property name="p2.platform.install.macosx.cocoa.x86" value="${p2.output.base}/platform.install.macosx.cocoa.x86" />	82	<property name="p2.platform.install.macosx.cocoa.x86" value="${p2.output.base}/platform.install.macosx.cocoa.x86" />
81	<mkdir dir="${p2.platform.install.macosx.cocoa.x86}" />	83	<mkdir dir="${p2.platform.install.macosx.cocoa.x86}" />
		84	<property name="p2.platform.install.macosx.cocoa.x86_64" value="${p2.output.base}/platform.install.macosx.cocoa.x86_64" />
		85	<mkdir dir="${p2.platform.install.macosx.cocoa.x86_64}" />
82		86
83	<!--platform sdk zips-->	87	<!--platform sdk zips-->
84	<property name="p2.platformsdk.install.win32.win32.x86" value="${p2.output.base}/platformsdk.install.win32.win32.x86" />	88	<property name="p2.platformsdk.install.win32.win32.x86" value="${p2.output.base}/platformsdk.install.win32.win32.x86" />
Lines 103-108 Link Here
103	<mkdir dir="${p2.platformsdk.install.macosx.carbon.x86}" />	107	<mkdir dir="${p2.platformsdk.install.macosx.carbon.x86}" />
104	<property name="p2.platformsdk.install.macosx.cocoa.x86" value="${p2.output.base}/platformsdk.install.macosx.cocoa.x86" />	108	<property name="p2.platformsdk.install.macosx.cocoa.x86" value="${p2.output.base}/platformsdk.install.macosx.cocoa.x86" />
105	<mkdir dir="${p2.platformsdk.install.macosx.cocoa.x86}" />	109	<mkdir dir="${p2.platformsdk.install.macosx.cocoa.x86}" />
		110	<property name="p2.platformsdk.install.macosx.cocoa.x86_64" value="${p2.output.base}/platformsdk.install.macosx.cocoa.x86_64" />
		111	<mkdir dir="${p2.platformsdk.install.macosx.cocoa.x86_64}" />
106		112
107	<property name="base" value="${p2.output.base}/base" />	113	<property name="base" value="${p2.output.base}/base" />
108	<mkdir dir="${base}" />	114	<mkdir dir="${base}" />
Lines 314-319 Link Here
314	<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />	320	<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
315	<param name="p2.director.version" value="3.5.0.${buildId}" />	321	<param name="p2.director.version" value="3.5.0.${buildId}" />
316	<param name="p2.director.profile" value="SDKProfile" />	322	<param name="p2.director.profile" value="SDKProfile" />
		323	<param name="p2.director.install.path" value="${p2.sdk.install.macosx.cocoa.x86_64}/eclipse" />
		324	<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
		325	<param name="p2.os" value="macosx" />
		326	<param name="p2.ws" value="cocoa" />
		327	<param name="p2.arch" value="x86_64" />
		328	<param name="p2.repo" value="${updateSite}" />
		329	</antcall>
		330
		331	<antcall target="run.director">
		332	<param name="p2.director.installIU" value="org.eclipse.sdk.ide" />
		333	<param name="p2.director.version" value="3.5.0.${buildId}" />
		334	<param name="p2.director.profile" value="SDKProfile" />
317	<param name="p2.director.install.path" value="${p2.sdk.install.hpux.motif.ia64_32}/eclipse" />	335	<param name="p2.director.install.path" value="${p2.sdk.install.hpux.motif.ia64_32}/eclipse" />
318	<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />	336	<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
319	<param name="p2.os" value="hpux" />	337	<param name="p2.os" value="hpux" />
Lines 449-454 Link Here
449	<param name="p2.director.installIU" value="org.eclipse.platform.ide" />	467	<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
450	<param name="p2.director.version" value="3.5.0.${buildId}" />	468	<param name="p2.director.version" value="3.5.0.${buildId}" />
451	<param name="p2.director.profile" value="PlatformProfile" />	469	<param name="p2.director.profile" value="PlatformProfile" />
		470	<param name="p2.director.install.path" value="${p2.platform.install.macosx.cocoa.x86_64}/eclipse" />
		471	<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
		472	<param name="p2.os" value="macosx" />
		473	<param name="p2.ws" value="cocoa" />
		474	<param name="p2.arch" value="x86_64" />
		475	<param name="p2.repo" value="${updateSite}" />
		476	</antcall>
		477
		478	<antcall target="run.director">
		479	<param name="p2.director.installIU" value="org.eclipse.platform.ide" />
		480	<param name="p2.director.version" value="3.5.0.${buildId}" />
		481	<param name="p2.director.profile" value="PlatformProfile" />
452	<param name="p2.director.install.path" value="${p2.platform.install.hpux.motif.ia64_32}/eclipse" />	482	<param name="p2.director.install.path" value="${p2.platform.install.hpux.motif.ia64_32}/eclipse" />
453	<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />	483	<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
454	<param name="p2.os" value="hpux" />	484	<param name="p2.os" value="hpux" />
Lines 584-589 Link Here
584	<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />	614	<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
585	<param name="p2.director.version" value="3.5.0.${buildId}" />	615	<param name="p2.director.version" value="3.5.0.${buildId}" />
586	<param name="p2.director.profile" value="PlatformSDKProfile" />	616	<param name="p2.director.profile" value="PlatformSDKProfile" />
		617	<param name="p2.director.install.path" value="${p2.platformsdk.install.macosx.cocoa.x86_64}/eclipse" />
		618	<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
		619	<param name="p2.os" value="macosx" />
		620	<param name="p2.ws" value="cocoa" />
		621	<param name="p2.arch" value="x86_64" />
		622	<param name="p2.repo" value="${updateSite}" />
		623	</antcall>
		624
		625	<antcall target="run.director">
		626	<param name="p2.director.installIU" value="org.eclipse.platform.sdk" />
		627	<param name="p2.director.version" value="3.5.0.${buildId}" />
		628	<param name="p2.director.profile" value="PlatformSDKProfile" />
587	<param name="p2.director.install.path" value="${p2.platformsdk.install.hpux.motif.ia64_32}/eclipse" />	629	<param name="p2.director.install.path" value="${p2.platformsdk.install.hpux.motif.ia64_32}/eclipse" />
588	<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />	630	<param name="p2.director.extraArgs" value="-profileProperties org.eclipse.update.install.features=true" />
589	<param name="p2.os" value="hpux" />	631	<param name="p2.os" value="hpux" />
Lines 844-849 Link Here
844	<exec dir="${p2.sdk.install.macosx.cocoa.x86}/eclipse" executable="ln">	886	<exec dir="${p2.sdk.install.macosx.cocoa.x86}/eclipse" executable="ln">
845	<arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />	887	<arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />
846	</exec>	888	</exec>
		889	<delete file="${p2.sdk.install.macosx.cocoa.x86_64}/eclipse/eclipse" failonerror="false" />
		890	<exec dir="${p2.sdk.install.macosx.cocoa.x86_64}/eclipse" executable="ln">
		891	<arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />
		892	</exec>
847	<antcall target="p2.tar">	893	<antcall target="p2.tar">
848	<param name="tar.base.dir" value="${p2.sdk.install.macosx.cocoa.x86}" />	894	<param name="tar.base.dir" value="${p2.sdk.install.macosx.cocoa.x86}" />
849	<param name="tar.base.filename" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-macosx-cocoa.tar" />	895	<param name="tar.base.filename" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-macosx-cocoa.tar" />
Lines 851-856 Link Here
851	<antcall target="generateChecksums">	897	<antcall target="generateChecksums">
852	<param name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa.tar.gz" />	898	<param name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa.tar.gz" />
853	</antcall>	899	</antcall>
		900	<antcall target="p2.tar">
		901	<param name="tar.base.dir" value="${p2.sdk.install.macosx.cocoa.x86_64}" />
		902	<param name="tar.base.filename" value="${postingDirectory}/${buildLabel}/eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar" />
		903	</antcall>
		904	<antcall target="generateChecksums">
		905	<param name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz" />
		906	</antcall>
854	</sequential>	907	</sequential>
855		908
856		909
Lines 1056-1061 Link Here
1056	<antcall target="generateChecksums">	1109	<antcall target="generateChecksums">
1057	<param name="archiveName" value="eclipse-platform-${buildId}-macosx-cocoa.tar.gz" />	1110	<param name="archiveName" value="eclipse-platform-${buildId}-macosx-cocoa.tar.gz" />
1058	</antcall>	1111	</antcall>
		1112
		1113	<!-- macosx cocoa x86_64-->
		1114	<delete file="${p2.platform.install.macosx.cocoa.x86_64}/eclipse/eclipse" failonerror="false" />
		1115	<exec dir="${p2.platform.install.macosx.cocoa.x86_64}/eclipse" executable="ln">
		1116	<arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />
		1117	</exec>
		1118	<antcall target="p2.tar">
		1119	<param name="tar.base.dir" value="${p2.platform.install.macosx.cocoa.x86_64}" />
		1120	<param name="tar.base.filename" value="${postingDirectory}/${buildLabel}/eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar" />
		1121	</antcall>
		1122	<antcall target="generateChecksums">
		1123	<param name="archiveName" value="eclipse-platform-${buildId}-macosx-cocoa-x86_64.tar.gz" />
		1124	</antcall>
1059	</sequential>	1125	</sequential>
1060	</parallel>	1126	</parallel>
1061		1127
Lines 1167-1172 Link Here
1167	<antcall target="generateChecksums">	1233	<antcall target="generateChecksums">
1168	<param name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa.tar.gz" />	1234	<param name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa.tar.gz" />
1169	</antcall>	1235	</antcall>
		1236
		1237	<!-- macosx cocoa x86_64 -->
		1238	<delete file="${p2.platformsdk.install.macosx.cocoa.x86_64}/eclipse/eclipse" failonerror="false" />
		1239	<exec dir="${p2.platformsdk.install.macosx.cocoa.x86_64}/eclipse" executable="ln">
		1240	<arg line="-s Eclipse.app/Contents/MacOS/eclipse eclipse" />
		1241	</exec>
		1242	<antcall target="p2.tar">
		1243	<param name="tar.base.dir" value="${p2.platformsdk.install.macosx.cocoa.x86_64}" />
		1244	<param name="tar.base.filename" value="${postingDirectory}/${buildLabel}/eclipse-platform-SDK-${buildId}-macosx-cocoa-x86_64.tar" />
		1245	</antcall>
		1246	<antcall target="generateChecksums">
		1247	<param name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz" />
		1248	</antcall>
1170	</sequential>	1249	</sequential>
1171	</parallel>	1250	</parallel>
1172		1251

Lines 36-41 Link Here

(-)eclipse/buildConfigs/rcp.sdk/build.properties (+2 lines)
36	hpux, motif, ia64_32 & \	36	hpux, motif, ia64_32 & \
37	macosx, carbon, ppc &\	37	macosx, carbon, ppc &\
38	macosx, cocoa, x86 &\	38	macosx, cocoa, x86 &\
		39	macosx, cocoa, x86_64 &\
39	qnx, photon, x86	40	qnx, photon, x86
40		41
41	#no qnx photon builds until 1.4 J9 vm becomes available	42	#no qnx photon builds until 1.4 J9 vm becomes available
Lines 57-62 Link Here
57	hpux, motif, ia64_32-zip & \	58	hpux, motif, ia64_32-zip & \
58	macosx, carbon, ppc-tar & \	59	macosx, carbon, ppc-tar & \
59	macosx, cocoa, x86-tar & \	60	macosx, cocoa, x86-tar & \
		61	macosx, cocoa, x86_64-tar & \
60	qnx, photon, x86-zip	62	qnx, photon, x86-zip
61		63
62	bootclasspath=${java.home}/lib/rt.jar	64	bootclasspath=${java.home}/lib/rt.jar

Lines 90-95 Link Here

(-)eclipse/buildConfigs/rcp.sdk/customTargets.xml (+6 lines)
90	<property name="archiveName" value="eclipse-RCP-SDK-${buildId}-macosx-cocoa.tar.gz" />	90	<property name="archiveName" value="eclipse-RCP-SDK-${buildId}-macosx-cocoa.tar.gz" />
91	<antcall target="assemble" />	91	<antcall target="assemble" />
92	</target>	92	</target>
		93
		94	<target name="assemble.org.eclipse.rcp.sdk.macosx.cocoa.x86_64">
		95	<property name="archiveName" value="eclipse-RCP-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz" />
		96	<antcall target="assemble" />
		97	</target>
		98
93		99
94	<target name="assemble">	100	<target name="assemble">
95	<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />	101	<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />

Lines 146-152 Link Here

(-)equinox/publishingFiles/testManifest.xml (-1 / +3 lines)
146	</platform>	146	</platform>
147	<platform id="SMC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="launchers-macosx.carbon.ppc.@buildid@.tar.gz">	147	<platform id="SMC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="launchers-macosx.carbon.ppc.@buildid@.tar.gz">
148	</platform>	148	</platform>
149	<platform id="SMCC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="launchers-macosx.cocoa.x86.@buildid@.tar.gz">	149	<platform id="SMCC" name="Mac OSX (Mac/Cocoa) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="launchers-macosx.cocoa.x86.@buildid@.tar.gz">
		150	</platform>
		151	<platform id="SMCC" name="Mac OSX (Mac/Cocoa/x86_64) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="launchers-macosx.cocoa.x86_64.@buildid@.tar.gz">
150	</platform>	152	</platform>
151	</zipType>	153	</zipType>
152		154




		<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>

		<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">

		<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">

		<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">

		<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">

		<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-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">

Lines 36-41 Link Here

(-)eclipse/buildConfigs/platform.sdk/build.properties (+2 lines)
36	hpux, motif, ia64_32 & \	36	hpux, motif, ia64_32 & \
37	macosx, carbon, ppc &\	37	macosx, carbon, ppc &\
38	macosx, cocoa, x86 &\	38	macosx, cocoa, x86 &\
		39	macosx, cocoa, x86_64 &\
39	hpux, motif, ia64_32 & \	40	hpux, motif, ia64_32 & \
40	qnx, photon, x86	41	qnx, photon, x86
41		42
Lines 58-63 Link Here
58	hpux, motif, ia64_32-zip & \	59	hpux, motif, ia64_32-zip & \
59	macosx, carbon, ppc-tar & \	60	macosx, carbon, ppc-tar & \
60	macosx, cocoa, x86-tar & \	61	macosx, cocoa, x86-tar & \
		62	macosx, cocoa, x86_64-tar & \
61	qnx, photon, x86-zip	63	qnx, photon, x86-zip
62		64
63	bootclasspath=${java.home}/lib/rt.jar	65	bootclasspath=${java.home}/lib/rt.jar




<project name="Build specific targets and properties" default="noDefault" basedir=".">

	<property name="postingDirectory" value="${buildDirectory}" />

	<!-- ===================================================================== -->
	<!-- Run a given ${target} on all elements being built -->
	<!-- ===================================================================== -->

		<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>

	<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>

	<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" />

		<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.ppc">
		<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" />
	</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">

		<antcall target="assemble" />
	</target>

	<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" />
	</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>

	<!-- ===================================================================== -->
	<!-- Check out map files from correct repository -->

	</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="getPrebuiltElements">
		<generateBaseFetchScript mapfile="${buildDirectory}/maps/org.eclipse.releng/maps/base.map" outputfile="${buildDirectory}/fetchbase.xml" />
			mapfile="${buildDirectory}/maps/org.eclipse.releng/maps/base.map"
			outputfile="${buildDirectory}/fetchbase.xml"/>
		<ant antfile="${buildDirectory}/fetchbase.xml" />
	</target>


			<property name="id" value="org.eclipse.equinox.executable" />
		</ant>
		<!--create launchersrc.zip and copy to org.eclipse.platform plugin (fix for bug #49237) -->
		<zip destfile="${buildDirectory}/plugins/org.eclipse.platform/launchersrc.zip" basedir="${buildDirectory}/features/org.eclipse.equinox.executable" includes="library/**" />

	</target>


Lines 84-89 Link Here

(-)eclipse/buildConfigs/platform/customTargets.xml (+5 lines)
84	<property name="archiveName" value="eclipse-platform-${buildId}-macosx-cocoa.tar.gz" />	84	<property name="archiveName" value="eclipse-platform-${buildId}-macosx-cocoa.tar.gz" />
85	<antcall target="assemble" />	85	<antcall target="assemble" />
86	</target>	86	</target>
		87
		88	<target name="assemble.org.eclipse.platform.macosx.cocoa.x86_64">
		89	<property name="archiveName" value="eclipse-platform-${buildId}-macosx-cocoa.x86_64.tar.gz" />
		90	<antcall target="assemble" />
		91	</target>
87		92
88	<target name="assemble">	93	<target name="assemble">
89	<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />	94	<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />

Lines 36-41 Link Here

(-)eclipse/buildConfigs/platform/build.properties (+2 lines)
36	hpux, motif, ia64_32 & \	36	hpux, motif, ia64_32 & \
37	macosx, carbon, ppc &\	37	macosx, carbon, ppc &\
38	macosx, cocoa, x86 &\	38	macosx, cocoa, x86 &\
		39	macosx, cocoa, x86_64 &\
39	hpux, motif, ia64_32 & \	40	hpux, motif, ia64_32 & \
40	qnx, photon, x86	41	qnx, photon, x86
41		42
Lines 55-60 Link Here
55	hpux, motif, ia64_32-zip & \	56	hpux, motif, ia64_32-zip & \
56	macosx, carbon, ppc-tar & \	57	macosx, carbon, ppc-tar & \
57	macosx, cocoa, x86-tar & \	58	macosx, cocoa, x86-tar & \
		59	macosx, cocoa, x86_64-tar & \
58	qnx, photon, x86-zip	60	qnx, photon, x86-zip
59		61
60	#no qnx photon builds until 1.4 J9 vm becomes available	62	#no qnx photon builds until 1.4 J9 vm becomes available




	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 &\

	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 &\

	platform-aix, motif, ppc & \
	platform-macosx, carbon, ppc &\
	platform-macosx, cocoa, x86 &\
	platform-macosx, cocoa, x86_64 &\
	\
	rcp-common, common, common&\
	\

	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 &\

	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 &\

	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&\
	\




<project name="Build specific targets and properties" default="noDefault">


	<property name="postingDirectory" value="${buildDirectory}" />

	<!-- ****** figure out how to build the platform, sdk, examples, ... from one compile"
see the sdkFeatures, platformFeatures, ... targets in the orginal customTargets  -->
	<target name="allElements">
		<ant antfile="${genericTargets}" target="${target}">
			<property name="type" value="feature" />
			<property name="id" value="master-root" />
		</ant>

	<!-- Targets to assemble the built elements for particular configurations  -->
	<!-- ===================================================================== -->
	<target name="assemble.master-root.common.common.common">
		<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" />
		<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" />
		<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" />
	</target>
	<target name="assemble.master-root.launcher-win32.win32.x86">
		<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>
	<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>
	<target name="assemble.master-root.launcher-linux.gtk.x86_64">
		<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" />
		<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>
	<target name="assemble.master-root.launcher-solaris.gtk.sparc">
		<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" />
		<antcall target="assemble" />
	</target>
	<target name="assemble.master-root.launcher-macosx.carbon.ppc">
		<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" />
		<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" />
		<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>
	<target name="assemble.master-root.sdk-win32.wpf.x86">
		<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" />
		<antcall target="assemble" />
	</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>
	<target name="assemble.master-root.sdk-linux.gtk.x86_64">
		<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" />
		<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" />
		<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" />
		<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" />
		<antcall target="assemble" />
	</target>
	<target name="assemble.master-root.sdk-macosx.carbon.ppc">
		<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" />
		<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" />
		<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" />
		<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>
	<target name="assemble.master-root.platform-win32.wpf.x86">
		<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" />
		<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" />
		<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" />
		<antcall target="assemble" />
	</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" />
	</target>
	<target name="assemble.master-root.platform-solaris.gtk.sparc">
		<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" />
		<antcall target="assemble" />
	</target>
	<target name="assemble.master-root.platform-macosx.carbon.ppc">
		<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" />
		<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" />
		<antcall target="assemble" />
	</target>
	<target name="assemble.master-root.examples-common.common.common">
		<property name="archiveName" value="master-root-examples-${buildId}.zip" />
		<antcall target="assemble" />
	</target>
	<target name="assemble.master-root.equinox-launcher-linux.gtk.x86">

		<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" />
	</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" />
	</target>
	<target name="assemble.master-root.equinox-launcher-linux.gtk.x86_64">
		<property name="archiveName" value="launchers-linux.gtk.x86_64.${buildId}.tar.gz" />

		<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" />
	</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 name="assemble.master-root.equinox-launcher-solaris.gtk.sparc">
		<property name="archiveName" value="launchers-solaris.gtk.sparc.${buildId}.zip" />
		<antcall target="assemble.equinox" />

	<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 name="assemble.master-root.equinox-launcher-macosx.carbon.ppc">
		<property name="archiveName" value="launchers-macosx.carbon.ppc.${buildId}.tar.gz" />
		<antcall target="assemble.equinox" />

		<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}" />

		<!-- ***  change the repo info -->
		<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}" />
		package="org.eclipse.releng"
		dest="${buildDirectory}/maps"
		tag="${mapVersionTag}"
	/>
		<!--compare the map files project-->
		<antcall target="compareMapFiles" />
		<!--tag the map files project-->

	</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}" />

	<!-- ===================================================================== -->
	<!-- Steps to do after setup but before starting the build proper -->
	<!-- ===================================================================== -->
	<target name="postSetup">
	</target>

	<!-- ===================================================================== -->

Lines 28-33 Link Here

(-)eclipse/buildConfigs/rcp.sdk/packager/packaging.properties (+2 lines)
28	root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS	28	root.macosx.carbon.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
29	root.macosx.cocoa.x86=eclipse,Eclipse.app/	29	root.macosx.cocoa.x86=eclipse,Eclipse.app/
30	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS	30	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
		31	root.macosx.cocoa.x86_64=eclipse,Eclipse.app/
		32	root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
31	root.aix.motif.ppc=eclipse	33	root.aix.motif.ppc=eclipse
32	root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm	34	root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm
33	root.solaris.motif.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm	35	root.solaris.motif.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm




	solaris, motif, sparc & \
	aix, motif, ppc & \
	macosx, carbon, ppc & \
	macosx, cocoa, x86 & \
	macosx, cocoa, x86_64

archivesFormat =\
 	win32, win32, x86-zip &\

	solaris, gtk, sparc-zip & \
	aix, motif, ppc-zip & \
	macosx, carbon, ppc-tar & \
	macosx, cocoa, x86-tar & \
	macosx, cocoa, x86_64-tar

################ FOLDERS ############################
#The directory used as a base for the all process




			<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>


</project>




		<param name="archiveName" value="${archiveRoot}-macosx.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="assembler">
	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />

Lines 46-51 Link Here

(-)eclipse/buildConfigs/sdk/packager/packager.properties (-1 / +3 lines)
46	macosx, carbon, x86 &\	46	macosx, carbon, x86 &\
47	macosx, cocoa, ppc &\	47	macosx, cocoa, ppc &\
48	macosx, cocoa, x86 &\	48	macosx, cocoa, x86 &\
		49	macosx, cocoa, x86_64 &\
49	linux, gtk, x86 &\	50	linux, gtk, x86 &\
50	linux, gtk, ppc & \	51	linux, gtk, ppc & \
51	linux, motif, x86 & \	52	linux, motif, x86 & \
Lines 68-74 Link Here
68	macosx, carbon, ppc-tar & \	69	macosx, carbon, ppc-tar & \
69	macosx, carbon, x86-tar & \	70	macosx, carbon, x86-tar & \
70	macosx, cocoa, ppc-tar & \	71	macosx, cocoa, ppc-tar & \
71	macosx, cocoa, x86-tar	72	macosx, cocoa, x86-tar & \
		73	macosx, cocoa, x86_64-tar
72		74
73	################ FOLDERS ############################	75	################ FOLDERS ############################
74	#The directory used as a base for the all process	76	#The directory used as a base for the all process

Lines 95-100 Link Here

(-)eclipse/buildConfigs/sdk/packager/customTargets.xml (+5 lines)
95	</antcall>	95	</antcall>
96	</target>	96	</target>
97		97
		98	<target name="assemble.macosx.cocoa.x86_64.xml">
		99	<antcall target="assembler">
		100	<param name="archiveName" value="${archiveRoot}-macosx-cocoa-x86_64.tar.gz" />
		101	</antcall>
		102	</target>
98		103
99	<target name="assembler">	104	<target name="assembler">
100	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />	105	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />

Lines 52-58 Link Here

(-)eclipse/buildConfigs/sdk/srcBuild/build (-1 / +1 lines)
52	exit 1	52	exit 1
53	fi	53	fi
54		54
55	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" ]	55	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" ]
56	then	56	then
57	ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH	57	ORIGCLASSPATH=$CLASSPATH;export ORIGCLASSPATH
58	ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml -propertyfile build.properties	58	ant -q -buildfile jdtcoresrc/compilejdtcorewithjavac.xml -propertyfile build.properties

Lines 48-53 Link Here

(-)eclipse/buildConfigs/sdk/srcBuild/build.bat (+1 lines)
48	if %installOs%-%ws%-%arch%==hpux-motif-ia64_32 goto run	48	if %installOs%-%ws%-%arch%==hpux-motif-ia64_32 goto run
49	if %installOs%-%ws%-%arch%==macosx-carbon-ppc goto run	49	if %installOs%-%ws%-%arch%==macosx-carbon-ppc goto run
50	if %installOs%-%ws%-%arch%==macosx-cocoa-x86 goto run	50	if %installOs%-%ws%-%arch%==macosx-cocoa-x86 goto run
		51	if %installOs%-%ws%-%arch%==macosx-cocoa-x86_64 goto run
51		52
52	ECHO The ws os arch combination entered is not valid.	53	ECHO The ws os arch combination entered is not valid.
53	goto end	54	goto end

Lines 43-47 Link Here

(-)equinox/buildConfigs/equinox-launchers/equinox-launchers-buildinfo/build.properties (+3 lines)
43		43
44	root.macosx.cocoa.x86=../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc	44	root.macosx.cocoa.x86=../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc
45	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse	45	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
		46	root.macosx.cocoa.x86_64=../../features/org.eclipse.equinox.executable/bin/carbon/macosx/ppc
		47	root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse
		48
46	root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt	49	root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse,Eclipse.app/Contents/MacOS/java_swt
47		50

Lines 29-36 Link Here

(-)eclipse/buildConfigs/platform/packager/packaging.properties (-2 / +2 lines)
29	root.macosx.carbon.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS	29	root.macosx.carbon.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
30	root.macosx.cocoa.x86=eclipse,Eclipse.app/	30	root.macosx.cocoa.x86=eclipse,Eclipse.app/
31	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS	31	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
32	root.macosx.cocoa.x86=eclipse,Eclipse.app/	32	root.macosx.cocoa.x86_64=eclipse,Eclipse.app/
33	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS	33	root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
34	root.aix.motif.ppc=eclipse	34	root.aix.motif.ppc=eclipse
35	root.hpux.motif.PA_RISC=eclipse	35	root.hpux.motif.PA_RISC=eclipse
36	root.hpux.motif.ia64_32=eclipse	36	root.hpux.motif.ia64_32=eclipse




			<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>
	</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>


</project>

Lines 52-58 Link Here

(-)eclipse/buildConfigs/platform/packager/packager.properties (-1 / +3 lines)
52	macosx, carbon, ppc & \	52	macosx, carbon, ppc & \
53	macosx, carbon, x86 & \	53	macosx, carbon, x86 & \
54	macosx, cocoa, ppc & \	54	macosx, cocoa, ppc & \
55	macosx, cocoa, x86	55	macosx, cocoa, x86 & \
		56	macosx, cocoa, x86_64
56		57
57	archivesFormat =\	58	archivesFormat =\
58	win32, win32, x86-zip &\	59	win32, win32, x86-zip &\
Lines 67-72 Link Here
67	macosx, carbon, ppc-tar & \	68	macosx, carbon, ppc-tar & \
68	macosx, carbon, x86-tar & \	69	macosx, carbon, x86-tar & \
69	macosx, cocoa, ppc-tar & \	70	macosx, cocoa, ppc-tar & \
		71	macosx, cocoa, x86_64-tar & \
70	macosx, cocoa, x86-tar	72	macosx, cocoa, x86-tar
71		73
72	################ FOLDERS ############################	74	################ FOLDERS ############################

Lines 54-59 Link Here

(-)eclipse/buildConfigs/rcp/build.properties (+1 lines)
54	hpux, motif, ia64-zip & \	54	hpux, motif, ia64-zip & \
55	macosx, carbon, ppc-tar & \	55	macosx, carbon, ppc-tar & \
56	macosx, cocoa, x86-tar & \	56	macosx, cocoa, x86-tar & \
		57	macosx, cocoa, x86_64-tar & \
57	qnx, photon, x86-zip	58	qnx, photon, x86-zip
58		59
59	bootclasspath=${java.home}/lib/rt.jar	60	bootclasspath=${java.home}/lib/rt.jar




<project name="Build specific targets and properties" default="noDefault" basedir=".">

	<property name="postingDirectory" value="${buildDirectory}" />

	<!-- ===================================================================== -->
	<!-- Run a given ${target} on all elements being built -->
	<!-- ===================================================================== -->
	<target name="allElements">
		<ant antfile="${genericTargets}" target="${target}">
			<property name="type" value="feature" />
			<property name="id" value="org.eclipse.rcp" />
		</ant>
	</target>

	<!-- ===================================================================== -->
	<!-- Targets to assemble the built elements for particular configurations  -->
	<!-- These generally call the generated assemble scripts (named in -->
	<!-- ${assembleScriptName}) but may also add pre and post processing -->
	<!-- Add one target for each root element and each configuration -->
	<!-- ===================================================================== -->

	<!-- POST STEPS TO ADD -->
	<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>

<!-- ===================================================================== -->
<!-- Run a given ${target} on all elements being built -->
<!-- ===================================================================== -->
<target name="allElements">
	<ant antfile="${genericTargets}" target="${target}" >
		<property name="type" value="feature" />
		<property name="id" value="org.eclipse.rcp" />
	</ant>
</target>

<!-- ===================================================================== -->
<!-- Targets to assemble the built elements for particular configurations  -->
<!-- These generally call the generated assemble scripts (named in -->
<!-- ${assembleScriptName}) but may also add pre and post processing -->
<!-- Add one target for each root element and each configuration -->
<!-- ===================================================================== -->

<!-- POST STEPS TO ADD -->
<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>


	<!-- ===================================================================== -->
	<!-- Check out map files from correct repository -->
	<!-- Replace values for cvsRoot, package and mapVersionTag as desired. -->
	<!-- ===================================================================== -->
	<target name="checkLocal">
		<available property="mapsLocal" file="${buildDirectory}/maps/org.eclipse.releng" />
	</target>
	<target name="getMapFiles" depends="checkLocal" unless="mapsLocal">

		<!-- ***  change the repo info -->
		<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}" />
		<!--tag the map files project-->
		<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">
		<!-- Stores tag on the filesystem so map files can be compared -->
		<echo file="${mapTag.properties}">

<target name="tagMapFiles" if="tagMaps">
	<!-- Stores tag on the filesystem so map files can be compared -->
	<echo file="${mapTag.properties}">
	lastMapTag=${buildId}
</echo>
		<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>

	<!-- ===================================================================== -->
	<!-- Steps to do before setup -->
	<!-- ===================================================================== -->
	<target name="preSetup">
	</target>

	<!-- ===================================================================== -->
	<!-- Steps to do after setup but before starting the build proper -->
	<!-- ===================================================================== -->
	<target name="postSetup">
		<!--fetch the additional pieces to build swt gtk64-->
		<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>

	<!-- ===================================================================== -->
	<!-- Steps to do before fetching the build elements -->
	<!-- ===================================================================== -->
	<target name="preFetch">
	</target>

	<!-- ===================================================================== -->
	<!-- Steps to do after the fetch -->
	<!-- ===================================================================== -->
	<target name="postFetch">
		<ant antfile="${genericTargets}" target="fetchElement">
			<property name="type" value="feature" />
			<property name="id" value="org.eclipse.equinox.executable" />
		</ant>

		<!--copy linux motif about_files to in temp location where it will be copied into root of eclipse at assembly time-->
		<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>

		<!--copy linux gtk x86 about_files to in temp location where it will be copied into root of eclipse at assembly time-->
		<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>

		<!--copy linux gtk x86_64 about_files to in temp location where it will be copied into root of eclipse at assembly time-->
		<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>

	<!-- ===================================================================== -->
	<!-- Steps to do before generating build scripts -->
	<!-- ===================================================================== -->
	<target name="preGenerate">
	</target>

	<!-- ===================================================================== -->
	<!-- Steps to do after generating the build scripts -->
	<!-- ===================================================================== -->
	<target name="postGenerate">
	</target>

	<!-- ===================================================================== -->
	<!-- Steps to do before assembling -->
	<!-- ===================================================================== -->
	<target name="preAssemble">

	</target>

	<!-- ===================================================================== -->
	<!-- Steps to do after assembling-->
	<!-- ===================================================================== -->
	<target name="postAssemble">
	</target>



	<!-- ===================================================================== -->
	<!-- Steps to do before running the build.xmls for the elements being built. -->
	<!-- ===================================================================== -->
	<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>

	<!-- ===================================================================== -->
	<!-- Steps to do after running the build.xmls for the elements being built. -->
	<!-- ===================================================================== -->
	<target name="postProcess">
		<condition property="logsAvailable">
			<istrue value="${javacVerbose}" />
		</condition>
		<antcall target="gatherLogs" />
	</target>
		<property name="id" value="org.eclipse.swt.gtk.linux.x86_64" />
	</ant>
</target>

<!-- ===================================================================== -->
<!-- Steps to do before fetching the build elements -->
<!-- ===================================================================== -->
<target name="preFetch">
</target>

<!-- ===================================================================== -->
<!-- Steps to do after the fetch -->
<!-- ===================================================================== -->
<target name="postFetch">
	<ant antfile="${genericTargets}" target="fetchElement">
		<property name="type" value="feature" />
		<property name="id" value="org.eclipse.equinox.executable" />
	</ant>	
	
	<!--copy linux motif about_files to in temp location where it will be copied into root of eclipse at assembly time-->
	<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>
	
	<!--copy linux gtk x86 about_files to in temp location where it will be copied into root of eclipse at assembly time-->
	<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>
	
	<!--copy linux gtk x86_64 about_files to in temp location where it will be copied into root of eclipse at assembly time-->
	<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>

<!-- ===================================================================== -->
<!-- Steps to do before generating build scripts -->
<!-- ===================================================================== -->
<target name="preGenerate">
</target>

<!-- ===================================================================== -->
<!-- Steps to do after generating the build scripts -->
<!-- ===================================================================== -->
<target name="postGenerate">
</target>

<!-- ===================================================================== -->
<!-- Steps to do before assembling -->
<!-- ===================================================================== -->
<target name="preAssemble">

</target>

<!-- ===================================================================== -->
<!-- Steps to do after assembling-->
<!-- ===================================================================== -->
<target name="postAssemble">
</target>



<!-- ===================================================================== -->
<!-- Steps to do before running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
<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>

<!-- ===================================================================== -->
<!-- Steps to do after running the build.xmls for the elements being built. -->
<!-- ===================================================================== -->
<target name="postProcess">
	<condition property="logsAvailable">
		<istrue value="${javacVerbose}"/> 
	</condition>
	<antcall target="gatherLogs" />
</target>

	<target name="prePackage" />

	<!-- ===================================================================== -->
	<!-- Steps to do after everything is built and assembled -->
	<!-- (e.g., testing, posting, emailing, ...) -->
	<!-- ===================================================================== -->
	<target name="postBuild">
	</target>

	<!-- ===================================================================== -->
	<!-- Helper targets -->
	<!-- ===================================================================== -->
	<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>
	<!-- ===================================================================== -->
	<!-- Default target                                                        -->
	<!-- ===================================================================== -->
	<target name="noDefault">
		<echo message="You must specify a target when invoking this file" />
	</target>

</project>

Lines 95-100 Link Here

(-)eclipse/buildConfigs/rcp/packager/customTargets.xml (+6 lines)
95	</antcall>	95	</antcall>
96	</target>	96	</target>
97		97
		98	<target name="assemble.macosx.cocoa.x86_64.xml">
		99	<antcall target="assembler">
		100	<param name="archiveName" value="${archiveRoot}-macosx-cocoa-x86_64.tar.gz" />
		101	</antcall>
		102	</target>
		103
98	<target name="assembler">	104	<target name="assembler">
99	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />	105	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />
100	<property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" />	106	<property name="archiveFullPath" value="${postingDirectory}/${buildLabel}/${archiveName}" />




	macosx, carbon, ppc & \
	macosx, carbon, x86 & \
	macosx, cocoa, ppc & \
	macosx, cocoa, x86 & \
	macosx, cocoa, x86_64

archivesFormat =\
 	win32, win32, x86-zip &\

	macosx, carbon, ppc-tar & \
	macosx, carbon, x86-tar & \
	macosx, cocoa, ppc-tar & \
	macosx, cocoa, x86-tar	& \
	macosx, cocoa, x86_64-tar

################ FOLDERS ############################
#The directory used as a base for the all process

Lines 30-35 Link Here

(-)eclipse/buildConfigs/sdk/build.properties (+2 lines)
30	win32, win32, ia64 &\	30	win32, win32, ia64 &\
31	macosx, carbon, ppc & \	31	macosx, carbon, ppc & \
32	macosx, cocoa, x86 & \	32	macosx, cocoa, x86 & \
		33	macosx, cocoa, x86_64 & \
33	linux, gtk, x86 & \	34	linux, gtk, x86 & \
34	linux, gtk, ppc & \	35	linux, gtk, ppc & \
35	linux, gtk, x86_64 &\	36	linux, gtk, x86_64 &\
Lines 65-70 Link Here
65	hpux, motif, ia64_32-zip & \	66	hpux, motif, ia64_32-zip & \
66	macosx, carbon, ppc-tar & \	67	macosx, carbon, ppc-tar & \
67	macosx, cocoa, x86-tar & \	68	macosx, cocoa, x86-tar & \
		69	macosx, cocoa, x86_64-tar & \
68	qnx, photon, x86-zip	70	qnx, photon, x86-zip
69		71
70	javacFailOnError=false	72	javacFailOnError=false




		<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" />
	</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">

	<!-- Steps to do after the fetch -->
	<!-- ===================================================================== -->
	<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>

		<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/" />

		<!--copy linux motif about_files to in temp location where it will be copied into root of eclipse at assembly time-->
		<property name="linux.motif.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.motif.x86" />
		<mkdir dir="${linux.motif.rootfiles}" />

Lines 41-46 Link Here

(-)eclipse/buildConfigs/master/build.properties (+1 lines)
41	hpux, motif, ia64_32 & \	41	hpux, motif, ia64_32 & \
42	macosx, carbon, ppc & \	42	macosx, carbon, ppc & \
43	macosx, cocoa, x86 & \	43	macosx, cocoa, x86 & \
		44	macosx, cocoa, x86_64 & \
44	qnx, photon, x86	45	qnx, photon, x86
45		46
46	archivesFormat =group,group,group-zip	47	archivesFormat =group,group,group-zip




				<antcall target="packageSwtStandalone">
					<param name="os" value="macosx" />
					<param name="ws" value="carbon" />
					<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="x86_64" />
				</antcall>
				<antcall target="packageSwtStandalone">
					<param name="os" value="linux" />

Lines 56-61 Link Here

(-)eclipse/buildConfigs/rcp.deltapack/packager/packager.properties (+1 lines)
56	aix, motif, ppc & \	56	aix, motif, ppc & \
57	macosx, carbon, ppc & \	57	macosx, carbon, ppc & \
58	macosx, cocoa, x86 & \	58	macosx, cocoa, x86 & \
		59	macosx, cocoa, x86_64 & \
59	delta, delta, delta	60	delta, delta, delta
60		61
61	deltaPack = true	62	deltaPack = true




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

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

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


Return to bug 256459

Lines 286-291 Link Here

(-)feature.xml (-1 / +48 lines)
286	id="org.eclipse.swt.carbon.macosx"	286	id="org.eclipse.swt.carbon.macosx"
287	os="macosx"	287	os="macosx"
288	ws="carbon"	288	ws="carbon"
		289	arch="ppc"
		290	download-size="0"
		291	install-size="0"
		292	version="0.0.0"
		293	fragment="true"
		294	unpack="false"/>
		295
		296	<plugin
		297	id="org.eclipse.swt.carbon.macosx"
		298	os="macosx"
		299	ws="carbon"
		300	arch="x86"
		301	download-size="0"
		302	install-size="0"
		303	version="0.0.0"
		304	fragment="true"
		305	unpack="false"/>
		306
		307	<plugin
		308	id="org.eclipse.swt.cocoa.macosx"
		309	os="macosx"
		310	ws="cocoa"
		311	arch="ppc"
289	download-size="0"	312	download-size="0"
290	install-size="0"	313	install-size="0"
291	version="0.0.0"	314	version="0.0.0"
Lines 296-306 Link Here
296	id="org.eclipse.swt.cocoa.macosx"	319	id="org.eclipse.swt.cocoa.macosx"
297	os="macosx"	320	os="macosx"
298	ws="cocoa"	321	ws="cocoa"
		322	arch="x86"
299	download-size="0"	323	download-size="0"
300	install-size="0"	324	install-size="0"
301	version="0.0.0"	325	version="0.0.0"
302	fragment="true"	326	fragment="true"
303	unpack="false"/>	327	unpack="false"/>
		328
		329	<plugin
		330	id="org.eclipse.swt.cocoa.macosx.x86_64"
		331	os="macosx"
		332	ws="cocoa"
		333	arch="x86_64"
		334	download-size="0"
		335	install-size="0"
		336	version="0.0.0"
		337	fragment="true"
		338	unpack="false"/>
304		339
305	<plugin	340	<plugin
306	id="org.eclipse.swt.motif.aix.ppc"	341	id="org.eclipse.swt.motif.aix.ppc"
Lines 442-456 Link Here
442	id="org.eclipse.equinox.launcher.carbon.macosx"	477	id="org.eclipse.equinox.launcher.carbon.macosx"
443	os="macosx"	478	os="macosx"
444	ws="carbon"	479	ws="carbon"
		480	arch="ppc"
		481	download-size="0"
		482	install-size="0"
		483	version="0.0.0"
		484	fragment="true"/>
		485
		486	<plugin
		487	id="org.eclipse.equinox.launcher.carbon.macosx"
		488	os="macosx"
		489	ws="carbon"
		490	arch="x86"
445	download-size="0"	491	download-size="0"
446	install-size="0"	492	install-size="0"
447	version="0.0.0"	493	version="0.0.0"
448	fragment="true"/>	494	fragment="true"/>
449		495
450	<plugin	496	<plugin
451	id="org.eclipse.equinox.launcher.cocoa.macosx"	497	id="org.eclipse.equinox.launcher.cocoa.macosx.x86_64"
452	os="macosx"	498	os="macosx"
453	ws="cocoa"	499	ws="cocoa"
		500	arch="x86_64"
454	download-size="0"	501	download-size="0"
455	install-size="0"	502	install-size="0"
456	version="0.0.0"	503	version="0.0.0"

Lines 47-53 Link Here

(-)equinox/buildConfigs/equinox-launchers/build.properties (-2 / +4 lines)
47	hpux, motif, ia64_32 &\	47	hpux, motif, ia64_32 &\
48	aix, motif, ppc &\	48	aix, motif, ppc &\
49	macosx, carbon, ppc &\	49	macosx, carbon, ppc &\
50	macosx, cocoa, x86	50	macosx, cocoa, x86 &\
		51	macosx, cocoa, x86_64
51	# linux, motif, x86 & \	52	# linux, motif, x86 & \
52	# solaris, motif, sparc & \	53	# solaris, motif, sparc & \
53	# hpux, motif, PA_RISC & \	54	# hpux, motif, PA_RISC & \
Lines 68-74 Link Here
68	solaris, gtk, sparc-zip &\	69	solaris, gtk, sparc-zip &\
69	aix, motif, ppc-zip &\	70	aix, motif, ppc-zip &\
70	macosx, carbon, ppc-tar &\	71	macosx, carbon, ppc-tar &\
71	macosx, cocoa, x86-tar	72	macosx, cocoa, x86-tar &\
		73	macosx, cocoa, x86_64-tar
72	# solaris, motif, sparc - antZip& \	74	# solaris, motif, sparc - antZip& \
73	# hpux, motif, PA_RISC - antZip& \	75	# hpux, motif, PA_RISC - antZip& \
74		76

Lines 15-20 Link Here

(-)eclipse/publishingFiles/testManifest.xml (-2 / +8 lines)
15	<platform id="SAM" name="AIX (PPC/Motif)" fileName="eclipse-SDK-@build@-aix-motif.zip"></platform>	15	<platform id="SAM" name="AIX (PPC/Motif)" fileName="eclipse-SDK-@build@-aix-motif.zip"></platform>
16	<platform id="SMC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-macosx-carbon.tar.gz"></platform>	16	<platform id="SMC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-macosx-carbon.tar.gz"></platform>
17	<platform id="SMCC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-macosx-cocoa.tar.gz"></platform>	17	<platform id="SMCC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-macosx-cocoa.tar.gz"></platform>
		18	<platform id="SMCC64" name="Mac OSX (Mac/Cocoa/x86_64) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-SDK-@build@-macosx-cocoa-x86_64.tar.gz"></platform>
18	<platform id="SAA2" name='Source Build (Source in .zip) (<a href="srcIncludedBuildInstructions.html">instructions</a>)' fileName="eclipse-sourceBuild-srcIncluded-@build@.zip"></platform>	19	<platform id="SAA2" name='Source Build (Source in .zip) (<a href="srcIncludedBuildInstructions.html">instructions</a>)' fileName="eclipse-sourceBuild-srcIncluded-@build@.zip"></platform>
19	<platform id="SAA" name='Source Build (Source fetched via CVS) (<a href="srcFetchBuildInstructions.html">instructions</a>)' fileName="eclipse-sourceBuild-srcFetch-@build@.zip"></platform>	20	<platform id="SAA" name='Source Build (Source fetched via CVS) (<a href="srcFetchBuildInstructions.html">instructions</a>)' fileName="eclipse-sourceBuild-srcFetch-@build@.zip"></platform>
20	</zipType>	21	</zipType>
Lines 42-47 Link Here
42	<platform id="RCPAM" name="AIX (PPC/Motif)" fileName="eclipse-RCP-@build@-aix-motif.zip"></platform>	43	<platform id="RCPAM" name="AIX (PPC/Motif)" fileName="eclipse-RCP-@build@-aix-motif.zip"></platform>
43	<platform id="RCPMC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-RCP-@build@-macosx-carbon.tar.gz"></platform>	44	<platform id="RCPMC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-RCP-@build@-macosx-carbon.tar.gz"></platform>
44	<platform id="RCPMCC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-RCP-@build@-macosx-cocoa.tar.gz"></platform>	45	<platform id="RCPMCC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-RCP-@build@-macosx-cocoa.tar.gz"></platform>
		46	<platform id="RCPMCC64" name="Mac OSX (Mac/Cocoa/x86_64) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-RCP-@build@-macosx-cocoa-x86_64.tar.gz"></platform>
45	</zipType>	47	</zipType>
46		48
47	<zipType name="RCP SDK">	49	<zipType name="RCP SDK">
Lines 58-63 Link Here
58	<platform id="RCPAMSDK" name="AIX (PPC/Motif)" fileName="eclipse-RCP-SDK-@build@-aix-motif.zip"></platform>	60	<platform id="RCPAMSDK" name="AIX (PPC/Motif)" fileName="eclipse-RCP-SDK-@build@-aix-motif.zip"></platform>
59	<platform id="RCPMCSDK" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-RCP-SDK-@build@-macosx-carbon.tar.gz"></platform>	61	<platform id="RCPMCSDK" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-RCP-SDK-@build@-macosx-carbon.tar.gz"></platform>
60	<platform id="RCPMCSDKC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-RCP-SDK-@build@-macosx-cocoa.tar.gz"></platform>	62	<platform id="RCPMCSDKC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-RCP-SDK-@build@-macosx-cocoa.tar.gz"></platform>
		63	<platform id="RCPMCSDKC64" name="Mac OSX (Mac/Cocoa/x86_64) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-RCP-SDK-@build@-macosx-cocoa-x86_64.tar.gz"></platform>
61	</zipType>	64	</zipType>
62		65
63	<zipType name="Delta Pack">	66	<zipType name="Delta Pack">
Lines 81-86 Link Here
81	<platform id="PAM" name="AIX (PPC/Motif)" fileName="eclipse-platform-@build@-aix-motif.zip"></platform>	84	<platform id="PAM" name="AIX (PPC/Motif)" fileName="eclipse-platform-@build@-aix-motif.zip"></platform>
82	<platform id="PMC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-platform-@build@-macosx-carbon.tar.gz"></platform>	85	<platform id="PMC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-platform-@build@-macosx-carbon.tar.gz"></platform>
83	<platform id="PMCC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-platform-@build@-macosx-cocoa.tar.gz"></platform>	86	<platform id="PMCC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-platform-@build@-macosx-cocoa.tar.gz"></platform>
		87	<platform id="PMCC64" name="Mac OSX (Mac/Cocoa/x86_64) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-platform-@build@-macosx-cocoa-x86_64.tar.gz"></platform>
84	</zipType>	88	</zipType>
85		89
86	<zipType name="Platform SDK">	90	<zipType name="Platform SDK">
Lines 96-101 Link Here
96	<platform id="PAMSDK" name="AIX (PPC/Motif)" fileName="eclipse-platform-SDK-@build@-aix-motif.zip"></platform>	100	<platform id="PAMSDK" name="AIX (PPC/Motif)" fileName="eclipse-platform-SDK-@build@-aix-motif.zip"></platform>
97	<platform id="PMCSDK" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-platform-SDK-@build@-macosx-carbon.tar.gz"></platform>	101	<platform id="PMCSDK" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-platform-SDK-@build@-macosx-carbon.tar.gz"></platform>
98	<platform id="PMCSDKC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-platform-SDK-@build@-macosx-cocoa.tar.gz"></platform>	102	<platform id="PMCSDKC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-platform-SDK-@build@-macosx-cocoa.tar.gz"></platform>
		103	<platform id="PMCSDKC64" name="Mac OSX (Mac/Cocoa/x86_64) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="eclipse-platform-SDK-@build@-macosx-cocoa-x86_64.tar.gz"></platform>
99	</zipType>	104	</zipType>
100		105
101	<zipType name="JDT Runtime Binary">	106	<zipType name="JDT Runtime Binary">
Lines 150-157 Link Here
150	<platform id="SWTHP" name="HPUX (IA64_32/Motif)" fileName="swt-@build@-motif-hpux-ia64_32.zip"></platform>	155	<platform id="SWTHP" name="HPUX (IA64_32/Motif)" fileName="swt-@build@-motif-hpux-ia64_32.zip"></platform>
151	<platform id="SWTNP" name="QNX (x86/Photon)" fileName="swt-@build@-photon-qnx-x86.zip"></platform>	156	<platform id="SWTNP" name="QNX (x86/Photon)" fileName="swt-@build@-photon-qnx-x86.zip"></platform>
152	<platform id="SWTAM" name="AIX (PPC/Motif)" fileName="swt-@build@-motif-aix-ppc.zip"></platform>	157	<platform id="SWTAM" name="AIX (PPC/Motif)" fileName="swt-@build@-motif-aix-ppc.zip"></platform>
153	<platform id="SWTMC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="swt-@build@-carbon-macosx.zip"></platform>	158	<platform id="SWTMC" name="Mac OSX (Mac/Carbon) (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="swt-@build@-carbon-macosx-ppc.zip"></platform>
154	<platform id="SWTMCC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="swt-@build@-cocoa-macosx.zip"></platform>	159	<platform id="SWTMCC" name="Mac OSX (Mac/Cocoa) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="swt-@build@-cocoa-macosx-x86.zip"></platform>
		160	<platform id="SWTMCC64" name="Mac OSX (Mac/Cocoa/x86_64) early access (<a href="http://www.eclipse.org/eclipse/development/eclipse_project_plan_3_4.html#TargetOperatingEnvironments">Supported Versions</a>)" fileName="swt-@build@-cocoa-macosx-x86_64.zip"></platform>
155	</zipType>	161	</zipType>
156		162
157	<zipType name="RelEng Tool plug-in">	163	<zipType name="RelEng Tool plug-in">

Lines 1-7 Link Here

(-)eclipse/buildConfigs/platform.sdk/customTargets.xml (-37 / +40 lines)
1	<project name="Build specific targets and properties" default="noDefault" basedir=".">	1	<project name="Build specific targets and properties" default="noDefault" basedir=".">
2		2
3	<property name="postingDirectory" value="${buildDirectory}" />	3	<property name="postingDirectory" value="${buildDirectory}" />
4		4
5	<!-- ===================================================================== -->	5	<!-- ===================================================================== -->
6	<!-- Run a given ${target} on all elements being built -->	6	<!-- Run a given ${target} on all elements being built -->
7	<!-- ===================================================================== -->	7	<!-- ===================================================================== -->
Lines 24-40 Link Here
24	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32.zip" />	24	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32.zip" />
25	<antcall target="assemble" />	25	<antcall target="assemble" />
26	</target>	26	</target>
27		27
28	<target name="assemble.org.eclipse.platform.sdk.win32.win32.x86_64">	28	<target name="assemble.org.eclipse.platform.sdk.win32.win32.x86_64">
29	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32-x86_64.zip" />	29	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32-x86_64.zip" />
30	<antcall target="assemble" />	30	<antcall target="assemble" />
31	</target>	31	</target>
32		32
33	<target name="assemble.org.eclipse.platform.sdk.win32.wpf.x86">	33	<target name="assemble.org.eclipse.platform.sdk.win32.wpf.x86">
34	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32-wpf.zip" />	34	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-win32-wpf.zip" />
35	<antcall target="assemble" />	35	<antcall target="assemble" />
36	</target>	36	</target>
37		37
38	<target name="assemble.org.eclipse.platform.sdk.linux.motif.x86">	38	<target name="assemble.org.eclipse.platform.sdk.linux.motif.x86">
39	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-motif.tar.gz" />	39	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-motif.tar.gz" />
40	<antcall target="assemble" />	40	<antcall target="assemble" />
Lines 49-73 Link Here
49	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-gtk-x86_64.tar.gz" />	49	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-gtk-x86_64.tar.gz" />
50	<antcall target="assemble" />	50	<antcall target="assemble" />
51	</target>	51	</target>
52		52
53	<target name="assemble.org.eclipse.platform.sdk.linux.gtk.ia64"/>	53	<target name="assemble.org.eclipse.platform.sdk.linux.gtk.ia64" />
54	<target name="assemble.org.eclipse.platform.sdk.linux.gtk.ppc">	54	<target name="assemble.org.eclipse.platform.sdk.linux.gtk.ppc">
55	<target name="assemble.org.eclipse.platform.sdk.solaris.motif.sparc"/>	55	<target name="assemble.org.eclipse.platform.sdk.solaris.motif.sparc" />
56		56
57	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-gtk-ppc.tar.gz" />	57	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-linux-gtk-ppc.tar.gz" />
58	<antcall target="assemble" />	58	<antcall target="assemble" />
59	</target>	59	</target>
60		60
61	<target name="assemble.org.eclipse.platform.sdk.hpux.motif.ia64_32">	61	<target name="assemble.org.eclipse.platform.sdk.hpux.motif.ia64_32">
62	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-hpux-motif-ia64_32.zip" />	62	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-hpux-motif-ia64_32.zip" />
63	<antcall target="assemble" />	63	<antcall target="assemble" />
64	</target>	64	</target>
65		65
66	<target name="assemble.org.eclipse.platform.sdk.solaris.gtk.sparc">	66	<target name="assemble.org.eclipse.platform.sdk.solaris.gtk.sparc">
67	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-solaris-gtk.zip" />	67	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-solaris-gtk.zip" />
68	<antcall target="assemble" />	68	<antcall target="assemble" />
69	</target>	69	</target>
70		70
71	<target name="assemble.org.eclipse.platform.sdk.qnx.photon.x86" />	71	<target name="assemble.org.eclipse.platform.sdk.qnx.photon.x86" />
72		72
73	<target name="assemble.org.eclipse.platform.sdk.aix.motif.ppc">	73	<target name="assemble.org.eclipse.platform.sdk.aix.motif.ppc">
Lines 75-105 Link Here
75	<antcall target="assemble" />	75	<antcall target="assemble" />
76	</target>	76	</target>
77		77
78	<target name="assemble.org.eclipse.platform.sdk.hpux.motif.PA_RISC"/>	78	<target name="assemble.org.eclipse.platform.sdk.hpux.motif.PA_RISC" />
79		79
80	<target name="assemble.org.eclipse.platform.sdk.macosx.carbon.ppc">	80	<target name="assemble.org.eclipse.platform.sdk.macosx.carbon.ppc">
81	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-carbon.tar.gz" />	81	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-carbon.tar.gz" />
82	<antcall target="assemble" />	82	<antcall target="assemble" />
83	</target>	83	</target>
84		84
85	<target name="assemble.org.eclipse.platform.sdk.macosx.cocoa.x86">	85	<target name="assemble.org.eclipse.platform.sdk.macosx.cocoa.x86">
86	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa.tar.gz" />	86	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa.tar.gz" />
87	<antcall target="assemble" />	87	<antcall target="assemble" />
		88	</target>
		89
		90	<target name="assemble.org.eclipse.platform.sdk.macosx.cocoa.x86_64">
		91	<property name="archiveName" value="eclipse-platform-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz" />
		92	<antcall target="assemble" />
88	</target>	93	</target>
89		94
90	<target name="assemble">	95	<target name="assemble">
91	<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />	96	<property name="archiveFullPath" value="${buildDirectory}/${buildLabel}/${archiveName}" />
92	<ant antfile="${assembleScriptName}" />	97	<ant antfile="${assembleScriptName}" />
93	</target>	98	</target>
94	<target name="postPackage">	99	<target name="postPackage">
95	<mkdir dir="${buildDirectory}/${buildLabel}/checksum"/>	100	<mkdir dir="${buildDirectory}/${buildLabel}/checksum" />
96	<exec executable="sh" dir="${buildDirectory}/${buildLabel}">	101	<exec executable="sh" dir="${buildDirectory}/${buildLabel}">
97	<arg line="${eclipse.build.configs}/../../extras/produceChecksum" />	102	<arg line="${eclipse.build.configs}/../../extras/produceChecksum" />
98	</exec>	103	</exec>
99	<move todir="${postingDirectory}/${buildLabel}">	104	<move todir="${postingDirectory}/${buildLabel}">
100	<fileset dir="${buildDirectory}/${buildLabel}" />	105	<fileset dir="${buildDirectory}/${buildLabel}" />
101	</move>	106	</move>
102	</target>	107	</target>
103		108
104	<!-- ===================================================================== -->	109	<!-- ===================================================================== -->
105	<!-- Check out map files from correct repository -->	110	<!-- Check out map files from correct repository -->
Lines 120-126 Link Here
120	</target>	125	</target>
121		126
122	<target name="compareMapFiles" if="compareMaps">	127	<target name="compareMapFiles" if="compareMaps">
123	<property file="${mapTag.properties}"/>	128	<property file="${mapTag.properties}" />
124	<property name="cvsDiffFile" value="${buildDirectory}/cvsDiff.txt" />	129	<property name="cvsDiffFile" value="${buildDirectory}/cvsDiff.txt" />
125	<cvs cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="diff -w -r ${lastMapTag}" output="${cvsDiffFile}" />	130	<cvs cvsRoot="${mapCvsRoot}" dest="${buildDirectory}/maps" command="diff -w -r ${lastMapTag}" output="${cvsDiffFile}" />
126	<modifiedMaps mapDiffFile="${cvsDiffFile}" />	131	<modifiedMaps mapDiffFile="${cvsDiffFile}" />
Lines 135-143 Link Here
135	</target>	140	</target>
136		141
137	<target name="getPrebuiltElements">	142	<target name="getPrebuiltElements">
138	<generateBaseFetchScript	143	<generateBaseFetchScript mapfile="${buildDirectory}/maps/org.eclipse.releng/maps/base.map" outputfile="${buildDirectory}/fetchbase.xml" />
139	mapfile="${buildDirectory}/maps/org.eclipse.releng/maps/base.map"
140	outputfile="${buildDirectory}/fetchbase.xml"/>
141	<ant antfile="${buildDirectory}/fetchbase.xml" />	144	<ant antfile="${buildDirectory}/fetchbase.xml" />
142	</target>	145	</target>
143		146
Lines 176-182 Link Here
176	<property name="id" value="org.eclipse.equinox.executable" />	179	<property name="id" value="org.eclipse.equinox.executable" />
177	</ant>	180	</ant>
178	<!--create launchersrc.zip and copy to org.eclipse.platform plugin (fix for bug #49237) -->	181	<!--create launchersrc.zip and copy to org.eclipse.platform plugin (fix for bug #49237) -->
179	<zip destfile="${buildDirectory}/plugins/org.eclipse.platform/launchersrc.zip" basedir="${buildDirectory}/features/org.eclipse.equinox.executable" includes="library/**" />	182	<zip destfile="${buildDirectory}/plugins/org.eclipse.platform/launchersrc.zip" basedir="${buildDirectory}/features/org.eclipse.equinox.executable" includes="library/**" />
180		183
181	</target>	184	</target>
182		185

Lines 36-41 Link Here

(-)eclipse/buildConfigs/master-root/build.properties (+6 lines)
36	launcher-aix, motif, ppc & \	36	launcher-aix, motif, ppc & \
37	launcher-macosx, carbon, ppc & \	37	launcher-macosx, carbon, ppc & \
38	launcher-macosx, cocoa, x86 & \	38	launcher-macosx, cocoa, x86 & \
		39	launcher-macosx, cocoa, x86_64 & \
39	\	40	\
40	sdk-win32, win32, x86 &\	41	sdk-win32, win32, x86 &\
41	sdk-win32, win32, x86_64 &\	42	sdk-win32, win32, x86_64 &\
Lines 49-54 Link Here
49	sdk-aix, motif, ppc & \	50	sdk-aix, motif, ppc & \
50	sdk-macosx, carbon, ppc & \	51	sdk-macosx, carbon, ppc & \
51	sdk-macosx, cocoa, x86 & \	52	sdk-macosx, cocoa, x86 & \
		53	sdk-macosx, cocoa, x86_64 & \
52	\	54	\
53	platform-win32, win32, x86 &\	55	platform-win32, win32, x86 &\
54	platform-win32, win32, x86_64 &\	56	platform-win32, win32, x86_64 &\
Lines 61-66 Link Here
61	platform-aix, motif, ppc & \	63	platform-aix, motif, ppc & \
62	platform-macosx, carbon, ppc &\	64	platform-macosx, carbon, ppc &\
63	platform-macosx, cocoa, x86 &\	65	platform-macosx, cocoa, x86 &\
		66	platform-macosx, cocoa, x86_64 &\
64	\	67	\
65	rcp-common, common, common&\	68	rcp-common, common, common&\
66	\	69	\
Lines 82-87 Link Here
82	launcher-aix, motif, ppc-zip & \	85	launcher-aix, motif, ppc-zip & \
83	launcher-macosx, carbon, ppc-zip& \	86	launcher-macosx, carbon, ppc-zip& \
84	launcher-macosx, cocoa, x86-zip& \	87	launcher-macosx, cocoa, x86-zip& \
		88	launcher-macosx, cocoa, x86_64-zip& \
85	\	89	\
86	sdk-win32, win32, x86-zip &\	90	sdk-win32, win32, x86-zip &\
87	sdk-win32, win32, x86_64-zip &\	91	sdk-win32, win32, x86_64-zip &\
Lines 95-100 Link Here
95	sdk-aix, motif, ppc-zip & \	99	sdk-aix, motif, ppc-zip & \
96	sdk-macosx, carbon, ppc-zip& \	100	sdk-macosx, carbon, ppc-zip& \
97	sdk-macosx, cocoa, x86-zip& \	101	sdk-macosx, cocoa, x86-zip& \
		102	sdk-macosx, cocoa, x86_64-zip& \
98	\	103	\
99	platform-win32, win32, x86-zip &\	104	platform-win32, win32, x86-zip &\
100	platform-win32, win32, x86_64-zip &\	105	platform-win32, win32, x86_64-zip &\
Lines 107-112 Link Here
107	platform-aix, motif, ppc-zip & \	112	platform-aix, motif, ppc-zip & \
108	platform-macosx, carbon, ppc-zip&\	113	platform-macosx, carbon, ppc-zip&\
109	platform-macosx, cocoa, x86-zip&\	114	platform-macosx, cocoa, x86-zip&\
		115	platform-macosx, cocoa, x86_64-zip&\
110	\	116	\
111	rcp-common, common, common-zip&\	117	rcp-common, common, common-zip&\
112	\	118	\

Lines 40-46 Link Here

(-)eclipse/buildConfigs/rcp.sdk/packager/packager.properties (-2 / +4 lines)
40	solaris, motif, sparc & \	40	solaris, motif, sparc & \
41	aix, motif, ppc & \	41	aix, motif, ppc & \
42	macosx, carbon, ppc & \	42	macosx, carbon, ppc & \
43	macosx, cocoa, x86	43	macosx, cocoa, x86 & \
		44	macosx, cocoa, x86_64
44		45
45	archivesFormat =\	46	archivesFormat =\
46	win32, win32, x86-zip &\	47	win32, win32, x86-zip &\
Lines 53-59 Link Here
53	solaris, gtk, sparc-zip & \	54	solaris, gtk, sparc-zip & \
54	aix, motif, ppc-zip & \	55	aix, motif, ppc-zip & \
55	macosx, carbon, ppc-tar & \	56	macosx, carbon, ppc-tar & \
56	macosx, cocoa, x86-tar	57	macosx, cocoa, x86-tar & \
		58	macosx, cocoa, x86_64-tar
57		59
58	################ FOLDERS ############################	60	################ FOLDERS ############################
59	#The directory used as a base for the all process	61	#The directory used as a base for the all process

Lines 22-33 Link Here

(-)eclipse/buildConfigs/jdt/packager/customTargets.xml (-6 lines)
22	<param name="archiveName" value="${archiveRoot}-macosx.tar.gz"/>	22	<param name="archiveName" value="${archiveRoot}-macosx.tar.gz"/>
23	</antcall>	23	</antcall>
24	</target>	24	</target>
25
26	<!-- <target name="assemble.macosx.cocoa.x86.xml">
27	<antcall target="assembler">
28	<param name="archiveName" value="${archiveRoot}-macosx-cocoa.tar.gz"/>
29	</antcall>
30	</target> -->
31		25
32	<target name="assembler">	26	<target name="assembler">
33	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />	27	<mkdir dir="${postingDirectory}/${buildLabel}/checksum" />

Lines 16-21 Link Here

(-)eclipse/buildConfigs/sdk/packager/packaging.properties (+3 lines)
16	root.permissions.755=eclipse,.so	16	root.permissions.755=eclipse,.so
17	root.macosx.carbon.ppc.permissions.755=Eclipse.app/Contents/MacOS/eclipse	17	root.macosx.carbon.ppc.permissions.755=Eclipse.app/Contents/MacOS/eclipse
18	root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse	18	root.macosx.cocoa.x86.permissions.755=Eclipse.app/Contents/MacOS/eclipse
		19	root.macosx.cocoa.x86_64.permissions.755=Eclipse.app/Contents/MacOS/eclipse
19	root.win32.win32.x86=eclipse.exe,eclipsec.exe	20	root.win32.win32.x86=eclipse.exe,eclipsec.exe
20	root.win32.win32.x86_64=eclipse.exe,eclipsec.exe	21	root.win32.win32.x86_64=eclipse.exe,eclipsec.exe
21	root.win32.wpf.x86=eclipse.exe,eclipsec.exe	22	root.win32.wpf.x86=eclipse.exe,eclipsec.exe
Lines 32-36 Link Here
32	root.macosx.cocoa.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS	33	root.macosx.cocoa.ppc.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
33	root.macosx.cocoa.x86=eclipse,Eclipse.app/	34	root.macosx.cocoa.x86=eclipse,Eclipse.app/
34	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS	35	root.macosx.cocoa.x86.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
		36	root.macosx.cocoa.x86_64=eclipse,Eclipse.app/
		37	root.macosx.cocoa.x86_64.link=Eclipse.app/Contents/MacOS/eclipse,eclipse,../../../MacOS,Eclipse.app/Contents/Resources/Splash.app/Contents/MacOS
35	root.aix.motif.ppc=eclipse	38	root.aix.motif.ppc=eclipse
36	root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm	39	root.solaris.gtk.sparc=eclipse,Eclipse.l.pm,Eclipse.m.pm,Eclipse.s.pm,Eclipse.t.pm

Lines 40-46 Link Here

(-)eclipse/buildConfigs/rcp/packager/packager.properties (-2 / +4 lines)
40	macosx, carbon, ppc & \	40	macosx, carbon, ppc & \
41	macosx, carbon, x86 & \	41	macosx, carbon, x86 & \
42	macosx, cocoa, ppc & \	42	macosx, cocoa, ppc & \
43	macosx, cocoa, x86	43	macosx, cocoa, x86 & \
		44	macosx, cocoa, x86_64
44		45
45	archivesFormat =\	46	archivesFormat =\
46	win32, win32, x86-zip &\	47	win32, win32, x86-zip &\
Lines 55-61 Link Here
55	macosx, carbon, ppc-tar & \	56	macosx, carbon, ppc-tar & \
56	macosx, carbon, x86-tar & \	57	macosx, carbon, x86-tar & \
57	macosx, cocoa, ppc-tar & \	58	macosx, cocoa, ppc-tar & \
58	macosx, cocoa, x86-tar	59	macosx, cocoa, x86-tar & \
		60	macosx, cocoa, x86_64-tar
59		61
60	################ FOLDERS ############################	62	################ FOLDERS ############################
61	#The directory used as a base for the all process	63	#The directory used as a base for the all process

Lines 48-57 Link Here

(-)eclipse/buildConfigs/sdk/customTargets.xml (-7 / +12 lines)
48	<property name="archiveName" value="eclipse-SDK-${buildId}-macosx-carbon.tar.gz" />	48	<property name="archiveName" value="eclipse-SDK-${buildId}-macosx-carbon.tar.gz" />
49	<antcall target="assemble" />	49	<antcall target="assemble" />
50	</target>	50	</target>
51		51
52	<target name="assemble.org.eclipse.sdk.macosx.cocoa.x86">	52	<target name="assemble.org.eclipse.sdk.macosx.cocoa.x86">
53	<property name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa.tar.gz" />	53	<property name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa.tar.gz" />
54	<antcall target="assemble" />	54	<antcall target="assemble" />
		55	</target>
		56
		57	<target name="assemble.org.eclipse.sdk.macosx.cocoa.x86_64">
		58	<property name="archiveName" value="eclipse-SDK-${buildId}-macosx-cocoa-x86_64.tar.gz" />
		59	<antcall target="assemble" />
55	</target>	60	</target>
56		61
57	<target name="assemble.org.eclipse.sdk.linux.gtk.x86">	62	<target name="assemble.org.eclipse.sdk.linux.gtk.x86">
Lines 183-197 Link Here
183	<!-- Steps to do after the fetch -->	188	<!-- Steps to do after the fetch -->
184	<!-- ===================================================================== -->	189	<!-- ===================================================================== -->
185	<target name="postFetch">	190	<target name="postFetch">
186	<concat destfile="${buildDirectory}/plugins/org.eclipse.platform/build.properties" append="true">qualifier=v${timestamp}</concat>	191	<concat destfile="${buildDirectory}/plugins/org.eclipse.platform/build.properties" append="true">qualifier=v${timestamp}</concat>
187	<concat destfile="${buildDirectory}/plugins/org.eclipse.sdk/build.properties" append="true">qualifier=v${timestamp}</concat>	192	<concat destfile="${buildDirectory}/plugins/org.eclipse.sdk/build.properties" append="true">qualifier=v${timestamp}</concat>
188		193
189	<ant antfile="${genericTargets}" target="fetchElement">	194	<ant antfile="${genericTargets}" target="fetchElement">
190	<property name="type" value="feature" />	195	<property name="type" value="feature" />
191	<property name="id" value="org.eclipse.equinox.executable" />	196	<property name="id" value="org.eclipse.equinox.executable" />
192	</ant>	197	</ant>
193	<zip zipfile="${buildDirectory}/plugins/org.eclipse.platform/launchersrc.zip" basedir="${buildDirectory}/features/org.eclipse.equinox.executable" includes="library/" />	198	<zip zipfile="${buildDirectory}/plugins/org.eclipse.platform/launchersrc.zip" basedir="${buildDirectory}/features/org.eclipse.equinox.executable" includes="library/" />
194		199
195	<!--copy linux motif about_files to in temp location where it will be copied into root of eclipse at assembly time-->	200	<!--copy linux motif about_files to in temp location where it will be copied into root of eclipse at assembly time-->
196	<property name="linux.motif.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.motif.x86" />	201	<property name="linux.motif.rootfiles" value="${buildDirectory}/features/org.eclipse.platform/about_files/linux.motif.x86" />
197	<mkdir dir="${linux.motif.rootfiles}" />	202	<mkdir dir="${linux.motif.rootfiles}" />

Lines 112-123 Link Here

(-)eclipse/helper.xml (-2 / +7 lines)
112	<antcall target="packageSwtStandalone">	112	<antcall target="packageSwtStandalone">
113	<param name="os" value="macosx" />	113	<param name="os" value="macosx" />
114	<param name="ws" value="carbon" />	114	<param name="ws" value="carbon" />
115	<param name="arch" value="" />	115	<param name="arch" value="ppc" />
		116	</antcall>
		117	<antcall target="packageSwtStandalone">
		118	<param name="os" value="macosx" />
		119	<param name="ws" value="cocoa" />
		120	<param name="arch" value="x86" />
116	</antcall>	121	</antcall>
117	<antcall target="packageSwtStandalone">	122	<antcall target="packageSwtStandalone">
118	<param name="os" value="macosx" />	123	<param name="os" value="macosx" />
119	<param name="ws" value="cocoa" />	124	<param name="ws" value="cocoa" />
120	<param name="arch" value="" />	125	<param name="arch" value="x86_64" />
121	</antcall>	126	</antcall>
122	<antcall target="packageSwtStandalone">	127	<antcall target="packageSwtStandalone">
123	<param name="os" value="linux" />	128	<param name="os" value="linux" />

Lines 17-22 Link Here

(-)packaging.map (+3 lines)
17	master-root-launcher-aix.motif.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| aix,motif,ppc \| eclipse/ \| runtime \| root-launcher	17	master-root-launcher-aix.motif.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| aix,motif,ppc \| eclipse/ \| runtime \| root-launcher
18	master-root-launcher-macosx.carbon.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,carbon,ppc & macosx,carbon,x86\| eclipse/ \| runtime \| root-launcher	18	master-root-launcher-macosx.carbon.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,carbon,ppc & macosx,carbon,x86\| eclipse/ \| runtime \| root-launcher
19	master-root-launcher-macosx.cocoa.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,cocoa,ppc & macosx,cocoa,x86\| eclipse/ \| runtime \| root-launcher	19	master-root-launcher-macosx.cocoa.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,cocoa,ppc & macosx,cocoa,x86\| eclipse/ \| runtime \| root-launcher
		20	master-root-launcher-macosx.cocoa.x86_64.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,cocoa,x86_64\| eclipse/ \| runtime \| root-launcher
20		21
21	#primarily contain configuration directories	22	#primarily contain configuration directories
22	master-root-sdk-win32.win32.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| win32,win32,x86 \| eclipse/ \| runtime \| root-sdk	23	master-root-sdk-win32.win32.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| win32,win32,x86 \| eclipse/ \| runtime \| root-sdk
Lines 32-37 Link Here
32	master-root-sdk-aix.motif.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| aix,motif,ppc \| eclipse/ \| runtime \| root-sdk	33	master-root-sdk-aix.motif.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| aix,motif,ppc \| eclipse/ \| runtime \| root-sdk
33	master-root-sdk-macosx.carbon.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,carbon,ppc & macosx,carbon,x86\| eclipse/ \| runtime \| root-sdk	34	master-root-sdk-macosx.carbon.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,carbon,ppc & macosx,carbon,x86\| eclipse/ \| runtime \| root-sdk
34	master-root-sdk-macosx.cocoa.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,cocoa,ppc & macosx,cocoa,x86\| eclipse/ \| runtime \| root-sdk	35	master-root-sdk-macosx.cocoa.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,cocoa,ppc & macosx,cocoa,x86\| eclipse/ \| runtime \| root-sdk
		36	master-root-sdk-macosx.cocoa.x86_64.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,cocoa,x86_64\| eclipse/ \| runtime \| root-sdk
35		37
36	master-root-platform-win32.win32.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| win32,win32,x86 \| eclipse/ \| runtime \| root-platform	38	master-root-platform-win32.win32.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| win32,win32,x86 \| eclipse/ \| runtime \| root-platform
37	master-root-platform-win32.win32.x86_64.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| win32,win32,x86_64 \| eclipse/ \| runtime \| root-platform	39	master-root-platform-win32.win32.x86_64.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| win32,win32,x86_64 \| eclipse/ \| runtime \| root-platform
Lines 46-51 Link Here
46	master-root-platform-aix.motif.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| aix,motif,ppc \| eclipse/ \| runtime \| root-platform	48	master-root-platform-aix.motif.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| aix,motif,ppc \| eclipse/ \| runtime \| root-platform
47	master-root-platform-macosx.carbon.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,carbon,ppc & macosx,carbon,x86\| eclipse/ \| runtime \| root-platform	49	master-root-platform-macosx.carbon.ppc.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,carbon,ppc & macosx,carbon,x86\| eclipse/ \| runtime \| root-platform
48	master-root-platform-macosx.cocoa.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,cocoa,ppc & macosx,cocoa,x86\| eclipse/ \| runtime \| root-platform	50	master-root-platform-macosx.cocoa.x86.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,cocoa,ppc & macosx,cocoa,x86\| eclipse/ \| runtime \| root-platform
		51	master-root-platform-macosx.cocoa.x86_64.@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| macosx,cocoa,x86_64 \| eclipse/ \| runtime \| root-platform
49		52
50	master-root-rcp-@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| \| eclipse/ \| runtime \| root-rcp	53	master-root-rcp-@buildId@.zip=file:${buildDirectory}/${buildLabel}/ \| \| eclipse/ \| runtime \| root-rcp
51		54