Attachment #117244 for bug #186213

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




eclipseSdkFilename=eclipse-SDK-M20081031-1130-linux-gtk.tar.gz
eclipseSdkFilename_win32=eclipse-SDK-M20081031-1130-win32.zip
eclipsePlatformFilename=eclipse-platform-M20081031-1130-linux-gtk.tar.gz
eclipsePlatformFilename_win32=eclipse-platform-M20081031-1130-win32.zip
eclipseRCPDelta=eclipse-M20081031-1130-delta-pack.zip
eclipseSwtWindows=swt-M20081031-1130-win32-win32-x86.zip
eclipseSwtLinux=swt-M20081031-1130-gtk-linux-x86.zip
eclipseSdkDirectory=
# Used for p2 allinone instalation, change if builds are released or if versions rise above current the current number
eclipseMetadataURL=http://download.eclipse.org/eclipse/updates/3.4.x
# Differnt version numbers for each component, seach site.xml for the build date (eg. M20081031-1130) at above site
cvsMetadataVersion=1.1.1.r34x_20080902-7C79E8N9nJD4oAW9V1938
jdtMetadataVersion=3.4.2.r342_v20081010-7o7tEAjEF_U5t4Ugrb2Iyss26M75
pdeMetadataVersion=3.4.1.r341_v20080731-7T7U1E9imVKxAHXtrFz-UU

# EMF/XSD 2.2.4
#




		<param name="dstdir" value="${baseLocation}/../${eclipseSdkDirectory}"/>
	</antcall>

<!-- Unzip an eclipse platform to be used for the Linux all-in-one -->
	<antcall target="fetch.gunzip.untar">
		<param name="url" value="${eclipseDownloadUrl}/${eclipseSdkUrl}"/>
		<param name="filename" value="${eclipsePlatformFilename}"/>
		<param name="dstdir" value="${buildDirectory}/linux_allinone"/>
	</antcall>
<!-- The untar task loses the executable flag. Here's a workaround for the linux eclipse executable -->		
	<exec executable="/bin/chmod" output="${publishDirectory}/console.txt" logError="true" append="true">
		<arg line="755 ${baseLocation}/eclipse"/>
	</exec>
	<exec executable="/bin/chmod" output="${publishDirectory}/console.txt" logError="true" append="true">
		<arg line="755 ${buildDirectory}/linux_allinone/eclipse/eclipse"/>
	</exec>

<!-- Unzip a windows eclipse to become the all-in-one later -->
	<exec executable="unzip">
		<arg line="-q ${depPath}/${eclipsePlatformFilename_win32} -d ${buildDirectory}/win_allinone"/>
	</exec>
<!-- Make a copy of the unziped SDK that will be used to install features into the all-in-one -->
	<exec executable="mkdir">
		<arg line="${buildDirectory}/p2installer" />
	</exec>
	<exec executable="cp">
		<arg line="-r ${baseLocation} ${buildDirectory}/p2installer" />
	</exec>

	<antcall target="fetch.unzip">


	<antcall target="run.director">
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
		<param name="p2.IU" value="org.eclipse.cvs.feature.group" />
		<param name="p2.m.repo.location" value="${eclipseMetadataURL}" />
		<param name="p2.a.repo.location" value="${eclipseMetadataURL}" />
		<param name="p2.version" value="${cvsMetadataVersion}" />
	</antcall>
	<antcall target="run.director">
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
		<param name="p2.IU" value="org.eclipse.jdt.feature.group" />
		<param name="p2.m.repo.location" value="${eclipseMetadataURL}" />
		<param name="p2.a.repo.location" value="${eclipseMetadataURL}" />
		<param name="p2.version" value="${jdtMetadataVersion}" />
	</antcall>
	<antcall target="run.director">
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
		<param name="p2.IU" value="org.eclipse.pde.feature.group" />
		<param name="p2.m.repo.location" value="${eclipseMetadataURL}" />
		<param name="p2.a.repo.location" value="${eclipseMetadataURL}" />
		<param name="p2.version" value="${pdeMetadataVersion}" />
	</antcall>
	<antcall target="run.director">
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
		<param name="p2.IU" value="org.eclipse.emf.feature.group" />
		<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
		<param name="p2.a.repo.location" value="${emf24MetadataURL}" />

		<arg line="-metadataRepository ${p2.m.repo.location}" />
		<arg line="-artifactRepository ${p2.a.repo.location}" />
		<arg line="-version ${p2.version}" />
		<arg line="-profile PlatformProfile" />
		<arg line="-vmArgs" />
		<arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
	</exec>

