mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Fixes for M6 build.

Browse source
This commit is contained in:
Doug Schaefer 2010-03-13 17:45:44 +00:00
parent e7d0761389
commit 0613a1b069
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
debug/org.eclipse.cdt.gnu.debug-feature/feature.xml
View file

@ -22,6 +22,7 @@
</url> </url>
<requires> <requires>
<import plugin="org.eclipse.cdt.debug.core" version="7.0.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.debug.core" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/> <import plugin="org.eclipse.cdt.core" version="5.0.0" match="compatible"/>
@ -29,7 +30,6 @@
<import plugin="org.eclipse.core.variables" version="3.2.200" match="greaterOrEqual"/> <import plugin="org.eclipse.core.variables" version="3.2.200" match="greaterOrEqual"/>
<import plugin="com.ibm.icu"/> <import plugin="com.ibm.icu"/>
<import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.cdt.debug.mi.core" version="6.0.0" match="compatible"/>
<import plugin="org.eclipse.cdt.ui" version="5.0.0" match="compatible"/> <import plugin="org.eclipse.cdt.ui" version="5.0.0" match="compatible"/>
<import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.debug.ui" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.ui.console" version="3.1.100" match="compatible"/> <import plugin="org.eclipse.ui.console" version="3.1.100" match="compatible"/>
@ -37,9 +37,8 @@
<import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/> <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.core.variables" version="3.1.100" match="compatible"/> <import plugin="org.eclipse.core.variables" version="3.1.100" match="compatible"/>
<import plugin="org.eclipse.cdt.debug.core" version="7.0.0" match="compatible"/>
<import plugin="org.eclipse.cdt.debug.ui" version="7.0.0" match="compatible"/>
<import plugin="org.eclipse.ltk.core.refactoring" version="3.5.0" match="compatible"/> <import plugin="org.eclipse.ltk.core.refactoring" version="3.5.0" match="compatible"/>
<import plugin="org.eclipse.cdt.debug.ui" version="7.0.0" match="compatible"/>
</requires> </requires>
<plugin <plugin

25
p2/org.eclipse.cdt.p2.generator/src/org/eclipse/cdt/p2/generator/WascanaGenerator.java
View file

