From f3adf71b85960da3ff22914cd1a5ce885d3b6a67 Mon Sep 17 00:00:00 2001 From: James Westman Date: Mon, 26 May 2025 19:37:56 -0500 Subject: Vala: Add test for generated UI in subdirectories --- .../31 generated ui file subdirectory/meson.build | 22 ++++++++++++++++++++++ .../subdir/TestBox.ui.in | 6 ++++++ .../subdir/meson.build | 13 +++++++++++++ .../subdir/test.gresource.xml | 6 ++++++ .../31 generated ui file subdirectory/test.vala | 7 +++++++ 5 files changed, 54 insertions(+) create mode 100644 test cases/vala/31 generated ui file subdirectory/meson.build create mode 100644 test cases/vala/31 generated ui file subdirectory/subdir/TestBox.ui.in create mode 100644 test cases/vala/31 generated ui file subdirectory/subdir/meson.build create mode 100644 test cases/vala/31 generated ui file subdirectory/subdir/test.gresource.xml create mode 100644 test cases/vala/31 generated ui file subdirectory/test.vala diff --git a/test cases/vala/31 generated ui file subdirectory/meson.build b/test cases/vala/31 generated ui file subdirectory/meson.build new file mode 100644 index 000000000..421058151 --- /dev/null +++ b/test cases/vala/31 generated ui file subdirectory/meson.build @@ -0,0 +1,22 @@ +project('demo', 'c', 'vala') + +gnome = import('gnome', required: false) + +if not gnome.found() + error('MESON_SKIP_TEST: gnome module not supported') +endif + +deps = [ + dependency('glib-2.0', version : '>=2.50'), + dependency('gobject-2.0'), + dependency('gtk+-3.0'), +] + +subdir('subdir') + +executable( + 'demo', + 'test.vala', + resources, + dependencies: deps, +) diff --git a/test cases/vala/31 generated ui file subdirectory/subdir/TestBox.ui.in b/test cases/vala/31 generated ui file subdirectory/subdir/TestBox.ui.in new file mode 100644 index 000000000..bf5c83178 --- /dev/null +++ b/test cases/vala/31 generated ui file subdirectory/subdir/TestBox.ui.in @@ -0,0 +1,6 @@ + + + + + diff --git a/test cases/vala/31 generated ui file subdirectory/subdir/meson.build b/test cases/vala/31 generated ui file subdirectory/subdir/meson.build new file mode 100644 index 000000000..dbe9344a5 --- /dev/null +++ b/test cases/vala/31 generated ui file subdirectory/subdir/meson.build @@ -0,0 +1,13 @@ +ui_tgt = custom_target( + input: 'TestBox.ui.in', + output: 'TestBox.ui', + command: [find_program('cat')], + feed: true, + capture: true, +) + +resources = gnome.compile_resources('test-resources', + 'test.gresource.xml', + c_name: 'test_res', + dependencies: ui_tgt, +) diff --git a/test cases/vala/31 generated ui file subdirectory/subdir/test.gresource.xml b/test cases/vala/31 generated ui file subdirectory/subdir/test.gresource.xml new file mode 100644 index 000000000..382b95193 --- /dev/null +++ b/test cases/vala/31 generated ui file subdirectory/subdir/test.gresource.xml @@ -0,0 +1,6 @@ + + + + TestBox.ui + + diff --git a/test cases/vala/31 generated ui file subdirectory/test.vala b/test cases/vala/31 generated ui file subdirectory/test.vala new file mode 100644 index 000000000..36f565b63 --- /dev/null +++ b/test cases/vala/31 generated ui file subdirectory/test.vala @@ -0,0 +1,7 @@ +[GtkTemplate (ui = "/com/mesonbuild/test/TestBox.ui")] +class TestBox: Gtk.Box { +} + +int main() { + return 0; +} -- cgit v1.2.3