commit 34253d52cea2487953c440582f305da22ba21071
author Stefan Xenos <sxenos@google.com> Fri May 13 14:03:33 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 13 14:03:33 2016 +0000
tree 006f2d3bbd45718159c7884418295a91ef669820
parent a86ae4528da1e47c2295bafe3a883ea47199cbe4
parent fcb73055cef1bb76fe758d2f85a16c5777efde7f

Merge "Fix the Modular Target for the oomph script."

releng/GenerateProtobuf.mwe2.launch

diff --git a/releng/GenerateProtobuf.mwe2.launch b/releng/GenerateProtobuf.mwe2.launch
index 8bb60cd..e245747 100644
--- a/releng/GenerateProtobuf.mwe2.launch
+++ b/releng/GenerateProtobuf.mwe2.launch
@@ -2,12 +2,12 @@
 <launchConfiguration type="org.eclipse.emf.mwe2.launch.Mwe2LaunchConfigurationType">
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.google.eclipse.protobuf"/>
+<listEntry value="/com.google.eclipse.protobuf.generator"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.mwe2.launch.runtime.Mwe2Launcher"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="src/com/google/eclipse/protobuf/GenerateProtobuf.mwe2"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.google.eclipse.protobuf"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.google.eclipse.protobuf.generator"/>
 </launchConfiguration>

releng/ProtobufEditor.setup

diff --git a/releng/ProtobufEditor.setup b/releng/ProtobufEditor.setup
index 8010fa7..0407a58 100644
--- a/releng/ProtobufEditor.setup
+++ b/releng/ProtobufEditor.setup
@@ -61,6 +61,12 @@
           url="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/"/>
       <repository
           url="http://download.eclipse.org/tools/gef/gef4/updates/releases"/>
+      <repository
+          url="http://download.itemis.com/updates/milestones/"/>
+      <repository
+          url="http://download.eclipse.org/tools/cdt/builds/mars/milestones/"/>
+      <repository
+          url="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
     </setupTask>
     <setupTask
         xsi:type="setup.targlets:TargletTask"
@@ -72,11 +78,33 @@
             name="*"/>
         <requirement
             name="org.eclipse.emf.mwe2.launcher.feature.group"/>
+        <requirement
+            name="de.itemis.xtext.antlr.feature.feature.group"/>
+        <requirement
+            name="de.itemis.xtext.antlr.sdk.feature.group"/>
+        <requirement
+            name="org.antlr.runtime"/>
+        <requirement
+            name="org.hamcrest.library.source"/>
+        <requirement
+            name="org.hamcrest.generator"/>
+        <requirement
+            name="org.eclipse.cdt.feature.group"/>
+        <requirement
+            name="org.eclipse.cdt.sdk.feature.group"/>
+        <requirement
+            name="org.eclipse.swtbot.eclipse.feature.group"/>
+        <requirement
+            name="org.eclipse.platform.feature.group"/>
+        <requirement
+            name="org.eclipse.jdt.feature.group"/>
         <sourceLocator
             rootFolder="${git.clone.protobuf-dt.location}"/>
         <repositoryList
             name="protobuf_repositories_list">
           <repository
+              url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/>
+          <repository
               url="http://download.eclipse.org/technology/swtbot/snapshots/"/>
           <repository
               url="http://download.eclipse.org/tools/cdt/releases/8.8.1"/>
@@ -92,6 +120,12 @@
               url="http://download.eclipse.org/modeling/emft/mwe/updates/milestones/"/>
           <repository
               url="http://download.eclipse.org/tools/gef/gef4/updates/releases"/>
+          <repository
+              url="http://download.itemis.com/updates/milestones/"/>
+          <repository
+              url="http://download.eclipse.org/tools/cdt/builds/mars/milestones/"/>
+          <repository
+              url="http://download.eclipse.org/technology/swtbot/releases/latest/"/>
         </repositoryList>
       </targlet>
       <description></description>
@@ -99,9 +133,6 @@
     <setupTask
         xsi:type="projects:ProjectsImportTask"
         id="protobuf_projects_import">
-      <predecessor
-          xsi:type="git:GitCloneTask"
-          href="releng/ProtobufEditor.setup#git.clone.protobuf-dt"/>
       <sourceLocator
           rootFolder="${git.clone.protobuf-dt.location}"/>
     </setupTask>