@ -26,8 +26,6 @@ import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository; import org.eclipse.equinox.internal.p2.artifact.repository.simple.SimpleArtifactRepository;
import org.eclipse.equinox.internal.p2.metadata.ArtifactKey; import org.eclipse.equinox.internal.p2.metadata.ArtifactKey;
import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability; import org.eclipse.equinox.internal.p2.metadata.IRequiredCapability;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory;
import org.eclipse.equinox.internal.provisional.p2.metadata.MetadataFactory.InstallableUnitDescription;
import org.eclipse.equinox.p2.core.IProvisioningAgent; import org.eclipse.equinox.p2.core.IProvisioningAgent;
import org.eclipse.equinox.p2.core.IProvisioningAgentProvider; import org.eclipse.equinox.p2.core.IProvisioningAgentProvider;
import org.eclipse.equinox.p2.core.ProvisionException; import org.eclipse.equinox.p2.core.ProvisionException;
@ -35,8 +33,11 @@ import org.eclipse.equinox.p2.metadata.IArtifactKey;
import org.eclipse.equinox.p2.metadata.IInstallableUnit; import org.eclipse.equinox.p2.metadata.IInstallableUnit;
import org.eclipse.equinox.p2.metadata.ILicense; import org.eclipse.equinox.p2.metadata.ILicense;
import org.eclipse.equinox.p2.metadata.IProvidedCapability; import org.eclipse.equinox.p2.metadata.IProvidedCapability;
import org.eclipse.equinox.p2.metadata.IRequirement;
import org.eclipse.equinox.p2.metadata.ITouchpointType; import org.eclipse.equinox.p2.metadata.ITouchpointType;
import org.eclipse.equinox.p2.metadata.IUpdateDescriptor; import org.eclipse.equinox.p2.metadata.IUpdateDescriptor;
import org.eclipse.equinox.p2.metadata.MetadataFactory;
import org.eclipse.equinox.p2.metadata.MetadataFactory.InstallableUnitDescription;
import org.eclipse.equinox.p2.metadata.Version; import org.eclipse.equinox.p2.metadata.Version;
import org.eclipse.equinox.p2.metadata.VersionRange; import org.eclipse.equinox.p2.metadata.VersionRange;
import org.eclipse.equinox.p2.repository.IRepository; import org.eclipse.equinox.p2.repository.IRepository;
@ -172,7 +173,7 @@ public class WascanaGenerator implements IApplication {
"wascana.tools", "wascana.tools",
"Wascana Tools", "Wascana Tools",
wascanaVersion, wascanaVersion,
new IRequiredCapability[] { new IRequirement[] {
createRequiredCap(binutilsIU), createRequiredCap(binutilsIU),
createRequiredCap(gccIU), createRequiredCap(gccIU),
createRequiredCap(gppIU), createRequiredCap(gppIU),
@ -228,7 +229,7 @@ public class WascanaGenerator implements IApplication {
"wascana.sdks", "wascana.sdks",
"Wascana SDKs", "Wascana SDKs",
wascanaVersion, wascanaVersion,
new IRequiredCapability[] { new IRequirement[] {
createRequiredCap(mingwrtIU), createRequiredCap(mingwrtIU),
createRequiredCap(w32apiIU), createRequiredCap(w32apiIU),
createRequiredCap(qtIU), createRequiredCap(qtIU),
@ -238,7 +239,7 @@ public class WascanaGenerator implements IApplication {
"wascana.source", "wascana.source",
"Wascana Desktop Developer Source", "Wascana Desktop Developer Source",
wascanaVersion, wascanaVersion,
new IRequiredCapability[] { new IRequirement[] {
createRequiredCap(binutilsSrcIU), createRequiredCap(binutilsSrcIU),
createRequiredCap(gccSrcIU), createRequiredCap(gccSrcIU),
createRequiredCap(gppSrcIU), createRequiredCap(gppSrcIU),
@ -254,12 +255,12 @@ public class WascanaGenerator implements IApplication {
"wascana", "wascana",
"Wascana Desktop Developer", "Wascana Desktop Developer",
wascanaVersion, wascanaVersion,
new IRequiredCapability[] { new IRequirement[] {
createRequiredCap(toolsIU), createRequiredCap(toolsIU),
createRequiredCap(sdksIU), createRequiredCap(sdksIU),
}); });
metaRepo.addInstallableUnits(iuList.toArray(new IInstallableUnit[iuList.size()])); metaRepo.addInstallableUnits(iuList);
System.out.println("done"); System.out.println("done");
@ -356,7 +357,7 @@ public class WascanaGenerator implements IApplication {
} }
private IInstallableUnit createCategory(String id, String name, Version version, private IInstallableUnit createCategory(String id, String name, Version version,
IRequiredCapability[] reqs) throws ProvisionException { IRequirement[] reqs) throws ProvisionException {
InstallableUnitDescription iuDesc = createIUDesc(id, name, version, null); InstallableUnitDescription iuDesc = createIUDesc(id, name, version, null);
if (reqs != null) if (reqs != null)
iuDesc.setRequiredCapabilities(reqs); iuDesc.setRequiredCapabilities(reqs);
@ -366,14 +367,14 @@ public class WascanaGenerator implements IApplication {
return iu; return iu;
} }
private IRequiredCapability createRequiredCap(IInstallableUnit iu) { private IRequirement createRequiredCap(IInstallableUnit iu) {
return MetadataFactory.createRequiredCapability( return MetadataFactory.createRequirement(
IInstallableUnit.NAMESPACE_IU_ID, IInstallableUnit.NAMESPACE_IU_ID,
iu.getId(), new VersionRange(null), null, false, false); iu.getId(), new VersionRange(null), null, false, false);
} }
private IRequiredCapability createStrictRequiredCap(IInstallableUnit iu) { private IRequirement createStrictRequiredCap(IInstallableUnit iu) {
return MetadataFactory.createRequiredCapability( return MetadataFactory.createRequirement(
IInstallableUnit.NAMESPACE_IU_ID, IInstallableUnit.NAMESPACE_IU_ID,
iu.getId(), new VersionRange(iu.getVersion(), true, iu.getVersion(), true), null, false, false); iu.getId(), new VersionRange(iu.getVersion(), true, iu.getVersion(), true), null, false, false);
} }