From 607d8603b6d5b8409aa3f0275d8dfc8d0b5fbaa0 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Wed, 23 Jun 2021 13:41:44 +0200
Subject: Update to the new matrix-doc layout and tooling

Among things affecting Quotient, the update involved moving API files
from api/ to data/api/, adding extensions to event schema files, and
switching from ReStructured Text to Markdown as a lightweight markup
language. This commit updates the build system and GTAD configuration
to accommodate for these.

The build system is also more robust now in choosing whether the
update-api target should be provided. Previously the target was provided
whenever GTAD_PATH and MATRIX_DOC_PATH were specified, even if they
did not point to anything valid. CMake now checks that MATRIX_DOC_PATH
is an actual directory and that GTAD_PATH points to an actual file.
---
 gtad/gtad.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gtad/gtad.yaml')

diff --git a/gtad/gtad.yaml b/gtad/gtad.yaml
index adf5024a..d68cc8a0 100644
--- a/gtad/gtad.yaml
+++ b/gtad/gtad.yaml
@@ -85,7 +85,7 @@ analyzer:
             { type: RoomEventPtr, imports: "events/eventloader.h" }
         - /event.yaml$/:
             { type: EventPtr, imports: "events/eventloader.h" }
-      - /m\.room\.member$/: void # Skip resolving; see EventsArray<> below
+      - /m\.room\.member/: void # Skip resolving; see EventsArray<> below
       - '/^(\./)?definitions/request_email_validation.yaml$/':
           title: EmailValidationData
       - '/^(\./)?definitions/request_msisdn_validation.yaml$/':
@@ -109,7 +109,7 @@ analyzer:
         - /^Notification|Result$/:
             type: "std::vector<{{1}}>"
             imports: "events/eventloader.h"
-        - /m\.room\.member$/: # Only used in an array (see also above)
+        - /m\.room\.member/: # Only used in an array (see also above)
             type: "EventsArray<RoomMemberEvent>"
             imports: "events/roommemberevent.h"
         - /state_event.yaml$/: StateEvents
-- 
cgit v1.2.3


From 1e70bbb4906f661a11856215556025ba86aac196 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Mon, 28 Jun 2021 21:04:33 +0200
Subject: gtad.yaml: update for use with GTAD pre-0.8

---
 gtad/gtad.yaml | 38 ++++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 18 deletions(-)

(limited to 'gtad/gtad.yaml')

diff --git a/gtad/gtad.yaml b/gtad/gtad.yaml
index d68cc8a0..e56c394d 100644
--- a/gtad/gtad.yaml
+++ b/gtad/gtad.yaml
@@ -77,28 +77,31 @@ analyzer:
     +on:
     - object: &QJsonObject { type: QJsonObject }
     - $ref:
-      - +set: { moveOnly: }
+      - +set:
+          moveOnly:
+          imports: '"events/eventloader.h"'
         +on:
-        - /state_event.yaml$/:
-            { type: StateEventPtr, imports: "events/eventloader.h" }
-        - /room_event.yaml$/:
-            { type: RoomEventPtr, imports: "events/eventloader.h" }
-        - /event.yaml$/:
-            { type: EventPtr, imports: "events/eventloader.h" }
+        - /state_event.yaml$/: StateEventPtr
+        - /room_event.yaml$/: RoomEventPtr
+        - /event.yaml$/: EventPtr
       - /m\.room\.member/: void # Skip resolving; see EventsArray<> below
-      - '/^(\./)?definitions/request_email_validation.yaml$/':
-          title: EmailValidationData
-      - '/^(\./)?definitions/request_msisdn_validation.yaml$/':
-          title: MsisdnValidationData
-      - /_filter.yaml$/: # Event/RoomEventFilters do NOT need Omittable<>
-      - /public_rooms_response.yaml$/: { _inline: true }
-      - //: *UseOmittable # Also apply "avoidCopy" to all other ref'ed types
+      - +set:
+          # This renderer actually applies to all $ref things
+          _importRenderer: '"{{#segments}}{{_}}{{#_join}}/{{/_join}}{{/segments}}.h"'
+        +on:
+        - '/^(\./)?definitions/request_email_validation.yaml$/':
+            title: EmailValidationData
+        - '/^(\./)?definitions/request_msisdn_validation.yaml$/':
+            title: MsisdnValidationData
+        - /_filter.yaml$/: # Event/RoomEventFilters do NOT need Omittable<>
+        - /public_rooms_response.yaml$/: { _inline: true }
+        - //: *UseOmittable # Also apply "avoidCopy" to all other ref'ed types
     - schema:
       - getTurnServer<: *QJsonObject # It's used as an opaque JSON object
       - PublicRoomResponse: { _inline: true }
 #      - defineFilter>: &Filter # Force folding into a structure
 #          type: Filter
-#          imports: "csapi/definitions/sync_filter.h"
+#          imports: '"csapi/definitions/sync_filter.h"'
 #      - getFilter<: *Filter
       - RoomFilter: # A structure inside Filter, same story as with *_filter.yaml
       - //: *UseOmittable
@@ -108,10 +111,10 @@ analyzer:
         +on:
         - /^Notification|Result$/:
             type: "std::vector<{{1}}>"
-            imports: "events/eventloader.h"
+            imports: '"events/eventloader.h"'
         - /m\.room\.member/: # Only used in an array (see also above)
             type: "EventsArray<RoomMemberEvent>"
-            imports: "events/roommemberevent.h"
+            imports: '"events/roommemberevent.h"'
         - /state_event.yaml$/: StateEvents
         - /room_event.yaml$/: RoomEvents
         - /event.yaml$/: Events
@@ -134,7 +137,6 @@ mustache:
 #    _quote: '"' # Common quote for left and right
 #    _leftQuote: '"'
 #    _rightQuote: '"'
-#    _joinChar: ',' # The character used by {{_join}} - not working yet
     _comment: '//'
     copyrightName: Kitsune Ral
     copyrightEmail: <kitsune-ral@users.sf.net>
-- 
cgit v1.2.3