Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add depfiles back to resource generation

Browse Source 
The recent change to faster resource generation
lost the depfiles to ensure that we regenerate
resources when any of the contents change.
Bring it back.
This commit is contained in:
Matthias Clasen
2021-10-03 21:01:04 -04:00
parent f2dbf57104
commit 8079f8ea3c
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
demos/gtk-demo/meson.build
View File

@@ -171,8 +171,11 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
gtkdemo_gresource = custom_target('gtkdemo.gresource',
input : 'demo.gresource.xml',
output : 'gtkdemo.gresource',
depfile : 'gtkdemo.gresource.d',
command : [glib_compile_resources,
'--generate',
'--target=@OUTPUT@',
'--dependency-file=@DEPFILE@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
'@INPUT@'])
@@ -181,11 +184,13 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
gtkdemo_resources_c = custom_target('gtkdemo_resources.c',
input : 'demo.gresource.xml',
output : 'gtkdemo_resources.c',
depfile : 'gtkdemo_resources.c.d',
command : [glib_compile_resources,
'--generate-source',
'--target=@OUTPUT@',
'--dependency-file=@DEPFILE@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
'--generate-source',
'--external-data',
'--c-name', '_g_binary_gtkdemo',
'@INPUT@'])

7
demos/widget-factory/meson.build
View File

@@ -15,8 +15,11 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
widgetfactory_gresource = custom_target('widgetfactory.gresource',
input : 'widget-factory.gresource.xml',
output : 'widgetfactory.gresource',
depfile: 'widgetfactory.gresource.d',
command : [glib_compile_resources,
'--generate',
'--target=@OUTPUT@',
'--dependency-file=@DEPFILE@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
'@INPUT@'])
@@ -25,11 +28,13 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
widgetfactory_resources_c = custom_target('widgetfactory_resources.c',
input : 'widget-factory.gresource.xml',
output : 'widgetfactory_resources.c',
depfile: 'widgetfactory_resources.c.d',
command : [glib_compile_resources,
'--generate-source',
'--target=@OUTPUT@',
'--dependency-file=@DEPFILE@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
'--generate-source',
'--external-data',
'--c-name', '_g_binary_widgetfactory',
'@INPUT@'])

11
gtk/meson.build
View File

@@ -880,8 +880,11 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
input : gtk_gresources_xml,
depends : theme_deps,
output : 'gtk.gresource',
depfile : 'gtk.gresource.d',
command : [glib_compile_resources,
'--generate',
'--target=@OUTPUT@',
'--dependency-file=@DEPFILE@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
'@INPUT@'])
@@ -891,11 +894,13 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
input : gtk_gresources_xml,
depends : theme_deps,
output : 'gtkresources.c',
depfile : 'gtkresources.c.d',
command : [glib_compile_resources,
'--generate-source',
'--target=@OUTPUT@',
'--dependency-file=@DEPFILE@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
'--generate-source',
'--external-data',
'--c-name', '_gtk',
'--manual-register',
@@ -905,11 +910,13 @@ if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_ad
input : gtk_gresources_xml,
depends : theme_deps,
output : 'gtkresources.h',
depfile : 'gtkresources.h.d',
command : [glib_compile_resources,
'--generate-header',
'--target=@OUTPUT@',
'--dependency-file=@DEPFILE@',
'--sourcedir=' + meson.current_source_dir(),
'--sourcedir=' + meson.current_build_dir(),
'--generate-header',
'--external-data',
'--c-name', '_gtk',
'--manual-register',