Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2014-01-16 17:56:02 +0000
committerEike Stepper2014-01-16 17:56:02 +0000
commitd7e96506cedb82935094ff8223d07cce2f132e42 (patch)
treeac5414ef31fc5b473186c24894f4f8bea9d63e45
parent3ebeef39618647200d541c1ff325b516ba64f68f (diff)
downloadcdo-d7e96506cedb82935094ff8223d07cce2f132e42.tar.gz
cdo-d7e96506cedb82935094ff8223d07cce2f132e42.tar.xz
cdo-d7e96506cedb82935094ff8223d07cce2f132e42.zip
Improve setup related models; move releng deps to setup
-rw-r--r--plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BasicMaterializationTaskImpl.java10
-rw-r--r--plugins/org.eclipse.emf.cdo.releng/releng.setup3
2 files changed, 7 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BasicMaterializationTaskImpl.java b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BasicMaterializationTaskImpl.java
index 6114b761cf..624dbd7913 100644
--- a/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BasicMaterializationTaskImpl.java
+++ b/plugins/org.eclipse.emf.cdo.releng.setup/src/org/eclipse/emf/cdo/releng/setup/impl/BasicMaterializationTaskImpl.java
@@ -219,7 +219,7 @@ public abstract class BasicMaterializationTaskImpl extends SetupTaskImpl impleme
{
case SetupPackage.BASIC_MATERIALIZATION_TASK__TARGET_PLATFORM:
return TARGET_PLATFORM_EDEFAULT == null ? targetPlatform != null : !TARGET_PLATFORM_EDEFAULT
- .equals(targetPlatform);
+ .equals(targetPlatform);
}
return super.eIsSet(featureID);
}
@@ -439,7 +439,7 @@ public abstract class BasicMaterializationTaskImpl extends SetupTaskImpl impleme
{
private static MaterializationSpec getMSpec(URL mspecURL, IProgressMonitor monitor) throws Exception
{
- monitor.subTask("Downloading MSpec " + mspecURL);
+ monitor.subTask("Using MSpec " + mspecURL);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DownloadManager.readInto(mspecURL, null, baos, MonitorUtils.subMonitor(monitor, 20));
@@ -450,7 +450,7 @@ public abstract class BasicMaterializationTaskImpl extends SetupTaskImpl impleme
private static ComponentQuery getCQuery(URL cqueryURL, IProgressMonitor monitor) throws Exception
{
- monitor.subTask("Downloading CQuery " + cqueryURL);
+ monitor.subTask("Using CQuery " + cqueryURL);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DownloadManager.readInto(cqueryURL, null, baos, MonitorUtils.subMonitor(monitor, 20));
@@ -459,7 +459,7 @@ public abstract class BasicMaterializationTaskImpl extends SetupTaskImpl impleme
private static void materialize(final SetupTaskContext context, String mSpec, IProgressMonitor monitor)
throws MalformedURLException, Exception
- {
+ {
context.log("Clearing caches for remote files and URLs");
CorePlugin plugin = CorePlugin.getDefault();
plugin.clearRemoteFileCache();
@@ -643,7 +643,7 @@ public abstract class BasicMaterializationTaskImpl extends SetupTaskImpl impleme
{
throw new CoreException(status);
}
- }
+ }
}
} // BuckminsterImportTaskImpl
diff --git a/plugins/org.eclipse.emf.cdo.releng/releng.setup b/plugins/org.eclipse.emf.cdo.releng/releng.setup
index 0f1b194fad..ebb5af6a92 100644
--- a/plugins/org.eclipse.emf.cdo.releng/releng.setup
+++ b/plugins/org.eclipse.emf.cdo.releng/releng.setup
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<setup:Project setup:toolVersion="4" xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:predicates="http://www.eclipse.org/CDO/releng/predicates/1.0" xmlns:setup="http://www.eclipse.org/CDO/releng/setup/1.0" xmlns:workingsets="http://www.eclipse.org/CDO/releng/workingsets/1.0" name="CDO.Releng" label="CDO Release Engineering">
+<setup:Project setup:toolVersion="5" xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:predicates="http://www.eclipse.org/CDO/releng/predicates/1.0" xmlns:setup="http://www.eclipse.org/CDO/releng/setup/1.0" xmlns:workingsets="http://www.eclipse.org/CDO/releng/workingsets/1.0" name="CDO.Releng" label="CDO Release Engineering">
<branches name="master">
<setupTasks xsi:type="setup:P2Task">
<installableUnits id="org.eclipse.emf.sdk.feature.group"/>
@@ -46,6 +46,7 @@
<sourceLocators xsi:type="setup:AutomaticSourceLocator" rootFolder="${git.clone}"/>
<p2Repositories url="http://download.eclipse.org/tools/buckminster/updates-4.3"/>
<p2Repositories url="http://download.eclipse.org/egit/updates-nightly"/>
+ <p2Repositories url="http://download.eclipse.org/mylyn/snapshots/nightly"/>
<p2Repositories url="http://download.eclipse.org/technology/nebula/snapshot"/>
<p2Repositories url="http://download.eclipse.org/releases/luna"/>
</setupTasks>

Back to the top