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

Rename gsettingsschemaupdatecache to the more sane gschema_compile

Browse Source 
To follow existing glib pc variables for binaries.
This commit is contained in:
Matthias Clasen 2010-04-21 11:50:21 -04:00
parent 662f97fefb
commit 3bfd739154
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/reference/gio/migrating.xml
View File

@ -388,7 +388,7 @@ produces a <filename>org.gnome.font-rendering.gschema.xml</filename> file with t
<para> <para>
Schemas are compiled into binary form by the Schemas are compiled into binary form by the
<link linkend="gschema-compile">gschema-compile</link> utility. <link linkend="gschema-compile">gschema-compile</link> utility.
GIO provides a <literal>gsettingsupdateschemacache</literal> GIO provides a <literal>gschema_compile</literal>
variable for the schema compiler, which can be used in variable for the schema compiler, which can be used in
<filename>configure.in</filename> as follows: <filename>configure.in</filename> as follows:
<programlisting> <programlisting>
@ -397,13 +397,14 @@ AM_GSETTINGS
The corresponding <filename>Makefile.am</filename> fragment looks like The corresponding <filename>Makefile.am</filename> fragment looks like
this: this:
<programlisting> <programlisting>
# gsettingsschemadir is defined by the AM_GSETTINGS macro in configure.ac # gsettingsschemadir and gschema_compile are defined by the AM_GSETTINGS
# macro in configure.ac
gsettingsschema_DATA = my.app.gschema.xml gsettingsschema_DATA = my.app.gschema.xml
# This rule will check your schemas for validity before installation # This rule will check your schemas for validity before installation
@GSETTINGS_CHECK_RULE@ @GSETTINGS_CHECK_RULE@
if GSETTINGS_SCHEMAS_INSTALL if GSETTINGS_SCHEMAS_INSTALL
install-data-hook: install-data-hook:
$(gsettingsupdateschemacache) $(DESTDIR)$(gsettingsschemadir) $(gschema_compile) $(DESTDIR)$(gsettingsschemadir)
endif endif
</programlisting> </programlisting>
</para> </para>

2
gio-2.0.pc.in
View File

@ -4,7 +4,7 @@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
giomoduledir=@GIO_MODULE_DIR@ giomoduledir=@GIO_MODULE_DIR@
gsettingsupdateschemacache=@bindir@/gschema-compile gschema_compile=@bindir@/gschema-compile
Name: GIO Name: GIO
Description: glib I/O library Description: glib I/O library

4
m4macros/gsettings.m4
View File

@ -15,7 +15,7 @@ AC_DEFUN([AM_GSETTINGS],
AM_CONDITIONAL([GSETTINGS_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) AM_CONDITIONAL([GSETTINGS_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
AC_SUBST(gsettingsupdateschemacache, `pkg-config --variable gsettingsupdateschemacache gio-2.0`) AC_SUBST(gschema_compile, `pkg-config --variable gschema_compile gio-2.0`)
GSETTINGS_CHECK_RULE=' GSETTINGS_CHECK_RULE='
.PHONY : check-gsettings-schema .PHONY : check-gsettings-schema
@ -24,7 +24,7 @@ gschema_xml_files := $(wildcard *.gschema.xml)
check-gsettings-schema: gsettings_schema_validate_stamp check-gsettings-schema: gsettings_schema_validate_stamp
CLEANFILES += gsettings_schema_validate_stamp CLEANFILES += gsettings_schema_validate_stamp
gsettings_schema_validate_stamp: $(gschema_xml_files) gsettings_schema_validate_stamp: $(gschema_xml_files)
$(gsettingsupdateschemacache) --dry-run --schema-files $? $(gschema_compile) --dry-run --schema-files $?
touch [$]@ touch [$]@
all: check-gsettings-schema all: check-gsettings-schema