[tycho-4.0.x] tycho-p2-director:director: Fix handling of destination on macOS #3710
+617
−73
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* In DirectorMojo, the adjustment of 'destination' must consider the
actual target environment (p2os/p2ws/p2arch parameters) that is to be
installed and only fall back to the running environment if no explicit
target environment is given.
* Document in the tycho-p2-director:director JavaDoc / mojo parameter
description that this intentionally deviates from the behavior of the
stand-alone director application invocation:
eclipse -application org.eclipse.equinox.p2.director
-destination <destination> ...
* In DirectorMojo, add a consistency check that p2os/p2ws/p2arch must
all be specified mutually.
* The helper methods in DirectorRuntime are extended, to properly handle
all three possible scenarios:
1) /path/without/app/bundle/layout
--> /path/without/app/bundle/layout/Eclipse.app/Contents/Eclipse
2) /path/to/real.app/Contents/Eclipse
--> /path/to/real.app/Contents/Eclipse
3) /path/to/real.app
--> /path/to/real.app/Contents/Eclipse
This allows us to remove redundant code in
ProvisionedInstallationBuilder.
* This also removes the <installAllPlatforms> option again which was
introduced in #3091 (606a087).
This is not used in production and was not having the desired effect.
This simplifies the handling in AbstractEclipseTestMojo /
ProvisionedInstallationBuilder even more.
Fixes #3548.
(cherry picked from commit b35d8e0)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport
This will backport the following commits from
maintotycho-4.0.x:Questions ?
Please refer to the Backport tool documentation