Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 186213 | Differences between
and this patch

Collapse All | Expand All

(-)master/runtime/customTargets.xml (-14 / +71 lines)
Lines 336-366 Link Here
336
		<param name="filename" value="${eclipseSdkFilename}"/>
336
		<param name="filename" value="${eclipseSdkFilename}"/>
337
		<param name="dstdir" value="${baseLocation}/../${eclipseSdkDirectory}"/>
337
		<param name="dstdir" value="${baseLocation}/../${eclipseSdkDirectory}"/>
338
	</antcall>
338
	</antcall>
339
339
<!-- Unzip an eclipse platform to be used for the Linux all-in-one -->
340
<!-- Unzip an eclipse platform to be used to install features into the all-in-one -->
341
	<antcall target="fetch.gunzip.untar">
340
	<antcall target="fetch.gunzip.untar">
342
		<param name="url" value="${eclipseDownloadUrl}/${eclipseSdkUrl}"/>
341
		<param name="url" value="${eclipseDownloadUrl}/${eclipseSdkUrl}"/>
343
		<param name="filename" value="${eclipsePlatformFilename}"/>
342
		<param name="filename" value="${eclipsePlatformFilename}"/>
344
		<param name="dstdir" value="${buildDirectory}/p2installer"/>
343
		<param name="dstdir" value="${buildDirectory}/linux_allinone"/>
345
	</antcall>
344
	</antcall>
346
<!-- The untar task loses the executable flag. Here's a workaround for the linux eclipse executable -->		
345
<!-- 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">
346
	<exec executable="/bin/chmod" output="${publishDirectory}/console.txt" logError="true" append="true">
348
		<arg line="755 ${baseLocation}/eclipse"/>
347
		<arg line="755 ${baseLocation}/eclipse"/>
349
	</exec>
348
	</exec>
350
	<exec executable="/bin/chmod" output="${publishDirectory}/console.txt" logError="true" append="true">
349
	<exec executable="/bin/chmod" output="${publishDirectory}/console.txt" logError="true" append="true">
351
		<arg line="755 ${buildDirectory}/p2installer/eclipse/eclipse"/>
350
		<arg line="755 ${buildDirectory}/linux_allinone/eclipse/eclipse"/>
352
	</exec>
351
	</exec>
353
352
<!-- Make a copy of the unziped SDK that will be used to install features into the all-in-one -->
354
<!-- Unzip a windows eclipse to become the all-in-one later -->
355
	<exec executable="unzip">
356
		<arg line="-q ${depPath}/${eclipseSdkFilename_win32} -d ${buildDirectory}/win_allinone"/>
357
	</exec>
358
<!-- Make a copy of the unziped SDK that will be used for the linux All-in-one -->
359
	<exec executable="mkdir">
353
	<exec executable="mkdir">
360
		<arg line="${buildDirectory}/linux_allinone" />
354
		<arg line="${buildDirectory}/p2installer" />
361
	</exec>
355
	</exec>
362
	<exec executable="cp">
356
	<exec executable="cp">
363
		<arg line="-r ${baseLocation} ${buildDirectory}/linux_allinone" />
357
		<arg line="-r ${baseLocation} ${buildDirectory}/p2installer" />
364
	</exec>
358
	</exec>
365
359
366
	<antcall target="fetch.unzip">
360
	<antcall target="fetch.unzip">
Lines 368-373 Link Here
368
		<param name="filename" value="${eclipseSdkFilename_win32}"/>
362
		<param name="filename" value="${eclipseSdkFilename_win32}"/>
369
		<param name="dstdir" value="${baseLocation}/../${eclipseSdkDirectory}"/>
363
		<param name="dstdir" value="${baseLocation}/../${eclipseSdkDirectory}"/>
370
	</antcall>
364
	</antcall>
365
<!-- Unzip a windows eclipse to become the all-in-one later -->
366
	<antcall target="fetch.unzip">
367
		<param name="url" value="${eclipseDownloadUrl}/${eclipseSdkUrl}"/>
368
		<param name="filename" value="${eclipsePlatformFilename_win32}"/>
369
		<param name="dstdir" value="${buildDirectory}/win_allinone"/>
370
	</antcall>
371
371
	<antcall target="fetch.unzip">
372
	<antcall target="fetch.unzip">
372
		<param name="url" value="${eclipseDownloadUrl}/${eclipseSdkUrl}"/>
373
		<param name="url" value="${eclipseDownloadUrl}/${eclipseSdkUrl}"/>
373
		<param name="filename" value="${eclipseRCPDelta}"/>
374
		<param name="filename" value="${eclipseRCPDelta}"/>
Lines 1651-1656 Link Here
1651
1652
1652
	<antcall target="run.director">
1653
	<antcall target="run.director">
1653
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1654
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1655
		<param name="p2.IU" value="org.eclipse.cvs.feature.group" />
1656
		<param name="p2.m.repo.location" value="${eclipseMetadataURL}" />
