luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/JCWasmx86/gresource-schema' into 'main'

Browse Source 
gio: Add gresource.dtd

See merge request GNOME/glib!3540
This commit is contained in:
Philip Withnall 2023-08-17 14:03:39 +00:00
commit 943972facf
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/gresource.dtd Normal file
View File

@ -0,0 +1,14 @@
<!--
SPDX-License-Identifier: LGPL-2.1-or-later
SPDX-FileCopyrightText: 2023 JCWasmx86
-->
<!ELEMENT gresources (gresource)* >
<!ELEMENT gresource (file)* >
<!ATTLIST gresource prefix CDATA #IMPLIED >
<!ELEMENT file (#PCDATA) >
<!ATTLIST file alias CDATA #IMPLIED
compressed (true|false) #IMPLIED
preprocess (xml-stripblanks|to-pixdata|json-stripblanks) #IMPLIED >

7
gio/meson.build
View File

@ -863,6 +863,7 @@ else
endif endif
schemas_subdir = join_paths('glib-2.0', 'schemas') schemas_subdir = join_paths('glib-2.0', 'schemas')
dtds_subdir = join_paths('glib-2.0', 'dtds')
libgio_dep = declare_dependency(link_with : libgio, libgio_dep = declare_dependency(link_with : libgio,
dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep], dependencies : [libgmodule_dep, libgobject_dep, gioenumtypes_dep],
@ -870,6 +871,7 @@ libgio_dep = declare_dependency(link_with : libgio,
variables : [ variables : [
'schemasdir=' + join_paths(glib_datadir, schemas_subdir), 'schemasdir=' + join_paths(glib_datadir, schemas_subdir),
'giomoduledir=' + glib_giomodulesdir, 'giomoduledir=' + glib_giomodulesdir,
'dtdsdir=' + join_paths(glib_datadir, dtds_subdir)
], ],
) )
@ -878,6 +880,7 @@ pkg.generate(libgio,
variables : [ variables : [
'datadir=' + '${prefix}' / get_option('datadir'), 'datadir=' + '${prefix}' / get_option('datadir'),
'schemasdir=' + '${datadir}' / schemas_subdir, 'schemasdir=' + '${datadir}' / schemas_subdir,
'dtdsdir=' + '${datadir}' / dtds_subdir,
'bindir=' + '${prefix}' / get_option('bindir'), 'bindir=' + '${prefix}' / get_option('bindir'),
'giomoduledir=' + pkgconfig_giomodulesdir, 'giomoduledir=' + pkgconfig_giomodulesdir,
'gio=' + '${bindir}' / 'gio', 'gio=' + '${bindir}' / 'gio',
@ -1020,6 +1023,10 @@ glib_compile_resources = executable('glib-compile-resources',
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH
link_args : noseh_link_args, link_args : noseh_link_args,
dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep]) dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep, gvdb_dep])
install_data('gresource.dtd',
install_dir: get_option('datadir') / dtds_subdir,
install_tag: 'devel',
)
# Cannot override those programs in cross compilation case because they are # Cannot override those programs in cross compilation case because they are
# native executables that cannot be run on the build machine. # native executables that cannot be run on the build machine.