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

Fix issues with GSETTINGS_CHECK_RULE

Browse Source 
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
This commit is contained in:
Matthias Clasen 2010-05-14 21:58:08 -04:00
parent 763c1dab1f
commit 2ed13de153
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gschema-compile.c
View File

@ -647,7 +647,7 @@ main (int argc, char **argv)
{ "allow-any-name", 0, 0, G_OPTION_ARG_NONE, &allow_any_name, N_("Do not enforce key name restrictions") }, { "allow-any-name", 0, 0, G_OPTION_ARG_NONE, &allow_any_name, N_("Do not enforce key name restrictions") },
/* These options are only for use in the gschema-compile tests */ /* These options are only for use in the gschema-compile tests */
{ "schema-files", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME_ARRAY, &schema_files, NULL, NULL }, { "schema-file", 0, G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_FILENAME_ARRAY, &schema_files, NULL, NULL },
{ NULL } { NULL }
}; };

2
gio/tests/gschema-compile.c
View File

@ -23,7 +23,7 @@ test_schema (gpointer data)
gchar *argv[] = { gchar *argv[] = {
"../glib-compile-schemas", "../glib-compile-schemas",
"--dry-run", "--dry-run",
"--schema-files", path, "--schema-file", path,
(gchar *)test->opt, (gchar *)test->opt,
NULL NULL
}; };

5
m4macros/gsettings.m4
View File

@ -25,11 +25,10 @@ AC_DEFUN([GLIB_GSETTINGS],
GSETTINGS_CHECK_RULE=' GSETTINGS_CHECK_RULE='
.PHONY : check-gsettings-schema .PHONY : check-gsettings-schema
gschema_xml_files := $(wildcard $(srcdir)/*.gschema.xml)
check-gsettings-schema: gsettings_schema_validate_stamp check-gsettings-schema: gsettings_schema_validate_stamp
MOSTLYCLEANFILES += gsettings_schema_validate_stamp MOSTLYCLEANFILES += gsettings_schema_validate_stamp
gsettings_schema_validate_stamp: $(gschema_xml_files) gsettings_schema_validate_stamp: *.gschema.xml
$(GLIB_COMPILE_SCHEMAS) --dry-run --schema-files $? $(GLIB_COMPILE_SCHEMAS) --dry-run $(addprefix --schema-files=,$?)
touch [$]@ touch [$]@
all: check-gsettings-schema all: check-gsettings-schema