diff options
Diffstat (limited to 'releng/org.eclipse.emf.cdo.releng/CDO.setup')
-rw-r--r-- | releng/org.eclipse.emf.cdo.releng/CDO.setup | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/releng/org.eclipse.emf.cdo.releng/CDO.setup b/releng/org.eclipse.emf.cdo.releng/CDO.setup index df1a8e972c..c78ee6c661 100644 --- a/releng/org.eclipse.emf.cdo.releng/CDO.setup +++ b/releng/org.eclipse.emf.cdo.releng/CDO.setup @@ -58,6 +58,13 @@ url="http://download.eclipse.org/oomph/updates"/> </setupTask> <setupTask + xsi:type="setup.p2:P2Task" + disabled="true" + label="Oomph Local"> + <repository + url="file:/develop/oomph/git/org.eclipse.oomph/sites/org.eclipse.oomph.site/target/repository"/> + </setupTask> + <setupTask xsi:type="setup:EclipseIniTask" option="-Xmx" value="4g" @@ -164,14 +171,14 @@ </detail> </annotation> <annotation - source="http:/www.eclipse.org/oomph/targlets/TargetDefinitionGenerator-DISABLED"> + source="http:/www.eclipse.org/oomph/targlets/TargetDefinitionGenerator"> <detail key="location"> - <value>${cdo.git.clone.location/plugins/org.eclipse.emf.cdo.releng/org.eclipse.emf.cdo.releng.target}</value> + <value>${cdo.git.clone.location/releng/org.eclipse.emf.cdo.releng/org.eclipse.emf.cdo.releng.target}</value> </detail> <detail key="extraUnits"> - <value>org.eclipse.equinox.executable.feature.group, com.google.guava</value> + <value>org.eclipse.orbit.mongodb, org.h2, org.slf4j.api, org.apache.commons.lang, org.apache.log4j, org.dom4j</value> </detail> <detail key="generateImplicitUnits"> @@ -450,7 +457,7 @@ </operand> <operand xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@setupTasks.15/@workingSets.1 //@setupTasks.15/@workingSets.2 //@setupTasks.15/@workingSets.3 //@setupTasks.15/@workingSets.7 //@setupTasks.15/@workingSets.8"/> + excludedWorkingSet="//@setupTasks.16/@workingSets.1 //@setupTasks.16/@workingSets.2 //@setupTasks.16/@workingSets.3 //@setupTasks.16/@workingSets.7 //@setupTasks.16/@workingSets.8"/> </predicate> </workingSet> <workingSet @@ -463,7 +470,7 @@ pattern="org\.eclipse\.emf\.cdo\.tests.*"/> <operand xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@setupTasks.15/@workingSets.7"/> + excludedWorkingSet="//@setupTasks.16/@workingSets.7"/> </predicate> </workingSet> <workingSet @@ -482,7 +489,7 @@ </operand> <operand xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@setupTasks.15/@workingSets.7"/> + excludedWorkingSet="//@setupTasks.16/@workingSets.7"/> </predicate> </workingSet> <workingSet @@ -495,7 +502,7 @@ pattern="org\.eclipse\.emf\.cdo\.dawn.*"/> <operand xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@setupTasks.15/@workingSets.7"/> + excludedWorkingSet="//@setupTasks.16/@workingSets.7"/> </predicate> </workingSet> <workingSet @@ -508,7 +515,7 @@ pattern="org\.eclipse\.net4j.*"/> <operand xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@setupTasks.15/@workingSets.5 //@setupTasks.15/@workingSets.6 //@setupTasks.15/@workingSets.7"/> + excludedWorkingSet="//@setupTasks.16/@workingSets.5 //@setupTasks.16/@workingSets.6 //@setupTasks.16/@workingSets.7"/> </predicate> </workingSet> <workingSet @@ -521,7 +528,7 @@ pattern="org\.eclipse\.net4j\.db.*"/> <operand xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@setupTasks.15/@workingSets.7"/> + excludedWorkingSet="//@setupTasks.16/@workingSets.7"/> </predicate> </workingSet> <workingSet @@ -543,7 +550,7 @@ </operand> <operand xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@setupTasks.15/@workingSets.7"/> + excludedWorkingSet="//@setupTasks.16/@workingSets.7"/> </predicate> </workingSet> <workingSet @@ -569,7 +576,7 @@ pattern="org\.eclipse\.emf\.cdo\.releng.*"/> <operand xsi:type="workingsets:ExclusionPredicate" - excludedWorkingSet="//@setupTasks.15/@workingSets.7"/> + excludedWorkingSet="//@setupTasks.16/@workingSets.7"/> </predicate> </workingSet> </setupTask> @@ -682,7 +689,7 @@ <setupTask xsi:type="setup:EclipseIniTask" option="-Doomph.redirection.cdosetup" - value="=http://git.eclipse.org/c/cdo/cdo.git/plain/plugins/org.eclipse.emf.cdo.releng/CDO.setup->${cdo.git.clone.location|uri}/plugins/org.eclipse.emf.cdo.releng/CDO.setup" + value="=http://git.eclipse.org/c/cdo/cdo.git/plain/plugins/org.eclipse.emf.cdo.releng/CDO.setup->${cdo.git.clone.location|uri}/releng/org.eclipse.emf.cdo.releng/CDO.setup" vm="true"/> <setupTask xsi:type="setup:VariableTask" |