diff options
author | Ed Merks | 2013-10-21 10:35:14 +0000 |
---|---|---|
committer | Ed Merks | 2013-10-21 10:35:14 +0000 |
commit | fbfc999a1e4e451eee84b20540e1bfa82e1aa5de (patch) | |
tree | 4f075cf34839a8cb124ebd5d07b13bbe700599e8 | |
parent | f208f0fbe78d5b0da584586fa19e4e029783ad73 (diff) | |
download | cdo-fbfc999a1e4e451eee84b20540e1bfa82e1aa5de.tar.gz cdo-fbfc999a1e4e451eee84b20540e1bfa82e1aa5de.tar.xz cdo-fbfc999a1e4e451eee84b20540e1bfa82e1aa5de.zip |
Improve setup related models
Change-Id: Iae89247fa5e6b17dd9e2ed06a820d492fb6d89b0
Signed-off-by: Ed Merks <ed.merks@gmail.com>
5 files changed, 13 insertions, 4 deletions
diff --git a/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml index 861a1464d3..b506b97077 100644 --- a/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.releng.version-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.releng.version" label="%featureName" - version="1.1.100.qualifier" + version="1.2.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" @@ -56,4 +56,11 @@ version="0.0.0" unpack="false"/> + <plugin + id="org.eclipse.emf.cdo.releng.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + </feature> diff --git a/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml b/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml index e0c6e0308a..164b1dd52b 100644 --- a/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml +++ b/features/org.eclipse.emf.cdo.releng.version.sdk-feature/feature.xml @@ -12,7 +12,7 @@ <feature id="org.eclipse.emf.cdo.releng.version.sdk" label="%featureName" - version="1.1.100.qualifier" + version="1.2.0.qualifier" provider-name="%providerName" image="eclipse_update_120.jpg" license-feature="org.eclipse.emf.cdo.license" diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/P2TaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/P2TaskImpl.java index 8ec6a1e0fe..8f386cc6c2 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/P2TaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/P2TaskImpl.java @@ -421,13 +421,13 @@ public class P2TaskImpl extends SetupTaskImpl implements P2Task context.log(status); throw new CoreException(Status.CANCEL_STATUS); } + context.setRestartNeeded(); } } else { callDirectorApp(context); } - context.setRestartNeeded(); } private ProvisioningContext makeProvisioningContext(ProvisioningSession session, Collection<URI> repositories) diff --git a/plugins/org.eclipse.emf.cdo.releng.version.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.releng.version.ui/META-INF/MANIFEST.MF index 16de6c7e4a..362436e172 100644 --- a/plugins/org.eclipse.emf.cdo.releng.version.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.releng.version.ui/META-INF/MANIFEST.MF @@ -16,7 +16,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.releng.version;bundle-version="[1.0.0,2.0.0)";visibility:=reexport, - org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)" + org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)", + org.eclipse.emf.cdo.releng.ui;bundle-version="[1.0.0,2.0.0)" Export-Package: org.eclipse.emf.cdo.releng.version.ui;version="1.1.100";x-internal:=true, org.eclipse.emf.cdo.releng.version.ui.actions;version="1.1.100";x-internal:=true, org.eclipse.emf.cdo.releng.version.ui.dialogs;version="1.1.100";x-internal:=true, diff --git a/plugins/org.eclipse.emf.cdo.releng.version.ui/plugin.xml b/plugins/org.eclipse.emf.cdo.releng.version.ui/plugin.xml index a9501313f4..5c2ef2fe64 100644 --- a/plugins/org.eclipse.emf.cdo.releng.version.ui/plugin.xml +++ b/plugins/org.eclipse.emf.cdo.releng.version.ui/plugin.xml @@ -93,6 +93,7 @@ <extension point="org.eclipse.ui.preferencePages"> <page + category="org.eclipse.emf.cdo.releng.ui.preferences.RelengPreferencePage" class="org.eclipse.emf.cdo.releng.version.ui.preferences.VersionBuilderPreferencePage" id="org.eclipse.emf.cdo.releng.version.ui.preferences.VersionBuilderPreferencePage" name="Version Management"> |