Return to bug 186213

Lines 158-167 Link Here

(-)master/runtime/build.properties (+7 lines)
158	eclipseSdkFilename=eclipse-SDK-M20081031-1130-linux-gtk.tar.gz	158	eclipseSdkFilename=eclipse-SDK-M20081031-1130-linux-gtk.tar.gz
159	eclipseSdkFilename_win32=eclipse-SDK-M20081031-1130-win32.zip	159	eclipseSdkFilename_win32=eclipse-SDK-M20081031-1130-win32.zip
160	eclipsePlatformFilename=eclipse-platform-M20081031-1130-linux-gtk.tar.gz	160	eclipsePlatformFilename=eclipse-platform-M20081031-1130-linux-gtk.tar.gz
		161	eclipsePlatformFilename_win32=eclipse-platform-M20081031-1130-win32.zip
161	eclipseRCPDelta=eclipse-M20081031-1130-delta-pack.zip	162	eclipseRCPDelta=eclipse-M20081031-1130-delta-pack.zip
162	eclipseSwtWindows=swt-M20081031-1130-win32-win32-x86.zip	163	eclipseSwtWindows=swt-M20081031-1130-win32-win32-x86.zip
163	eclipseSwtLinux=swt-M20081031-1130-gtk-linux-x86.zip	164	eclipseSwtLinux=swt-M20081031-1130-gtk-linux-x86.zip
164	eclipseSdkDirectory=	165	eclipseSdkDirectory=
		166	# Used for p2 allinone instalation, change if builds are released or if versions rise above current the current number
		167	eclipseMetadataURL=http://download.eclipse.org/eclipse/updates/3.4.x
		168	# Differnt version numbers for each component, seach site.xml for the build date (eg. M20081031-1130) at above site
		169	cvsMetadataVersion=1.1.1.r34x_20080902-7C79E8N9nJD4oAW9V1938
		170	jdtMetadataVersion=3.4.2.r342_v20081010-7o7tEAjEF_U5t4Ugrb2Iyss26M75
		171	pdeMetadataVersion=3.4.1.r341_v20080731-7T7U1E9imVKxAHXtrFz-UU
165		172
166	# EMF/XSD 2.2.4	173	# EMF/XSD 2.2.4
167	#	174	#

Lines 337-366 Link Here

