X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gio%2Fglib-compile-resources.c;h=6bad64fc49d2a7eb23461a6d5e06f4a5663cbfa1;hb=2e5bd8cf47f9e1559ccc44823a2f321b8ff8c1ea;hp=7548a0f1c7488e693010a0b42425eb663a14894d;hpb=3b8ba958f5a0d1e129219cab10ced9c0fa03c1cc;p=platform%2Fupstream%2Fglib.git diff --git a/gio/glib-compile-resources.c b/gio/glib-compile-resources.c index 7548a0f..6bad64f 100644 --- a/gio/glib-compile-resources.c +++ b/gio/glib-compile-resources.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library; if not, see . * * Author: Alexander Larsson */ @@ -30,23 +28,26 @@ #include #include #include -#ifdef HAVE_SYS_WAIT_H -#include +#ifdef G_OS_UNIX +#include +#endif +#ifdef G_OS_WIN32 +#include #endif #include #include #include -#ifdef HAVE_UNISTD_H -#include -#endif - #include #include "gvdb/gvdb-builder.h" #include "gconstructor_as_data.h" +#ifdef G_OS_WIN32 +#include "glib/glib-private.h" +#endif + typedef struct { char *filename; @@ -73,7 +74,7 @@ typedef struct GString *string; /* non-NULL when accepting text */ } ParseState; -static gchar *sourcedir = NULL; +static gchar **sourcedirs = NULL; static gchar *xmllint = NULL; static gchar *gdk_pixbuf_pixdata = NULL; @@ -174,6 +175,28 @@ get_parent (GHashTable *table, return parent; } +static gchar * +find_file (const gchar *filename) +{ + guint i; + gchar *real_file; + gboolean exists; + + if (g_path_is_absolute (filename)) + return g_strdup (filename); + + /* search all the sourcedirs for the correct files in order */ + for (i = 0; sourcedirs[i] != NULL; i++) + { + real_file = g_build_path ("/", sourcedirs[i], filename, NULL); + exists = g_file_test (real_file, G_FILE_TEST_EXISTS); + if (exists) + return real_file; + g_free (real_file); + } + return NULL; +} + static void end_element (GMarkupParseContext *context, const gchar *element_name, @@ -217,10 +240,28 @@ end_element (GMarkupParseContext *context, data = g_new0 (FileData, 1); - if (sourcedir != NULL) - real_file = g_build_filename (sourcedir, file, NULL); + if (sourcedirs != NULL) + { + real_file = find_file (file); + if (real_file == NULL) + { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, + _("Failed to locate '%s' in any source directory"), file); + return; + } + } else - real_file = g_strdup (file); + { + gboolean exists; + exists = g_file_test (file, G_FILE_TEST_EXISTS); + if (!exists) + { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, + _("Failed to locate '%s' in current directory"), file); + return; + } + real_file = g_strdup (file); + } data->filename = g_strdup (real_file); if (!state->collect_data) @@ -244,7 +285,7 @@ end_element (GMarkupParseContext *context, else { g_set_error (error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT, - _("Unknown proprocessing options \"%s\""), options[i]); + _("Unknown processing option \"%s\""), options[i]); g_strfreev (options); goto cleanup; } @@ -253,8 +294,8 @@ end_element (GMarkupParseContext *context, if (xml_stripblanks && xmllint != NULL) { - gchar *argv[8]; - int status, fd, argc; + int fd; + GSubprocess *proc; tmp_file = g_strdup ("resource-XXXXXXXX"); if ((fd = g_mkstemp (tmp_file)) == -1) @@ -270,41 +311,29 @@ end_element (GMarkupParseContext *context, } close (fd); - argc = 0; - argv[argc++] = (gchar *) xmllint; - argv[argc++] = "--nonet"; - argv[argc++] = "--noblanks"; - argv[argc++] = "--output"; - argv[argc++] = tmp_file; - argv[argc++] = real_file; - argv[argc++] = NULL; - g_assert (argc <= G_N_ELEMENTS (argv)); - - if (!g_spawn_sync (NULL /* cwd */, argv, NULL /* envv */, - G_SPAWN_STDOUT_TO_DEV_NULL | - G_SPAWN_STDERR_TO_DEV_NULL, - NULL, NULL, NULL, NULL, &status, &my_error)) - { - g_propagate_error (error, my_error); - goto cleanup; - } -#ifdef HAVE_SYS_WAIT_H - if (!WIFEXITED (status) || WEXITSTATUS (status) != 0) - { - g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, - _("Error processing input file with xmllint")); + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, error, + xmllint, "--nonet", "--noblanks", "--output", tmp_file, real_file, NULL); + g_free (real_file); + real_file = NULL; + + if (!proc) + goto cleanup; + + if (!g_subprocess_wait_check (proc, NULL, error)) + { + g_object_unref (proc); goto cleanup; } -#endif - g_free (real_file); + g_object_unref (proc); + real_file = g_strdup (tmp_file); } if (to_pixdata) { - gchar *argv[4]; - int status, fd, argc; + int fd; + GSubprocess *proc; if (gdk_pixbuf_pixdata == NULL) { @@ -328,31 +357,19 @@ end_element (GMarkupParseContext *context, } close (fd); - argc = 0; - argv[argc++] = (gchar *) gdk_pixbuf_pixdata; - argv[argc++] = real_file; - argv[argc++] = tmp_file2; - argv[argc++] = NULL; - g_assert (argc <= G_N_ELEMENTS (argv)); - - if (!g_spawn_sync (NULL /* cwd */, argv, NULL /* envv */, - G_SPAWN_STDOUT_TO_DEV_NULL | - G_SPAWN_STDERR_TO_DEV_NULL, - NULL, NULL, NULL, NULL, &status, &my_error)) - { - g_propagate_error (error, my_error); - goto cleanup; - } -#ifdef HAVE_SYS_WAIT_H - if (!WIFEXITED (status) || WEXITSTATUS (status) != 0) - { - g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED, - _("Error processing input file with to-pixdata")); + proc = g_subprocess_new (G_SUBPROCESS_FLAGS_STDOUT_SILENCE, error, + gdk_pixbuf_pixdata, real_file, tmp_file2, NULL); + g_free (real_file); + real_file = NULL; + + if (!g_subprocess_wait_check (proc, NULL, error)) + { + g_object_unref (proc); goto cleanup; - } -#endif + } + + g_object_unref (proc); - g_free (real_file); real_file = g_strdup (tmp_file2); } } @@ -562,24 +579,26 @@ main (int argc, char **argv) gboolean generate_source = FALSE; gboolean generate_header = FALSE; gboolean manual_register = FALSE; + gboolean internal = FALSE; gboolean generate_dependencies = FALSE; char *c_name = NULL; char *c_name_no_underscores; + const char *linkage = "extern"; GOptionContext *context; GOptionEntry entries[] = { { "target", 0, 0, G_OPTION_ARG_FILENAME, &target, N_("name of the output file"), N_("FILE") }, - { "sourcedir", 0, 0, G_OPTION_ARG_FILENAME, &sourcedir, N_("The directory 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 where files are to be read from (default to 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-dependencies", 0, 0, G_OPTION_ARG_NONE, &generate_dependencies, N_("Generate dependency list"), 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 }, { "c-name", 0, 0, G_OPTION_ARG_STRING, &c_name, N_("C identifier name used for the generated source code"), NULL }, { NULL } }; #ifdef G_OS_WIN32 - extern gchar *_glib_get_locale_dir (void); gchar *tmp; #endif @@ -598,8 +617,6 @@ main (int argc, char **argv) bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); #endif - g_type_init (); - context = g_option_context_new (N_("FILE")); g_option_context_set_translation_domain (context, GETTEXT_PACKAGE); g_option_context_set_summary (context, @@ -623,10 +640,10 @@ main (int argc, char **argv) return 1; } - srcfile = argv[1]; + if (internal) + linkage = "G_GNUC_INTERNAL"; - if (sourcedir == NULL) - sourcedir = ""; + srcfile = argv[1]; xmllint = g_strdup (g_getenv ("XMLLINT")); if (xmllint == NULL) @@ -767,16 +784,16 @@ main (int argc, char **argv) "\n" "#include \n" "\n" - "extern GResource *%s_get_resource (void);\n", - c_name, c_name, c_name); + "%s GResource *%s_get_resource (void);\n", + c_name, c_name, linkage, c_name); if (manual_register) fprintf (file, "\n" - "extern void %s_register_resource (void);\n" - "extern void %s_unregister_resource (void);\n" + "%s void %s_register_resource (void);\n" + "%s void %s_unregister_resource (void);\n" "\n", - c_name, c_name); + linkage, c_name, linkage, c_name); fprintf (file, "#endif\n"); @@ -831,31 +848,31 @@ main (int argc, char **argv) fprintf (file, "\n" - "static GStaticResource static_resource = { %s_resource_data.data, sizeof (%s_resource_data.data) };\n" - "extern GResource *%s_get_resource (void);\n" + "static GStaticResource static_resource = { %s_resource_data.data, sizeof (%s_resource_data.data), NULL, NULL, NULL };\n" + "%s GResource *%s_get_resource (void);\n" "GResource *%s_get_resource (void)\n" "{\n" " return g_static_resource_get_resource (&static_resource);\n" "}\n", - c_name, c_name, c_name, c_name); + c_name, c_name, linkage, c_name, c_name); if (manual_register) { fprintf (file, "\n" - "extern void %s_unregister_resource (void);\n" + "%s void %s_unregister_resource (void);\n" "void %s_unregister_resource (void)\n" "{\n" " g_static_resource_fini (&static_resource);\n" "}\n" "\n" - "extern void %s_register_resource (void);\n" + "%s void %s_register_resource (void);\n" "void %s_register_resource (void)\n" "{\n" " g_static_resource_init (&static_resource);\n" "}\n", - c_name, c_name, c_name, c_name); + linkage, c_name, c_name, linkage, c_name, c_name); } else {