From aaeec84d75ea46bba3c7857be43ad5416301f5b1 Mon Sep 17 00:00:00 2001 From: William Roy Date: Tue, 7 Mar 2023 21:59:50 +0000 Subject: [PATCH] Fix compile_resources present source directory In certain scenarios, address the issue where gnome.compile_resources fails to transmit the present source directory. This is most notably visible with MSBuild. --- demos/constraint-editor/meson.build | 2 +- demos/gtk-demo/meson.build | 2 +- demos/icon-browser/meson.build | 2 +- demos/node-editor/meson.build | 2 +- demos/widget-factory/meson.build | 2 +- examples/application2/meson.build | 2 +- examples/application3/meson.build | 2 +- examples/application4/meson.build | 2 +- examples/application5/meson.build | 2 +- examples/application6/meson.build | 2 +- examples/application7/meson.build | 2 +- examples/application8/meson.build | 2 +- examples/application9/meson.build | 2 +- examples/bp/meson.build | 2 +- gdk/meson.build | 2 +- gsk/meson.build | 2 +- gtk/meson.build | 2 +- testsuite/css/style/meson.build | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/demos/constraint-editor/meson.build b/demos/constraint-editor/meson.build index 22f0496de9..f04abca6da 100644 --- a/demos/constraint-editor/meson.build +++ b/demos/constraint-editor/meson.build @@ -9,7 +9,7 @@ constraint_editor_sources = [ constraint_editor_resources = gnome.compile_resources('constraint_editor_resources', 'constraint-editor.gresource.xml', - source_dir: '.', + source_dir: meson.current_source_dir(), ) executable('gtk4-constraint-editor', diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build index b1c21a9f9b..d115339bb6 100644 --- a/demos/gtk-demo/meson.build +++ b/demos/gtk-demo/meson.build @@ -225,7 +225,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_ else gtkdemo_resources = gnome.compile_resources('gtkdemo_resources', 'demo.gresource.xml', - source_dir: '.', + source_dir: meson.current_source_dir() ) endif diff --git a/demos/icon-browser/meson.build b/demos/icon-browser/meson.build index a1ae92619d..9a6a52a4ce 100644 --- a/demos/icon-browser/meson.build +++ b/demos/icon-browser/meson.build @@ -8,7 +8,7 @@ iconbrowser_sources = [ iconbrowser_resources = gnome.compile_resources('iconbrowser_resources', 'iconbrowser.gresource.xml', - source_dir: '.', + source_dir: meson.current_source_dir(), ) executable('gtk4-icon-browser', diff --git a/demos/node-editor/meson.build b/demos/node-editor/meson.build index 72d48cd12c..91ea0d6d69 100644 --- a/demos/node-editor/meson.build +++ b/demos/node-editor/meson.build @@ -7,7 +7,7 @@ node_editor_sources = [ node_editor_resources = gnome.compile_resources('node_editor_resources', 'node-editor.gresource.xml', - source_dir: '.', + source_dir: meson.current_source_dir(), ) executable('gtk4-node-editor', diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build index 0513555a3f..bc4bb29478 100644 --- a/demos/widget-factory/meson.build +++ b/demos/widget-factory/meson.build @@ -69,7 +69,7 @@ if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_ else widgetfactory_resources = gnome.compile_resources('widgetfactory_resources', 'widget-factory.gresource.xml', - source_dir: '.', + source_dir: meson.current_source_dir(), ) endif diff --git a/examples/application2/meson.build b/examples/application2/meson.build index 74b931efce..78ecb38d04 100644 --- a/examples/application2/meson.build +++ b/examples/application2/meson.build @@ -1,6 +1,6 @@ app2_resources = gnome.compile_resources('exampleapp2_resources', 'exampleapp.gresource.xml', - source_dir: '.') + source_dir: meson.current_source_dir()) executable('exampleapp2', 'exampleapp.c', 'exampleappwin.c', 'main.c', app2_resources, diff --git a/examples/application3/meson.build b/examples/application3/meson.build index 082575d752..1dbc605592 100644 --- a/examples/application3/meson.build +++ b/examples/application3/meson.build @@ -1,6 +1,6 @@ app3_resources = gnome.compile_resources('exampleapp3_resources', 'exampleapp.gresource.xml', - source_dir: '.') + source_dir: meson.current_source_dir()) executable('exampleapp3', 'exampleapp.c', 'exampleappwin.c', 'main.c', app3_resources, diff --git a/examples/application4/meson.build b/examples/application4/meson.build index c03988cdb7..a2d21ac4b0 100644 --- a/examples/application4/meson.build +++ b/examples/application4/meson.build @@ -1,6 +1,6 @@ app4_resources = gnome.compile_resources('exampleapp4_resources', 'exampleapp.gresource.xml', - source_dir: '.') + source_dir: meson.current_source_dir()) executable('exampleapp4', 'exampleapp.c', 'exampleappwin.c', 'main.c', app4_resources, diff --git a/examples/application5/meson.build b/examples/application5/meson.build index 38e63440e9..284811a230 100644 --- a/examples/application5/meson.build +++ b/examples/application5/meson.build @@ -1,6 +1,6 @@ app5_resources = gnome.compile_resources('exampleapp5_resources', 'exampleapp.gresource.xml', - source_dir: '.') + source_dir: meson.current_source_dir()) app5_schemas = gnome.compile_schemas() diff --git a/examples/application6/meson.build b/examples/application6/meson.build index 33ad5faced..601eed040c 100644 --- a/examples/application6/meson.build +++ b/examples/application6/meson.build @@ -1,6 +1,6 @@ app6_resources = gnome.compile_resources('exampleapp6_resources', 'exampleapp.gresource.xml', - source_dir: '.') + source_dir: meson.current_source_dir()) app6_schemas = gnome.compile_schemas() diff --git a/examples/application7/meson.build b/examples/application7/meson.build index f5babb340c..84bacdce99 100644 --- a/examples/application7/meson.build +++ b/examples/application7/meson.build @@ -1,6 +1,6 @@ app7_resources = gnome.compile_resources('exampleapp7_resources', 'exampleapp.gresource.xml', - source_dir: '.') + source_dir: meson.current_source_dir()) app7_schemas = gnome.compile_schemas() diff --git a/examples/application8/meson.build b/examples/application8/meson.build index 96ba752e4f..f2e1d7cea9 100644 --- a/examples/application8/meson.build +++ b/examples/application8/meson.build @@ -1,6 +1,6 @@ app8_resources = gnome.compile_resources('exampleapp8 resources', 'exampleapp.gresource.xml', - source_dir: '.') + source_dir: meson.current_source_dir()) app8_schemas = gnome.compile_schemas() diff --git a/examples/application9/meson.build b/examples/application9/meson.build index ad1a804df2..8203e2fc89 100644 --- a/examples/application9/meson.build +++ b/examples/application9/meson.build @@ -1,6 +1,6 @@ app9_resources = gnome.compile_resources('exampleapp9_resources', 'exampleapp.gresource.xml', - source_dir: '.') + source_dir: meson.current_source_dir()) app9_schemas = gnome.compile_schemas() diff --git a/examples/bp/meson.build b/examples/bp/meson.build index b884d6ba59..6a6db48c66 100644 --- a/examples/bp/meson.build +++ b/examples/bp/meson.build @@ -1,5 +1,5 @@ bp_resources = gnome.compile_resources('bloatpad_resources', 'bloatpad.gresources.xml', - source_dir: '.') + source_dir: meson.current_source_dir()) executable('bloatpad', 'bloatpad.c', bp_resources, dependencies: libgtk_dep, c_args: common_cflags) diff --git a/gdk/meson.build b/gdk/meson.build index b903747fc6..3f97ac16fb 100644 --- a/gdk/meson.build +++ b/gdk/meson.build @@ -131,7 +131,7 @@ gdk_gresource_xml = configure_file(output: 'gdk.gresource.xml', gdkresources = gnome.compile_resources('gdkresources', gdk_gresource_xml, - source_dir: '.', + source_dir: meson.current_source_dir(), c_name: '_gdk', extra_args: '--manual-register', ) diff --git a/gsk/meson.build b/gsk/meson.build index 7746aeffc4..bd50524785 100644 --- a/gsk/meson.build +++ b/gsk/meson.build @@ -164,7 +164,7 @@ gskenum_h = gsk_enums[1] gskresources = gnome.compile_resources('gskresources', gsk_resources_xml, dependencies: gsk_private_vulkan_compiled_shaders_deps, - source_dir: '.', + source_dir: meson.current_source_dir(), c_name: '_gsk', extra_args: [ '--manual-register', ], ) diff --git a/gtk/meson.build b/gtk/meson.build index b4e9c9fe3e..8d3fb73a55 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -913,7 +913,7 @@ foreach lang : [ gnome.compile_resources(lang, resxml, - source_dir: 'emoji', + source_dir: join_paths(meson.current_source_dir(), 'emoji'), gresource_bundle: true, install: true, install_dir: gtk_datadir / 'gtk-4.0/emoji', diff --git a/testsuite/css/style/meson.build b/testsuite/css/style/meson.build index ef703d7994..a6c5e2edf4 100644 --- a/testsuite/css/style/meson.build +++ b/testsuite/css/style/meson.build @@ -10,7 +10,7 @@ styletest_env.set('G_ENABLE_DIAGNOSTIC', '0') cssresources = gnome.compile_resources( 'cssresources', 'test-css-style.gresource.xml', - source_dir: '.', + source_dir: meson.current_source_dir(), ) test_style = executable('test-css-style',