From a682b4d57b848b2be9bb3427b1d4a93b9ec5680c Mon Sep 17 00:00:00 2001
From: Filippo Cremonese <filippocremonese@rev.ng>
Date: Mon, 12 Oct 2020 16:59:05 +0200
Subject: [PATCH] Switch ui/qt-creator to overlay convention
---
.orchestra/config/components.yml | 2 --
.../components/ui/{qt_creator.lib.yml => qt_creator.yml} | 7 +++++--
2 files changed, 5 insertions(+), 4 deletions(-)
rename .orchestra/config/components/ui/{qt_creator.lib.yml => qt_creator.yml} (90%)
diff --git a/.orchestra/config/components.yml b/.orchestra/config/components.yml
index 42ab2d8..e9aec83 100644
--- a/.orchestra/config/components.yml
+++ b/.orchestra/config/components.yml
@@ -1,7 +1,6 @@
#@ load("@ytt:template", "template")
#@ load("@ytt:data", "data")
-#@ load("/components/ui/qt_creator.lib.yml", "qt_creator_component")
#@ load("/components/ui/graphviz.lib.yml", "graphviz_component")
#@ load("/components/ui/adaptagrams.lib.yml", "adaptagrams_component")
#@ load("/components/ui/cold_revng.lib.yml", "cold_revng_component")
@@ -25,7 +24,6 @@
#@ load("/global_options.lib.yml", "options")
components:
- ui/qt-creator: #@ qt_creator_component
ui/graphviz: #@ graphviz_component
ui/adaptagrams: #@ adaptagrams_component
ui/cold-revng: #@ cold_revng_component
diff --git a/.orchestra/config/components/ui/qt_creator.lib.yml b/.orchestra/config/components/ui/qt_creator.yml
similarity index 90%
rename from .orchestra/config/components/ui/qt_creator.lib.yml
rename to .orchestra/config/components/ui/qt_creator.yml
index 087bcc2..a1f0f9c 100644
--- a/.orchestra/config/components/ui/qt_creator.lib.yml
+++ b/.orchestra/config/components/ui/qt_creator.yml
@@ -1,3 +1,4 @@
+#@ load("@ytt:overlay", "overlay")
#@ load("/lib/make.lib.yml", "make")
#@ load("/lib/shell.lib.yml", "expand_args")
#@ load("/lib/optimization_flavors.lib.yml", "qmake_optimization_flavors")
@@ -62,6 +63,8 @@ builds:
#@ end
#@ end
+#@overlay/match by=overlay.all, expects=1
+#@overlay/match-child-defaults missing_ok=True
---
-
-#@ qt_creator_component = _qt_creator_component()
+components:
+ ui/qt-creator: #@ _qt_creator_component()
--
GitLab