(-)master/runtime/customTargets.xml (-8 / +29 lines)
337	<param name="dstdir" value="${baseLocation}/../${eclipseSdkDirectory}"/>	337	<param name="dstdir" value="${baseLocation}/../${eclipseSdkDirectory}"/>
338	</antcall>	338	</antcall>
339		339
340	<!-- Unzip an eclipse platform to be used to install features into the all-in-one -->	340	<!-- Unzip an eclipse platform to be used for the Linux all-in-one -->
341	<antcall target="fetch.gunzip.untar">	341	<antcall target="fetch.gunzip.untar">
342	<param name="url" value="${eclipseDownloadUrl}/${eclipseSdkUrl}"/>	342	<param name="url" value="${eclipseDownloadUrl}/${eclipseSdkUrl}"/>
343	<param name="filename" value="${eclipsePlatformFilename}"/>	343	<param name="filename" value="${eclipsePlatformFilename}"/>
344	<param name="dstdir" value="${buildDirectory}/p2installer"/>	344	<param name="dstdir" value="${buildDirectory}/linux_allinone"/>
345	</antcall>	345	</antcall>
346	<!-- The untar task loses the executable flag. Here's a workaround for the linux eclipse executable -->	346	<!-- The untar task loses the executable flag. Here's a workaround for the linux eclipse executable -->
347	<exec executable="/bin/chmod" output="${publishDirectory}/console.txt" logError="true" append="true">	347	<exec executable="/bin/chmod" output="${publishDirectory}/console.txt" logError="true" append="true">
348	<arg line="755 ${baseLocation}/eclipse"/>	348	<arg line="755 ${baseLocation}/eclipse"/>
349	</exec>	349	</exec>
350	<exec executable="/bin/chmod" output="${publishDirectory}/console.txt" logError="true" append="true">	350	<exec executable="/bin/chmod" output="${publishDirectory}/console.txt" logError="true" append="true">
351	<arg line="755 ${buildDirectory}/p2installer/eclipse/eclipse"/>	351	<arg line="755 ${buildDirectory}/linux_allinone/eclipse/eclipse"/>
352	</exec>	352	</exec>
353		353
354	<!-- Unzip a windows eclipse to become the all-in-one later -->	354	<!-- Unzip a windows eclipse to become the all-in-one later -->
355	<exec executable="unzip">	355	<exec executable="unzip">
356	<arg line="-q ${depPath}/${eclipseSdkFilename_win32} -d ${buildDirectory}/win_allinone"/>	356	<arg line="-q ${depPath}/${eclipsePlatformFilename_win32} -d ${buildDirectory}/win_allinone"/>
357	</exec>	357	</exec>
358	<!-- Make a copy of the unziped SDK that will be used for the linux All-in-one -->	358	<!-- Make a copy of the unziped SDK that will be used to install features into the all-in-one -->
359	<exec executable="mkdir">	359	<exec executable="mkdir">
360	<arg line="${buildDirectory}/linux_allinone" />	360	<arg line="${buildDirectory}/p2installer" />
361	</exec>	361	</exec>
362	<exec executable="cp">	362	<exec executable="cp">
363	<arg line="-r ${baseLocation} ${buildDirectory}/linux_allinone" />	363	<arg line="-r ${baseLocation} ${buildDirectory}/p2installer" />
364	</exec>	364	</exec>
365		365
366	<antcall target="fetch.unzip">	366	<antcall target="fetch.unzip">
Lines 1651-1656 Link Here
1651		1651
1652	<antcall target="run.director">	1652	<antcall target="run.director">
1653	<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>	1653	<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
		1654	<param name="p2.IU" value="org.eclipse.cvs.feature.group" />
		1655	<param name="p2.m.repo.location" value="${eclipseMetadataURL}" />
		1656	<param name="p2.a.repo.location" value="${eclipseMetadataURL}" />
		1657	<param name="p2.version" value="${cvsMetadataVersion}" />
		1658	</antcall>
		1659	<antcall target="run.director">
		1660	<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
		1661	<param name="p2.IU" value="org.eclipse.jdt.feature.group" />
		1662	<param name="p2.m.repo.location" value="${eclipseMetadataURL}" />
		1663	<param name="p2.a.repo.location" value="${eclipseMetadataURL}" />
		1664	<param name="p2.version" value="${jdtMetadataVersion}" />
		1665	</antcall>
		1666	<antcall target="run.director">
		1667	<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
		1668	<param name="p2.IU" value="org.eclipse.pde.feature.group" />
		1669	<param name="p2.m.repo.location" value="${eclipseMetadataURL}" />
		1670	<param name="p2.a.repo.location" value="${eclipseMetadataURL}" />
		1671	<param name="p2.version" value="${pdeMetadataVersion}" />
		1672	</antcall>
		1673	<antcall target="run.director">
		1674	<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1654	<param name="p2.IU" value="org.eclipse.emf.feature.group" />	1675	<param name="p2.IU" value="org.eclipse.emf.feature.group" />
1655	<param name="p2.m.repo.location" value="${emf24MetadataURL}" />	1676	<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
1656	<param name="p2.a.repo.location" value="${emf24MetadataURL}" />	1677	<param name="p2.a.repo.location" value="${emf24MetadataURL}" />
Lines 1713-1719 Link Here
1713	<arg line="-metadataRepository ${p2.m.repo.location}" />	1734	<arg line="-metadataRepository ${p2.m.repo.location}" />
1714	<arg line="-artifactRepository ${p2.a.repo.location}" />	1735	<arg line="-artifactRepository ${p2.a.repo.location}" />
1715	<arg line="-version ${p2.version}" />	1736	<arg line="-version ${p2.version}" />
1716	<arg line="-profile SDKProfile" />	1737	<arg line="-profile PlatformProfile" />
1717	<arg line="-vmArgs" />	1738	<arg line="-vmArgs" />
1718	<arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />	1739	<arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
1719	</exec>	1740	</exec>