1657
		<param name="p2.a.repo.location" value="${eclipseMetadataURL}" />
1658
		<param name="p2.version" value="${cvsMetadataVersion}" />
1659
	</antcall>
1660
	<antcall target="run.director">
1661
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1662
		<param name="p2.IU" value="org.eclipse.jdt.feature.group" />
1663
		<param name="p2.m.repo.location" value="${eclipseMetadataURL}" />
1664
		<param name="p2.a.repo.location" value="${eclipseMetadataURL}" />
1665
		<param name="p2.version" value="${jdtMetadataVersion}" />
1666
	</antcall>
1667
	<antcall target="run.director">
1668
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1669
		<param name="p2.IU" value="org.eclipse.pde.feature.group" />
1670
		<param name="p2.m.repo.location" value="${eclipseMetadataURL}" />
1671
		<param name="p2.a.repo.location" value="${eclipseMetadataURL}" />
1672
		<param name="p2.version" value="${pdeMetadataVersion}" />
1673
	</antcall>
1674
	<antcall target="run.director">
1675
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1654
		<param name="p2.IU" value="org.eclipse.emf.feature.group" />
1676
		<param name="p2.IU" value="org.eclipse.emf.feature.group" />
1655
		<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
1677
		<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
1656
		<param name="p2.a.repo.location" value="${emf24MetadataURL}" />
1678
		<param name="p2.a.repo.location" value="${emf24MetadataURL}" />
Lines 1658-1664 Link Here
1658
	</antcall>
1680
	</antcall>
1659
	<antcall target="run.director">
1681
	<antcall target="run.director">
1660
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1682
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1661
		<param name="p2.IU" value="org.eclipse.xsd.sdk.feature.group" />
1683
		<param name="p2.IU" value="org.eclipse.xsd.feature.group" />
1684
		<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
1685
		<param name="p2.a.repo.location" value="${emf24MetadataURL}" />
1686
		<param name="p2.version" value="${emf24MetadataVersion}" />
1687
	</antcall>
1688
	<antcall target="run.director">
1689
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1690
		<param name="p2.IU" value="org.eclipse.xsd.ecore.converter.feature.group" />
1691
		<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
1692
		<param name="p2.a.repo.location" value="${emf24MetadataURL}" />
1693
		<param name="p2.version" value="${emf24MetadataVersion}" />
1694
	</antcall>
1695
	<antcall target="run.director">
1696
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1697
		<param name="p2.IU" value="org.eclipse.xsd.edit.feature.group" />
1698
		<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
1699
		<param name="p2.a.repo.location" value="${emf24MetadataURL}" />
1700
		<param name="p2.version" value="${emf24MetadataVersion}" />
1701
	</antcall>
1702
	<antcall target="run.director">
1703
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1704
		<param name="p2.IU" value="org.eclipse.xsd.editor.feature.group" />
1705
		<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
1706
		<param name="p2.a.repo.location" value="${emf24MetadataURL}" />
1707
		<param name="p2.version" value="${emf24MetadataVersion}" />
1708
	</antcall>
1709
	<antcall target="run.director">
1710
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1711
		<param name="p2.IU" value="org.eclipse.xsd.mapping.editor.feature.group" />
1712
		<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
1713
		<param name="p2.a.repo.location" value="${emf24MetadataURL}" />
1714
		<param name="p2.version" value="${emf24MetadataVersion}" />
1715
	</antcall>
1716
	<antcall target="run.director">
1717
		<param name="p2.director.install.path" value="${buildDirectory}/${eviroment.modifier}_allinone/eclipse"/>
1718
		<param name="p2.IU" value="org.eclipse.xsd.mapping.feature.group" />
1662
		<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
1719
		<param name="p2.m.repo.location" value="${emf24MetadataURL}" />
1663
		<param name="p2.a.repo.location" value="${emf24MetadataURL}" />
1720
		<param name="p2.a.repo.location" value="${emf24MetadataURL}" />
1664
		<param name="p2.version" value="${emf24MetadataVersion}" />
1721
		<param name="p2.version" value="${emf24MetadataVersion}" />
Lines 1713-1719 Link Here
1713
		<arg line="-metadataRepository ${p2.m.repo.location}" />
1770
		<arg line="-metadataRepository ${p2.m.repo.location}" />
1714
		<arg line="-artifactRepository ${p2.a.repo.location}" />
1771
		<arg line="-artifactRepository ${p2.a.repo.location}" />
1715
		<arg line="-version ${p2.version}" />
1772
		<arg line="-version ${p2.version}" />
1716
		<arg line="-profile SDKProfile" />
1773
		<arg line="-profile PlatformProfile" />
1717
		<arg line="-vmArgs" />
1774
		<arg line="-vmArgs" />
1718
		<arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
1775
		<arg line="-Declipse.p2.data.area=${p2.director.install.path}/p2" />
1719
	</exec>
1776
	</exec>

Return to bug 186213