From 037f286713c215425071f087d04ea7d85f872cf8 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 8 Jun 2018 11:42:52 +0100 Subject: [PATCH 1/2] glib-compile-resources: Clarify --help output for --sourcedir argument Make the --help output more consistent with the man page, making it more obvious that --sourcedir only applies to the files referenced in FILE, not to the location of FILE itself. Signed-off-by: Philip Withnall https://gitlab.gnome.org/GNOME/glib/issues/1406 --- gio/glib-compile-resources.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c index 708f99c11..136c8391c 100644 --- a/gio/glib-compile-resources.c +++ b/gio/glib-compile-resources.c @@ -735,7 +735,7 @@ main (int argc, char **argv) GOptionEntry entries[] = { { "version", 0, 0, G_OPTION_ARG_NONE, &show_version_and_exit, N_("Show program version and exit"), NULL }, { "target", 0, 0, G_OPTION_ARG_FILENAME, &target, N_("name of the output file"), N_("FILE") }, - { "sourcedir", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &sourcedirs, N_("The directories where files are to be read from (default to current directory)"), N_("DIRECTORY") }, + { "sourcedir", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &sourcedirs, N_("The directories to load files referenced in FILE from (default: current directory)"), N_("DIRECTORY") }, { "generate", 0, 0, G_OPTION_ARG_NONE, &generate_automatic, N_("Generate output in the format selected for by the target filename extension"), NULL }, { "generate-header", 0, 0, G_OPTION_ARG_NONE, &generate_header, N_("Generate source header"), NULL }, { "generate-source", 0, 0, G_OPTION_ARG_NONE, &generate_source, N_("Generate sourcecode used to link in the resource file into your code"), NULL }, From c251c719b6fab0e8489334fd64bfae469e1ecb35 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Fri, 8 Jun 2018 11:43:44 +0100 Subject: [PATCH 2/2] glib-compile-resources: Minor string improvements to --help output Fix some capitalisation problems, and one missing space. Signed-off-by: Philip Withnall --- gio/glib-compile-resources.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c index 136c8391c..bf88334b1 100644 --- a/gio/glib-compile-resources.c +++ b/gio/glib-compile-resources.c @@ -734,13 +734,13 @@ main (int argc, char **argv) GOptionContext *context; GOptionEntry entries[] = { { "version", 0, 0, G_OPTION_ARG_NONE, &show_version_and_exit, N_("Show program version and exit"), NULL }, - { "target", 0, 0, G_OPTION_ARG_FILENAME, &target, N_("name of the output file"), N_("FILE") }, + { "target", 0, 0, G_OPTION_ARG_FILENAME, &target, N_("Name of the output file"), N_("FILE") }, { "sourcedir", 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &sourcedirs, N_("The directories to load files referenced in FILE from (default: current directory)"), N_("DIRECTORY") }, { "generate", 0, 0, G_OPTION_ARG_NONE, &generate_automatic, N_("Generate output in the format selected for by the target filename extension"), NULL }, { "generate-header", 0, 0, G_OPTION_ARG_NONE, &generate_header, N_("Generate source header"), NULL }, - { "generate-source", 0, 0, G_OPTION_ARG_NONE, &generate_source, N_("Generate sourcecode used to link in the resource file into your code"), NULL }, + { "generate-source", 0, 0, G_OPTION_ARG_NONE, &generate_source, N_("Generate source code used to link in the resource file into your code"), NULL }, { "generate-dependencies", 0, 0, G_OPTION_ARG_NONE, &generate_dependencies, N_("Generate dependency list"), NULL }, - { "dependency-file", 0, 0, G_OPTION_ARG_FILENAME, &dependency_file, N_("name of the dependency file to generate"), N_("FILE") }, + { "dependency-file", 0, 0, G_OPTION_ARG_FILENAME, &dependency_file, N_("Name of the dependency file to generate"), N_("FILE") }, { "generate-phony-targets", 0, 0, G_OPTION_ARG_NONE, &generate_phony_targets, N_("Include phony targets in the generated dependency file"), NULL }, { "manual-register", 0, 0, G_OPTION_ARG_NONE, &manual_register, N_("Don’t automatically create and register resource"), NULL }, { "internal", 0, 0, G_OPTION_ARG_NONE, &internal, N_("Don’t export functions; declare them G_GNUC_INTERNAL"), NULL },