rpms
/
tycho
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Return expected reactor cache location when XMvn resolution fails.

This commit is contained in:
Roland Grunberg 2013-11-21 11:32:21 -05:00
parent ea30eb97de
commit 12f97c02d9
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tycho-use-custom-resolver.patch
View File

@ -1,4 +1,4 @@
From 8cd8f81a6716b84acc5daf5ff9362db1b317f5cf Mon Sep 17 00:00:00 2001
From 15024de04671196ba229183993a50c3d0e5de0ad Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber@redhat.com>
Date: Tue, 12 Jun 2012 10:38:51 -0400
Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
@ -30,7 +30,7 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../tycho/p2/target/TargetDefinitionResolver.java | 11 +++--
.../p2/target/TargetPlatformBundlePublisher.java | 15 ++-----
.../tycho/p2/target/TargetPlatformFactoryImpl.java | 50 +++++++++++++++++++---
.../tycho/p2/repository/LocalRepositoryReader.java | 31 +++++++++++++-
.../tycho/p2/repository/LocalRepositoryReader.java | 34 ++++++++++++++-
.../facade/TargetPlatformConfigurationStub.java | 5 ++-
tycho-core/pom.xml | 5 +++
.../eclipse/tycho/core/locking/FileLockerImpl.java | 26 ++++++++---
@ -40,7 +40,7 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../DefaultTargetPlatformConfigurationReader.java | 6 ++-
.../osgi/runtime/TychoOsgiRuntimeLocator.java | 17 ++++++++
.../p2/resolver/P2TargetPlatformResolver.java | 10 +++++
13 files changed, 228 insertions(+), 30 deletions(-)
13 files changed, 231 insertions(+), 30 deletions(-)
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
index b008768..77c1443 100644
@ -181,7 +181,7 @@ index 4677798..4ee3fb5 100644
if (includeLocalMavenRepo && logger.isDebugEnabled()) {
IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
index 8d36462..4c8c582 100644
index 8d36462..be9172c 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.shared/src/main/java/org/eclipse/tycho/p2/repository/LocalRepositoryReader.java
@@ -11,6 +11,8 @@
@ -193,7 +193,7 @@ index 8d36462..4c8c582 100644
public class LocalRepositoryReader implements RepositoryReader {
@@ -21,7 +23,32 @@ public class LocalRepositoryReader implements RepositoryReader {
@@ -21,7 +23,35 @@ public class LocalRepositoryReader implements RepositoryReader {
}
public File getLocalArtifactLocation(GAV gav, String classifier, String extension) {
@ -219,7 +219,10 @@ index 8d36462..4c8c582 100644
+ // Invoke "findArtifact" method of the workspace reader on the artifact
+ Method mfindArtifact = reader.getClass().getMethod("findArtifact", iartclazz);
+ file = (File) mfindArtifact.invoke(reader, artifact);
+ File newFile = (File) mfindArtifact.invoke(reader, artifact);
+ if (newFile != null) {
+ file = newFile;
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }

5
tycho.spec
View File

@ -9,7 +9,7 @@
Name: tycho
Version: 0.19.0
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@ -308,6 +308,9 @@ sed -i 's|<maven>|&<extension>zip</extension>|' \
%{_javadocdir}/%{name}
%changelog
* Thu Nov 21 2013 Roland Grunberg <rgrunber@redhat.com> - 0.19.0-4
- Return expected reactor cache location when XMvn resolution fails.
* Wed Nov 20 2013 Roland Grunberg <rgrunber@redhat.com> - 0.19.0-3
- Bump release for rebuild (Bug 1031769).