Merge branch 'YaLTeR-main-patch-76590' into 'main'

setup.rst: Fix meson dependencies

See merge request jwestman/blueprint-compiler!2

blueprintcompiler/language/values.py

@@ -225,12 +225,12 @@ class Flag(AstNode):
         return self.tokens["value"]
 
     @property
-    def value(self) -> T.Optional[int]:
+    def value(self) -> T.Optional[str]:
         type = self.context[ValueTypeCtx].value_type
         if not isinstance(type, Enumeration):
             return None
         elif member := type.members.get(self.name):
-            return member.value
+            return member.nick
         else:
             return None
 

docs/collect-sections.py

@@ -132,5 +132,8 @@ if __name__ == "__main__":
     # print the sections to a json file
     with open(outfile, "w") as f:
         json.dump(
-            {name: section.to_json() for name, section in sections.items()}, f, indent=2
+            {name: section.to_json() for name, section in sections.items()},
+            f,
+            indent=2,
+            sort_keys=True,
         )

docs/index.rst

@@ -26,7 +26,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
 
    using Gtk 4.0;
 
-   template MyAppWindow : ApplicationWindow {
+   template $MyAppWindow: ApplicationWindow {
      default-width: 600;
      default-height: 300;
      title: _("Hello, Blueprint!");
@@ -35,7 +35,7 @@ Blueprint is a markup language and compiler for GTK 4 user interfaces.
      HeaderBar {}
 
      Label {
-       label: bind MyAppWindow.main_text;
+       label: bind template.main_text;
      }
    }
 

docs/setup.rst

@@ -48,12 +48,19 @@ blueprint-compiler works as a meson subproject.
 
    .. code-block:: meson.build
 
-      blueprints = custom_target('blueprints',
+      blps = [
-        input: files(
         # LIST YOUR BLUEPRINT FILES HERE
-        ),
+      ]
-        output: '.',
+
-        command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
+      uis = []
+      foreach blp : blps
+        uis += blp.replace('.blp', '.ui')
+      endforeach
+
+      blueprints = custom_target('blueprints',
+        input: blps,
+        output: uis,
+        command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTDIR@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
       )
 
 #. In the same ``meson.build`` file, add this argument to your ``gnome.compile_resources`` command:

tests/samples/flags.ui

@@ -7,7 +7,7 @@ corresponding .blp file and regenerate this file with blueprint-compiler.
 <interface>
   <requires lib="gtk" version="4.0"/>
   <object class="GApplication">
-    <property name="flags">1|4</property>
+    <property name="flags">is-service|handles-open</property>
   </object>
   <object class="GtkEventControllerScroll">
     <property name="flags">1</property>