bbd0e0c568
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/tycho.git#15edd47bbba0d2b7739884e73cfbdc5636e177f9
52 lines
2.4 KiB
Diff
52 lines
2.4 KiB
Diff
From 8b062ae9182fbf3a50edf7c4a0c98965032efb23 Mon Sep 17 00:00:00 2001
|
|
From: Roland Grunberg <rgrunber@redhat.com>
|
|
Date: Mon, 6 May 2013 14:20:58 -0400
|
|
Subject: [PATCH 6/7] Use custom resolver for tycho-eclipserun-plugin.
|
|
|
|
Add various system local OSGi bundle locations to the target platform
|
|
used by tycho-eclipserun-plugin.
|
|
|
|
Change-Id: Ifd0aae3f32c8077cd0ae33e70f40698c1129788d
|
|
---
|
|
.../tycho/extras/eclipserun/EclipseRunMojo.java | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
diff --git a/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java b/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
|
|
index 8f4cc249..28137edb 100644
|
|
--- a/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
|
|
+++ b/tycho-extras/tycho-eclipserun-plugin/src/main/java/org/eclipse/tycho/extras/eclipserun/EclipseRunMojo.java
|
|
@@ -13,6 +13,7 @@ package org.eclipse.tycho.extras.eclipserun;
|
|
|
|
import java.io.File;
|
|
import java.net.MalformedURLException;
|
|
+import java.net.URI;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
@@ -54,6 +55,7 @@ import org.eclipse.tycho.p2.resolver.facade.P2Resolver;
|
|
import org.eclipse.tycho.p2.resolver.facade.P2ResolverFactory;
|
|
import org.eclipse.tycho.p2.target.facade.TargetPlatformConfigurationStub;
|
|
import org.eclipse.tycho.plugins.p2.extras.Repository;
|
|
+import org.fedoraproject.p2.EclipseSystemLayout;
|
|
|
|
/**
|
|
* Launch an eclipse process with arbitrary commandline arguments. The eclipse installation is
|
|
@@ -237,6 +239,14 @@ public class EclipseRunMojo extends AbstractMojo {
|
|
TargetPlatformConfigurationStub tpConfiguration = new TargetPlatformConfigurationStub();
|
|
// we want to resolve from remote repos only
|
|
tpConfiguration.setForceIgnoreLocalArtifacts(true);
|
|
+
|
|
+ // Add Fedora Local P2 Repository when running in local mode
|
|
+ if (System.getProperty("TYCHO_MVN_LOCAL") != null || System.getProperty("TYCHO_MVN_RPMBUILD") != null) {
|
|
+ for (URI uri : EclipseSystemLayout.getRepositories()) {
|
|
+ tpConfiguration.addP2Repository(new MavenRepositoryLocation(uri.getPath(), uri));
|
|
+ }
|
|
+ }
|
|
+
|
|
for (Repository repository : repositories) {
|
|
tpConfiguration.addP2Repository(new MavenRepositoryLocation(repository.getId(), repository.getLocation()));
|
|
}
|
|
--
|
|
2.28.0
|
|
|