add blueprint templates, fix meson build

Author: ranfdev

.github/workflows/build-flatpak.yml

@@ -14,5 +14,5 @@ jobs:
     - uses: actions/checkout@v2
     - uses: bilelmoussaoui/flatpak-github-actions@v2
       with:
-        bundle: "com.ranfdev.GeopardDevel.flatpak"
-        manifest-path: "build-aux/com.ranfdev.GeopardDevel.json"
+        bundle: "com.ranfdev.Geopard.Devel.flatpak"
+        manifest-path: "build-aux/com.ranfdev.Geopard.Devel.json"

.gitignore

@@ -1,3 +1,4 @@
 /target
 /result
 _build/
+subprojects/blueprint-compiler

build-aux/cargo.sh

@@ -1,7 +1,7 @@
 {
-    "app-id" : "com.ranfdev.GeopardDevel",
-    "runtime" : "org.gnome.Platform",
-    "runtime-version" : "master",
+    "app-id" : "com.ranfdev.Geopard.Devel",
+    "runtime" : "org.gnome.Sdk",
+    "runtime-version" : "42",
     "sdk" : "org.gnome.Sdk",
     "sdk-extensions" : [
         "org.freedesktop.Sdk.Extension.rust-stable"
@@ -21,13 +21,10 @@
         "build-args" : [
             "--share=network"
         ],
-        "env" : {
-            "RUSTFLAGS" : "--remap-path-prefix =../",
-            "CARGO_HOME" : "/run/build/Geopard/cargo"
-        }
+        "env" : {        }
     },
     "modules" : [
-    	{
+        {
             "name" : "libsass",
             "cleanup" : [
                 "*"
@@ -93,12 +90,10 @@
             ],
             "sources" : [
                 {
-                    "type" : "git",
-                    "url" : "../",
-                    "branch" : "master"
+                    "type" : "dir",
+                    "url" : "../"
                 }
             ]
         }
     ]
 }
-

build-aux/com.ranfdev.GeopardDevel.json build-aux/com.ranfdev.Geopard.Devel.jsonbuild-aux/com.ranfdev.GeopardDevel.json renamed to build-aux/com.ranfdev.Geopard.Devel.json

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schemalist>
+  <schema path="/com/ranfdev/Geopard/" id="@app-id@" gettext-domain="@gettext-package@">
+    <key name="window-width" type="i">
+      <default>600</default>
+      <summary>Window width</summary>
+    </key>
+    <key name="window-height" type="i">
+      <default>400</default>
+      <summary>Window height</summary>
+    </key>
+    <key name="is-maximized" type="b">
+      <default>false</default>
+      <summary>Window maximized state</summary>
+    </key>
+  </schema>
+</schemalist>

build-aux/meson_post_install.py

@@ -1,4 +1,5 @@
 subdir('icons')
+subdir('resources')
 # Desktop file
 desktop_conf = configuration_data()
 desktop_conf.set('icon', application_id)
@@ -21,7 +22,8 @@ if desktop_file_validate.found()
     desktop_file_validate,
     args: [
       desktop_file.full_path()
-    ]
+    ],
+    depends: desktop_file,
   )
 endif
 
@@ -46,7 +48,29 @@ if appstream_util.found()
     'validate-appdata', appstream_util,
     args: [
       'validate', '--nonet', appdata_file.full_path()
-    ]
+    ],
+    depends: appdata_file,
   )
 endif
 
+# GSchema
+gschema_conf = configuration_data()
+gschema_conf.set('app-id', application_id)
+gschema_conf.set('gettext-package', gettext_package)
+configure_file(
+  input: '@[email protected]'.format(base_id),
+  output: '@[email protected]'.format(application_id),
+  configuration: gschema_conf,
+  install: true,
+  install_dir: datadir / 'glib-2.0' / 'schemas'
+)
+
+# Validata GSchema
+if glib_compile_schemas.found()
+  test(
+    'validate-gschema', glib_compile_schemas,
+    args: [
+      '--strict', '--dry-run', meson.current_build_dir()
+    ],
+  )
+endif

data/com.ranfdev.Geopard.gschema.xml.in

@@ -0,0 +1,19 @@
+blueprints = custom_target('blueprints',
+  input: files(
+    'ui/window.blp',
+    'ui/shortcuts.blp'
+  ),
+  output: '.',
+  command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
+)
+
+resources = gnome.compile_resources(
+  'resources',
+  'resources.gresource.xml',
+  gresource_bundle: true,
+  source_dir: meson.current_build_dir(),
+  install: true,
+  dependencies: blueprints,
+  install_dir: pkgdatadir,
+)
+

…alable/apps/com.ranfdev.GeopardDevel.svg …lable/apps/com.ranfdev.Geopard.Devel.svgdata/icons/hicolor/scalable/apps/com.ranfdev.GeopardDevel.svg renamed to data/icons/hicolor/scalable/apps/com.ranfdev.Geopard.Devel.svg data/icons/hicolor/scalable/apps/com.ranfdev.GeopardDevel.svg renamed to data/icons/hicolor/scalable/apps/com.ranfdev.Geopard.Devel.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/com/ranfdev/Geopard/">
+    <!-- see https://gtk-rs.org/gtk4-rs/git/docs/gtk4/struct.Application.html#automatic-resources -->
+    <file compressed="true" preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">ui/shortcuts.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">ui/window.ui</file>
+  </gresource>
+</gresources>