diff options
| author | Ed Merks | 2019-05-30 12:28:45 +0000 |
|---|---|---|
| committer | Ed Merks | 2019-05-30 12:28:45 +0000 |
| commit | 60933853c357bee2e5c21f60311a1e56d3b65573 (patch) | |
| tree | 7fd08d7016c1f09313b93f2de401811734ede51d /plugins/org.eclipse.oomph.setup/src | |
| parent | 06363146107356d50753346581e67456db13b499 (diff) | |
| download | org.eclipse.oomph-60933853c357bee2e5c21f60311a1e56d3b65573.tar.gz org.eclipse.oomph-60933853c357bee2e5c21f60311a1e56d3b65573.tar.xz org.eclipse.oomph-60933853c357bee2e5c21f60311a1e56d3b65573.zip | |
[Releng] Make use of release train maker annotations
Extension models specify enablement annotations and these can provide
repositories that are effectively alternates for release train
repositories. If a release train repository is present, it would be
better to omit the alternate repository so that requires are resolved
from the release train. All the models are now properly marked to
indicate the repository is a release train alternate.
The setup task performer generates annotations on the synthesized
repository to record this information.
The product catalog generator marks repositories as release train
repositories.
The p2 director task, during consolidation determines if a release train
repository is present and removed any release train alternate
repositories in that case.
Overall this ensures that alternates are only used when needed, e.g.,
with the new Platform SDK product.
Diffstat (limited to 'plugins/org.eclipse.oomph.setup/src')
| -rw-r--r-- | plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/AnnotationConstants.java | 4 | ||||
| -rw-r--r-- | plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/EAnnotationConstants.java | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/AnnotationConstants.java b/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/AnnotationConstants.java index c67f42b2d..1c7317d37 100644 --- a/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/AnnotationConstants.java +++ b/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/AnnotationConstants.java @@ -53,6 +53,10 @@ public final class AnnotationConstants public static final String KEY_DESCRIPTION = "description"; + public static final String ANNOTATION_RELEASE_TRAIN = "http://www.eclipse.org/oomph/setup/ReleaseTrain"; + + public static final String ANNOTATION_RELEASE_TRAIN_ALTERNATE = "http://www.eclipse.org/oomph/setup/ReleaseTrainAlternate"; + private AnnotationConstants() { } diff --git a/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/EAnnotationConstants.java b/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/EAnnotationConstants.java index 0db25be0d..9b3a36d62 100644 --- a/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/EAnnotationConstants.java +++ b/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/setup/EAnnotationConstants.java @@ -31,6 +31,8 @@ public final class EAnnotationConstants public static final String KEY_INSTALLABLE_UNITS = "installableUnits"; + public static final String KEY_RELEASE_TRAIN_ALTERNATE = "releaseTrainAlternate"; + public static final String ANNOTATION_VARIABLE = "http://www.eclipse.org/oomph/setup/Variable"; public static final String KEY_EXPLICIT_TYPE = "explicitType"; |