Rename gschema-compile to glib-compile-schemas

And clean up the autofoo a bit: use an uppercase variable,
check for pkg-config, check for presence of glib-compile-schemas.
This commit is contained in:
Matthias Clasen
2010-04-23 17:27:26 -04:00
parent e6e7015bbd
commit ec664445a9
10 changed files with 29 additions and 23 deletions

View File

@@ -116,7 +116,7 @@ content_files = \
overview.xml \
migrating.xml \
gio-querymodules.xml \
gschema-compile.xml \
glib-compile-schemas.xml\
gsettings.xml \
gsettings-schema-convert.xml
@@ -135,7 +135,7 @@ EXTRA_DIST += \
man_MANS = \
gio-querymodules.1 \
gschema-compile.1 \
glib-compile-schemas.1 \
gsettings.1 \
gsettings-schema-convert.1

View File

@@ -143,7 +143,7 @@
<title>GIO Tools</title>
<xi:include href="gio-querymodules.xml"/>
<xi:include href="gsettings.xml"/>
<xi:include href="gschema-compile.xml"/>
<xi:include href="glib-compile-schemas.xml"/>
<xi:include href="gsettings-schema-convert.xml"/>
</chapter>
</part>

View File

@@ -1,26 +1,26 @@
<refentry id="gschema-compile" lang="en">
<refentry id="glib-compile-schemas" lang="en">
<refmeta>
<refentrytitle>gschema-compile</refentrytitle>
<refentrytitle>glib-compile-schemas</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="manual">User Commands</refmiscinfo>
</refmeta>
<refnamediv>
<refname>gschema-compile</refname>
<refname>glib-compile-schemas</refname>
<refpurpose>GSettings schema compiler</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
<command>gschema-compile</command>
<command>glib-compile-schemas</command>
<arg choice="opt" rep="repeat">option</arg>
<arg choice="req">directory</arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1><title>Description</title>
<para><command>gschema-compile</command> compiles all the GSettings XML
<para><command>glib-compile-schemas</command> compiles all the GSettings XML
schema files in <replaceable>directory</replaceable> into a binary file
with the name <filename>gschemas.compiled</filename> that can be used
by <link linkend="GSettings"><type>GSettings</type></link>. The XML schema

View File

@@ -27,7 +27,7 @@ the result of the conversion.
</para>
<para>
Note that GSettings schemas need to be converted into binary form
with <link linkend="gschema-compile">gschema-compile</link> before they
with <link linkend="glib-compile-schemas">glib-compile-schemas</link> before they
can be used by applications.
</para>

View File

@@ -387,7 +387,7 @@ produces a <filename>org.gnome.font-rendering.gschema.xml</filename> file with t
</para>
<para>
Schemas are compiled into binary form by the
<link linkend="gschema-compile">gschema-compile</link> utility.
<link linkend="glib-compile-schemas">glib-compile-schemas</link> utility.
GIO provides a <literal>gschema_compile</literal>
variable for the schema compiler, which can be used in
<filename>configure.in</filename> as follows:
@@ -404,7 +404,7 @@ gsettingsschema_DATA = my.app.gschema.xml
@GSETTINGS_CHECK_RULE@
if GSETTINGS_SCHEMAS_INSTALL
install-data-hook:
$(gschema_compile) $(DESTDIR)$(gsettingsschemadir)
$(GLIB_COMPILE_SCHEMAS) $(DESTDIR)$(gsettingsschemadir)
endif
</programlisting>
</para>
@@ -504,7 +504,7 @@ endif
were in GConf, so that existing settings in the users GConf
database are preserved. You can achieve this by using the
<option>--allow-any-name</option> with the
<link linkend="gschema-compile">gschema-compile</link> schema
<link linkend="glib-compile-schemas">glib-compile-schemas</link> schema
compiler. Note that this option is only meant
to ease the process of porting your application, allowing parts
of your application to continue to access GConf and parts to use