Commit Graph

19 Commits

Author SHA1 Message Date
Christian Persch
78c34bb34f Fix gsettings enum rule to work with non-srcdir builds
Bug #635007.
2010-12-12 13:26:02 +01:00
Dan Winship
393834ac6f gsettings.m4: Fix rules to work when there are no schemas
If there are no schemas, don't try to install "" at install time.
(In particular, automake conditionals don't work properly with
@-expanded rules, so if you conditionally build a schema, you'll
still unconditionally get the install rule.)

https://bugzilla.gnome.org/show_bug.cgi?id=633381
2010-11-04 17:21:09 -04:00
Ryan Lortie
9126f1afae gsettings m4: Use --strict for checking
A while ago we allowed glib-compile-schemas to return a 'success' status
in the case that just one schema file contained errors.  Of course, this
is the exact opposite of what we want in the case that we are checking
schema validity at compile time.

Use the --strict flag for that case.

This closes #633115.
2010-10-26 12:02:12 -04:00
Ryan Lortie
136e705e83 Bug 627126 - gsettings schemas on FreeBSD
Rewrite the install rule for GSettings schemas to not depend on an
obscure chunk of non-portable sed that nobody understands the purpose
of.

Instead, use make's VPATH feature to resolve the paths of the files that
need to be installed.  No need to depend on the .valid targets here
since automake already ensures that 'make all' is complete before 'make
install' is permitted to run.
2010-10-04 01:51:11 -04:00
Ryan Lortie
e73b631f6e gsettings.m4: add support for enums 2010-06-30 13:12:57 -04:00
Ryan Lortie
8a7d990698 Bug 622565 - compile-schemas fails when no schemas
Neutralise and deprecate the --uninstall option in the schema compiler
and remove it from gsettings.m4.

Make the new default behaviour a compromise between the old default
behaviour and the previous --uninstall option:

  - never return a failure code if no schema files are found

  - issue a warning instead

  - remove the gschemas.compiled file if it exists
2010-06-28 14:06:32 -04:00
Ryan Lortie
6217c9b41e Conditional gsettings.m4 support, AC_PATH_PROG
Add new support for conditional enabling of GSettings (as per
bug #616718) and use AC_PATH_PROG instead of AC_PATH_TOOL (as per
bug #621172).
2010-06-18 23:02:32 -04:00
Hib Eris
a500de8202 Let GLIB_SETTINGS macro use glib-compile-schemas from PATH when cross compiling
See bug #621172
2010-06-15 00:39:46 -04:00
Ryan Lortie
b3593693d9 gsettings m4: check for .xml in src/builddir
This checks for the .gschema.xml file in the srcdir and builddir and
runs the schema validation on which one it finds.  This handles
non-srcdir builds in both cases: .gschema.xml is in the tarball and
.gschema.xml is generated.
2010-05-27 11:58:54 -04:00
Ryan Lortie
d818bebf49 add .SECONDARY: rule to preserve generated schemas
If the .gschema.xml file was generated as the result of an implicit make
rule then make would 'rm' it after creating the validity stamp.  This
would cause 'make install' to fail.
2010-05-21 20:10:02 -04:00
Ryan Lortie
caae8ac57a Add --uninstall option to glib-compile-schemas
If --uninstall is given then don't give an error if the schema directory
is empty.  Instead, erase the gschemas.compiled file, if it exists.
This is the right thing to do in the 'make uninstall' rule, where the
schema directory could very well be left empty as a result.

Modify gsettings.m4 to use this option.
2010-05-19 16:02:05 -04:00
Ryan Lortie
b59a5551ec Bug 619038 - increase gsettings.m4 power
handle schema checking, installation, uninstallation, cleaning
2010-05-19 08:55:57 -04:00
Christian Persch
63d74caabe Use the new option name
It's --schema-file now, not --schema-files.
Bug #616864.
2010-05-15 12:00:38 +02:00
Matthias Clasen
2ed13de153 Fix issues with GSETTINGS_CHECK_RULE
Rename the --schema-files option to --schema-file, since it only
accepts one file at a time. Change the GSETTINGS_CHECK_RULE to
use it that way, too. And also make it work better with !srcdir
builds.

Bugs #616731 and #616864
2010-05-14 21:58:08 -04:00
Matthias Clasen
08b5f86697 Make GSETTINGS_CHECK_RULE work in !srcdir builds
This problem was reported in bug 617823.
2010-05-08 21:18:48 -04:00
Matthias Clasen
ec664445a9 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.
2010-04-23 17:27:26 -04:00
Javier Jardón
f68dc4d97d [gsettings] Change AM_GSETTINGS macro to GLIB_GSETTINGS
So we don't use Automake's macro namespace

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=616648
2010-04-23 17:36:35 +02:00
Matthias Clasen
3bfd739154 Rename gsettingsschemaupdatecache to the more sane gschema_compile
To follow existing glib pc variables for binaries.
2010-04-21 11:55:00 -04:00
Bastien Nocera
0d322e77a5 Add GSettings m4 macros helper
https://bugzilla.gnome.org/show_bug.cgi?id=616312
2010-04-21 16:19:09 +01:00