From 01b07d59db5ac79880f1e19279d5f4d8ec68ede7 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Tue, 25 Jun 2019 21:58:57 +0100
Subject: [PATCH] Add m2e extensions and eclipse pre-reqs

---
 eclipse.yaml             | 75 ++++++++++++++++++++++++++++++++++------
 gen_build_order_graph.py | 14 +++++---
 2 files changed, 74 insertions(+), 15 deletions(-)

diff --git a/eclipse.yaml b/eclipse.yaml
index 81b3e63..ef88d95 100644
--- a/eclipse.yaml
+++ b/eclipse.yaml
@@ -395,6 +395,12 @@ data:
                 rationale: >
                     Module API.
                     Runtime dependency of eclipse-webtools.
+            eclipse-ecf:
+                buildorder: 20
+                ref: tycho
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse.
             eclipse-egit:
                 buildorder: 40
                 ref: eclipse
@@ -402,13 +408,19 @@ data:
                 rationale: >
                     Module API.
                     Runtime dependency of eclipse-egit-github,
-                         eclipse-tm-terminal.
+                         eclipse-m2e-egit, eclipse-tm-terminal.
             eclipse-egit-github:
                 buildorder: 50
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
+            eclipse-emf:
+                buildorder: 10
+                ref: tycho
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of eclipse, eclipse-ecf.
             eclipse-epp-logging:
                 buildorder: 40
                 ref: eclipse
@@ -430,8 +442,8 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-egit,
-                         eclipse-egit-github, eclipse-ptp.
+                    Runtime dependency of eclipse-egit, eclipse-egit-github,
+                         eclipse-m2e-egit, eclipse-ptp.
             eclipse-launchbar:
                 buildorder: 10
                 ref: eclipse
@@ -445,19 +457,58 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
+            eclipse-m2e-apt:
+                buildorder: 60
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
+            eclipse-m2e-buildhelper:
+                buildorder: 60
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
             eclipse-m2e-core:
                 buildorder: 50
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-testng.
+                    Runtime dependency of eclipse-m2e-apt, eclipse-m2e-mavenarchiver,
+                         eclipse-m2e-buildhelper, eclipse-m2e-egit, eclipse-m2e-tycho,
+                         eclipse-m2e-wtp, eclipse-testng.
+            eclipse-m2e-egit:
+                buildorder: 60
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
+            eclipse-m2e-mavenarchiver:
+                buildorder: 60
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
+                    Runtime dependency of eclipse-m2e-wtp.
+            eclipse-m2e-tycho:
+                buildorder: 60
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
             eclipse-m2e-workspace:
                 buildorder: 10
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core.
+            eclipse-m2e-wtp:
+                buildorder: 70
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Module API.
             eclipse-mpc:
                 buildorder: 10
                 ref: eclipse
@@ -490,6 +541,7 @@ data:
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
+                    Module API.
                     Runtime dependency of eclipse-linuxtools, eclipse-ptp.
             eclipse-subclipse:
                 buildorder: 50
@@ -523,7 +575,8 @@ data:
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Module API.
-                    Runtime dependency of eclipse-m2e-core.
+                    Runtime dependency of eclipse-m2e-apt,
+                         eclipse-m2e-core, eclipse-m2e-wtp.
             ed25519-java:
                 buildorder: 10
                 ref: eclipse
@@ -827,18 +880,18 @@ data:
                     Runtime dependency of eclipse, eclipse-dtp,
                          eclipse-epp-logging, eclipse-m2e-core,
                          eclipse-mylyn, maven-indexer.
-            maven-archiver:
-                buildorder: 30
-                ref: eclipse
-                arches: [x86_64, ppc64le, aarch64, s390x]
-                rationale: >
-                    Runtime dependency of maven-war-plugin.
             maven-archetype:
                 buildorder: 40
                 ref: eclipse
                 arches: [x86_64, ppc64le, aarch64, s390x]
                 rationale: >
                     Runtime dependency of eclipse-m2e-core.
+            maven-archiver:
+                buildorder: 30
+                ref: eclipse
+                arches: [x86_64, ppc64le, aarch64, s390x]
+                rationale: >
+                    Runtime dependency of maven-war-plugin.
             maven-filtering:
                 buildorder: 20
                 ref: eclipse
diff --git a/gen_build_order_graph.py b/gen_build_order_graph.py
index 44223dc..ac3c2b0 100755
--- a/gen_build_order_graph.py
+++ b/gen_build_order_graph.py
@@ -19,13 +19,15 @@ for key, value in rpms.items():
     if subg is None:
         subg = g.add_subgraph(name=f"{rank}", label=f"Build Order {rank}", rank="same")
     subg.add_node(f"{rank}")
-    subg.add_node(key)
-    rs = value['rationale'].replace('\n', ' ').split('.')
     reqs = []
     breqs = []
-    for r in rs:
+    api = False
+    for r in value['rationale'].replace('\n', ' ').split('.'):
         r = r.strip()
-        if not r or r == 'Module API':
+        if not r:
+            continue
+        if r == 'Module API':
+            api = True
             continue
         if r.startswith('Runtime dependency of'):
             r = r[len('Runtime dependency of'):]
@@ -33,6 +35,10 @@ for key, value in rpms.items():
         if r.startswith('Build dependency of'):
             r = r[len('Build dependency of'):]
             breqs = [x.strip() for x in r.split(',')]
+    if api:
+        subg.add_node(key, color='green')
+    else:
+        subg.add_node(key)
     for req in reqs:
         # For Rs, check if also a BR
         if req not in breqs: