diff options
author | Ed Merks | 2014-01-08 18:56:40 +0000 |
---|---|---|
committer | Ed Merks | 2014-01-08 18:56:40 +0000 |
commit | b99706201798877f8c625249321eab94ce0da2fa (patch) | |
tree | d10a91ce042326212fe3664f6ee63ce563dec4ea /plugins | |
parent | 1a230c0eface8793aee0a613c38e8d55fec377ad (diff) | |
download | cdo-b99706201798877f8c625249321eab94ce0da2fa.tar.gz cdo-b99706201798877f8c625249321eab94ce0da2fa.tar.xz cdo-b99706201798877f8c625249321eab94ce0da2fa.zip |
Improve setup related models; improve platform setup
Diffstat (limited to 'plugins')
4 files changed, 59 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/setups/Platform.setup b/plugins/org.eclipse.emf.cdo.releng.setup/setups/Platform.setup index bd8166e10c..ef1916ada8 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/setups/Platform.setup +++ b/plugins/org.eclipse.emf.cdo.releng.setup/setups/Platform.setup @@ -71,8 +71,10 @@ <setupTasks xsi:type="setup:GitCloneTask" location="${platform.git.location}" remoteURI="ssh://git.eclipse.org:29418/platform/eclipse.platform" checkoutBranch="master"/> <setupTasks xsi:type="setup:ContextVariableTask" name="platform.resources.git.location" value="${setup.branch.dir/git/platform.resources}"/> <setupTasks xsi:type="setup:GitCloneTask" location="${platform.resources.git.location}" remoteURI="ssh://git.eclipse.org:29418/platform/eclipse.platform.resources" checkoutBranch="master"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.core.resources/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> <setupTasks xsi:type="setup:ContextVariableTask" name="platform.runtime.git.location" value="${setup.branch.dir/git/platform.runtime}"/> <setupTasks xsi:type="setup:GitCloneTask" location="${platform.runtime.git.location}" remoteURI="ssh://git.eclipse.org:29418/platform/eclipse.platform.runtime" checkoutBranch="master"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.core.expressions/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> <setupTasks xsi:type="setup:ContextVariableTask" name="platform.swt.binaries.git.location" value="${setup.branch.dir/git/platform.swt.binaries}"/> <setupTasks xsi:type="setup:GitCloneTask" location="${platform.swt.binaries.git.location}" remoteURI="ssh://git.eclipse.org:29418/platform/eclipse.platform.swt.binaries" checkoutBranch="master"/> <setupTasks xsi:type="setup:ContextVariableTask" name="platform.swt.git.location" value="${setup.branch.dir/git/platform.swt}"/> @@ -80,8 +82,25 @@ <setupTasks xsi:type="setup:ResourceCopyTask" excludedTriggers="BOOTSTRAP" sourceURL="${setup.branch.dir|uri}/git/platform.swt/bundles/org.eclipse.swt/.classpath_${ws}" targetURL="${setup.branch.dir|uri}/git/platform.swt/bundles/org.eclipse.swt/.classpath"/> <setupTasks xsi:type="setup:ContextVariableTask" name="platform.team.git.location" value="${setup.branch.dir/git/platform.team}"/> <setupTasks xsi:type="setup:GitCloneTask" location="${platform.team.git.location}" remoteURI="ssh://git.eclipse.org:29418/platform/eclipse.platform.team" checkoutBranch="master"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.compare/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.compare.core/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.compare.win32/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.core.net/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.team.core/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.team.cvs.core/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.team.cvs.ssh/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.team.cvs.ssh2/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.team.cvs.ui/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.team.ui/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.ui.net/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> <setupTasks xsi:type="setup:ContextVariableTask" name="platform.text.git.location" value="${setup.branch.dir/git/platform.text}"/> <setupTasks xsi:type="setup:GitCloneTask" location="${platform.text.git.location}" remoteURI="ssh://git.eclipse.org/gitroot/platform/eclipse.platform.text.git" checkoutBranch="master"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.core.filebuffers/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.jface.text/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.search/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.text/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.ui.editors/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.ui.workbench.texteditor/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> <setupTasks xsi:type="setup:ContextVariableTask" name="platform.ua.git.location" value="${setup.branch.dir/git/platform.ua}"/> <setupTasks xsi:type="setup:GitCloneTask" location="${platform.ua.git.location}" remoteURI="ssh://git.eclipse.org:29418/platform/eclipse.platform.ua" checkoutBranch="master"/> <setupTasks xsi:type="setup:ContextVariableTask" name="platform.ui.git.location" value="${setup.branch.dir/git/platform.ui}"/> @@ -131,12 +150,22 @@ <setupTasks xsi:type="setup:GitCloneTask" location="${jdt.core.binaries.git.location}" remoteURI="ssh://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.binaries.git" checkoutBranch="master"/> <setupTasks xsi:type="setup:ContextVariableTask" name="jdt.core.git.location" value="${setup.branch.dir/git/jdt.core}"/> <setupTasks xsi:type="setup:GitCloneTask" location="${jdt.core.git.location}" remoteURI="ssh://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git" checkoutBranch="master"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.jdt.annotation/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.jdt.apt.core/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.jdt.apt.ui/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> <setupTasks xsi:type="setup:ContextVariableTask" name="jdt.debug.git.location" value="${setup.branch.dir/git/jdt.debug}"/> <setupTasks xsi:type="setup:GitCloneTask" location="${jdt.debug.git.location}" remoteURI="ssh://git.eclipse.org/gitroot/jdt/eclipse.jdt.debug.git" checkoutBranch="master"/> <setupTasks xsi:type="setup:ContextVariableTask" name="jdt.git.location" value="${setup.branch.dir/git/jdt}"/> <setupTasks xsi:type="setup:GitCloneTask" location="${jdt.git.location}" remoteURI="ssh://git.eclipse.org/gitroot/jdt/eclipse.jdt.git" checkoutBranch="master"/> <setupTasks xsi:type="setup:ContextVariableTask" name="jdt.ui.git.location" value="${setup.branch.dir/git/jdt.ui}"/> <setupTasks xsi:type="setup:GitCloneTask" location="${jdt.ui.git.location}" remoteURI="ssh://git.eclipse.org/gitroot/jdt/eclipse.jdt.ui.git" checkoutBranch="master"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.jdt.junit/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.jdt.junit.core/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.jdt.junit.runtime/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.jdt.junit4.runtime/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.jdt.ui/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.ltk.core.refactoring/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.ltk.ui.refactoring/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_STRICTLY_COMPATIBLE_JRE_NOT_AVAILABLE" value="warning"/> </setupTasks> <setupTasks xsi:type="setup:CompoundSetupTask" name="Eclipse License Clone"> <setupTasks xsi:type="setup:ContextVariableTask" name="eclipse.license.git.location" value="${setup.branch.dir/git/eclipse.license}"/> @@ -156,6 +185,10 @@ <setupTasks xsi:type="setup:ContextVariableTask" name="ecf.git.location" value="${setup.branch.dir/git/ecf}"/> <setupTasks xsi:type="setup:ContextVariableTask" name="ecf.git.url" value="ssh://git.eclipse.org/gitroot/ecf/org.eclipse.ecf.git"/> <setupTasks xsi:type="setup:GitCloneTask" location="${ecf.git.location}" remoteURI="${ecf.git.url}" checkoutBranch="master"/> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/project/org.eclipse.ecf.provider.filetransfer/org.eclipse.pde.api.tools/INVALID_REFERENCE_IN_SYSTEM_LIBRARIES" value="warning"/> + </setupTasks> + <setupTasks xsi:type="setup:CompoundSetupTask" name="org.eclipse.pde.api.tools"> + <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/instance/org.eclipse.pde.api.tools/MISSING_EE_DESCRIPTIONS" value="Warning"/> </setupTasks> <setupTasks xsi:type="setup:MaterializationTask"> <rootComponents name="org.eclipse.sdk"/> @@ -194,9 +227,6 @@ <p2Repositories url="http://download.eclipse.org/jetty/updates/jetty-bundles-8.x"/> <p2Repositories url="http://download.eclipse.org/cbi/updates/license"/> </setupTasks> - <setupTasks xsi:type="setup:CompoundSetupTask" name="org.eclipse.pde.api.tools"> - <setupTasks xsi:type="setup:EclipsePreferenceTask" key="/instance/org.eclipse.pde.api.tools/MISSING_EE_DESCRIPTIONS" value="Warning"/> - </setupTasks> <setupTasks xsi:type="setup:JRETask" version="J2SE-1.4" location="${jre.1.4.location}"/> <setupTasks xsi:type="setup:JRETask" version="J2SE-1.5" location="${jre.1.5.location}"/> <setupTasks xsi:type="setup:JRETask" version="JavaSE-1.6" location="${jre.1.6.location}"/> diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/WorkingSetTask.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/WorkingSetTask.java index 39db4b1ed5..3cdf811f33 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/WorkingSetTask.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/WorkingSetTask.java @@ -32,6 +32,8 @@ import org.eclipse.emf.common.util.EList; */ public interface WorkingSetTask extends SetupTask { + int PRIORITY = DEFAULT_PRIORITY + 10; + /** * Returns the value of the '<em><b>Working Sets</b></em>' containment reference list. * The list contents are of type {@link org.eclipse.emf.cdo.releng.workingsets.WorkingSet}. diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java index 936ce5c0f1..01ff0e1a39 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/EclipsePreferenceTaskImpl.java @@ -10,6 +10,7 @@ */ package org.eclipse.emf.cdo.releng.setup.impl; +import org.eclipse.emf.cdo.releng.preferences.PreferencesFactory; import org.eclipse.emf.cdo.releng.preferences.util.PreferencesUtil; import org.eclipse.emf.cdo.releng.setup.EclipsePreferenceTask; import org.eclipse.emf.cdo.releng.setup.SetupPackage; @@ -19,9 +20,12 @@ import org.eclipse.emf.cdo.releng.setup.Trigger; import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.emf.common.notify.Notification; +import org.eclipse.emf.common.util.URI; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.impl.ENotificationImpl; +import org.eclipse.core.resources.IWorkspaceRoot; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.Path; import java.util.Set; @@ -42,6 +46,8 @@ import java.util.Set; */ public class EclipsePreferenceTaskImpl extends SetupTaskImpl implements EclipsePreferenceTask { + private static final IWorkspaceRoot WORKSPACE_ROOT = ResourcesPlugin.getWorkspace().getRoot(); + /** * The default value of the '{@link #getKey() <em>Key</em>}' attribute. * <!-- begin-user-doc --> @@ -287,6 +293,18 @@ public class EclipsePreferenceTaskImpl extends SetupTaskImpl implements EclipseP public void perform(SetupTaskContext context) throws Exception { String key = getKey(); + + // Ignore project-specific preferences for projects that don't exist in the workspace. + URI uri = PreferencesFactory.eINSTANCE.createURI(key); + if ("project".equals(uri.authority())) + { + if (!WORKSPACE_ROOT.getProject(uri.segment(0)).isAccessible()) + { + context.log("Ignoring preference " + key + " = " + value); + return; + } + } + final String value = getValue(); context.log("Setting preference " + key + " = " + value); diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java index 00ebd4c822..871ffc2cb3 100644 --- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java +++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/WorkingSetTaskImpl.java @@ -259,4 +259,10 @@ public class WorkingSetTaskImpl extends SetupTaskImpl implements WorkingSetTask Resource resource = defaultWorkingSetGroup.eResource(); resource.save(null); } + + @Override + public int getPriority() + { + return PRIORITY; + } } // SetWorkingTaskImpl |