X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=TraceCompass.setup;h=f71010880df6194bf2f03a9bb219db57899d94b5;hb=0b9fc6da49ced1f8e4ee9d35e154fc87e3ce144a;hp=63f286785ee193d13beeb4b2a3e82d13a0402cde;hpb=45cc782ca01442a6fd3a39c7bb280a375ec70638;p=deliverable%2Ftracecompass.git

diff --git a/TraceCompass.setup b/TraceCompass.setup
index 63f286785e..f71010880d 100644
--- a/TraceCompass.setup
+++ b/TraceCompass.setup
@@ -10,12 +10,23 @@
     xmlns:projects="http://www.eclipse.org/oomph/setup/projects/1.0"
     xmlns:setup="http://www.eclipse.org/oomph/setup/1.0"
     xmlns:setup.p2="http://www.eclipse.org/oomph/setup/p2/1.0"
+    xmlns:setup.targlets="http://www.eclipse.org/oomph/setup/targlets/1.0"
     xmlns:setup.workingsets="http://www.eclipse.org/oomph/setup/workingsets/1.0"
-    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/projects/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Projects.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
+    xsi:schemaLocation="http://www.eclipse.org/oomph/setup/git/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Git.ecore http://www.eclipse.org/oomph/setup/jdt/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/JDT.ecore http://www.eclipse.org/oomph/setup/pde/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/PDE.ecore http://www.eclipse.org/oomph/predicates/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/Predicates.ecore http://www.eclipse.org/oomph/setup/targlets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupTarglets.ecore http://www.eclipse.org/oomph/setup/workingsets/1.0 http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/models/SetupWorkingSets.ecore"
     name="tracecompass"
     label="Trace Compass">
+  <annotation/>
   <setupTask
-      xsi:type="setup.p2:P2Task">
+      xsi:type="setup.p2:P2Task"
+      label="Trace Compass Tools">
+    <requirement
+        name="org.eclipse.platform.feature.group"/>
+    <requirement
+        name="org.eclipse.rcp.feature.group"/>
+    <requirement
+        name="org.eclipse.jdt.feature.group"/>
+    <requirement
+        name="org.eclipse.pde.feature.group"/>
     <requirement
         name="org.eclipse.pde.api.tools.ee.feature.feature.group"/>
     <requirement
@@ -41,6 +52,11 @@
       vm="true">
     <description>Set the perm size needed to work with the projects of ${scope.project.label}</description>
   </setupTask>
+  <setupTask
+      xsi:type="setup:EclipseIniTask"
+      option="-Doomph.redirection.tracecompass="
+      value="http://git.eclipse.org/c/tracecompass/org.eclipse.tracecompass.git/plain/TraceCompass.setup->${git.clone.tracecompass.location|uri}/TraceCompass.setup"
+      vm="true"/>
   <setupTask
       xsi:type="setup:ResourceCreationTask"
       excludedTriggers="STARTUP MANUAL"
@@ -51,30 +67,30 @@
   </setupTask>
   <setupTask
       xsi:type="jdt:JRETask"
-      version="JavaSE-1.7"
-      location="${jre.location-1.7}">
+      version="JavaSE-1.8"
+      location="${jre.location-1.8}">
     <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
   </setupTask>
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="tracecompass-eStaging"
+      defaultValue="tracecompass-e4.5"
       storageURI="scope://Workspace"
       label="Target Platform">
     <choice
         value="tracecompass-eStaging"
-        label="Trace Compass Eclipse Mars - 4.5"/>
+        label="Trace Compass Eclipse Neon - 4.6"/>
     <choice
-        value="tracecompass-e4.4"
-        label="Trace Compass Eclipse Luna - 4.4"/>
+        value="tracecompass-e4.5"
+        label="Trace Compass Eclipse Mars - 4.5"/>
     <description>Choose the compatibly level of the target platform</description>
   </setupTask>
   <setupTask
       xsi:type="pde:APIBaselineTask"
       name="Trace Compass"
-      version="0.1.0"
+      version="1.1.0"
       location="${workspace.location/../api.baseline}"
-      remoteURI="http://download.eclipse.org/tracecompass/releases/0.1.0/repository/tracecompass-0.1.0.zip"/>
+      remoteURI="http://download.eclipse.org/tracecompass/releases/1.1.0/repository/tracecompass-1.1.0.zip"/>
   <stream name="master">
     <setupTask
         xsi:type="git:GitCloneTask"
@@ -124,5 +140,5 @@
   <logicalProjectContainer
       xsi:type="setup:ProjectCatalog"
       href="index:/org.eclipse.setup#//@projectCatalogs[name='org.eclipse']"/>
-  <description>Trace Compass</description>
+  <description>Trace Compass is a Java tool for viewing and analyzing logs or traces of any type.</description>
 </setup:Project>