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.

diff --git a/demos/constraint-editor/meson.build b/demos/constraint-editor/meson.build
index 22f0496de95b1cada167e64755dc6ba2ad427971..f04abca6da3ec554a98610e8b01f3421eaf16ad5 100644 (file)
--- 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 b1c21a9f9bcfeb397c5e5f1a261a3317faf27206..d115339bb65cc8ba8e52dde5e4bc5dadcd59b639 100644 (file)
--- 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 a1ae92619d806f060953fa5c298e09138fbe9354..9a6a52a4cea711e163b6f370220e2fe6588d9a16 100644 (file)
--- 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 72d48cd12ce64dca9f3ac08cde0a35aee2b9193a..91ea0d6d69cafb41282a2f2ce16627e355a11a41 100644 (file)
--- 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 0513555a3fa401040a0a977a6ba5ad6e1d5a512c..bc4bb294783eab6911317762a83a590113267e5b 100644 (file)
--- 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 74b931efceab4bf5845090836477c0fedd1e0c70..78ecb38d04f6bc4f6383e4d3c3a65aa1461a30c4 100644 (file)
--- 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 082575d752ee9bc9c97eb1e05187cc121c2acaa8..1dbc6055929ee72610c2a0a4c0a80c337c208ea0 100644 (file)
--- 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 c03988cdb7349e1cbfd3c5dfaad405799636ddf0..a2d21ac4b0988226907d0b378bb902d38eb202cf 100644 (file)
--- 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 38e63440e946afecea2af97382748c040c17cb46..284811a23086efaf4f68153575efbdd27a2c492b 100644 (file)
--- 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 33ad5faced847c7f788f47633c23c4350e49369c..601eed040c995744ba8dcf1487bd83e4c0443a0c 100644 (file)
--- 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 f5babb340c42caadd2048df2f8b5e597b60ffa00..84bacdce9957c8f4276d1e403ec5318b92803825 100644 (file)
--- 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 96ba752e4f50fdb1f5cf23345304c34ab0010178..f2e1d7cea902144a1a4bc01f35fc53d0fb717d29 100644 (file)
--- 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 ad1a804df2699712033b3696da1e0c0526859f8a..8203e2fc899f51c8375a28037b139c5589575904 100644 (file)
--- 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 b884d6ba5985badff0341b754fc7ffad284fe9f8..6a6db48c662f4fd6cccd74b1db2ba0e99eab7277 100644 (file)
--- 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 b903747fc6be73cc16b21abe809abe429242bbd1..3f97ac16fbf6a5aac0364fc41d96754a0c93addc 100644 (file)
--- 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 7746aeffc45a13fde63e9b9bf6cd20e19cdef963..bd50524785203edb25f5139f5893b97ca0e6cbfd 100644 (file)
--- 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 b4e9c9fe3e9156ed427aa627a9e777ab09958532..8d3fb73a55b29a49d198f1fa36bafbcbcc7ff419 100644 (file)
--- 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 ef703d79949342803aa72012f19a185e5e32d9db..a6c5e2edf4132b7c51c8d3a51bc5dc19ee54e33a 100644 (file)
--- 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',