From: Matthias Clasen Date: Tue, 26 Feb 2002 21:23:52 +0000 (+0000) Subject: Remove references to gruntime. This includes renaming the test program X-Git-Tag: GLIB_2_0_0_RC1~27 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9c695f47cb0e533b0964ffa3d913a8a0591d02e;p=platform%2Fupstream%2Fglib.git Remove references to gruntime. This includes renaming the test program * docs/debugging.txt, gobject/glib-genmarshal.c, gobject/glib-genmarshal.1, gobject/Makefile.am, gobject/gtype.c: Remove references to gruntime. This includes renaming the test program testgruntime to testgobject and the debug envvar GRUNTIME_DEBUG to GOBJECT_DEBUG. (#50877) --- diff --git a/ChangeLog b/ChangeLog index 1143d2f..72e0b4e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-02-26 Matthias Clasen + + * docs/debugging.txt, gobject/glib-genmarshal.c, + gobject/glib-genmarshal.1, gobject/Makefile.am, gobject/gtype.c: + Remove references to gruntime. This includes renaming the test + program testgruntime to testgobject and the debug envvar + GRUNTIME_DEBUG to GOBJECT_DEBUG. (#50877) + Tue Feb 26 14:56:31 2002 Owen Taylor * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 1143d2f..72e0b4e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2002-02-26 Matthias Clasen + + * docs/debugging.txt, gobject/glib-genmarshal.c, + gobject/glib-genmarshal.1, gobject/Makefile.am, gobject/gtype.c: + Remove references to gruntime. This includes renaming the test + program testgruntime to testgobject and the debug envvar + GRUNTIME_DEBUG to GOBJECT_DEBUG. (#50877) + Tue Feb 26 14:56:31 2002 Owen Taylor * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1143d2f..72e0b4e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2002-02-26 Matthias Clasen + + * docs/debugging.txt, gobject/glib-genmarshal.c, + gobject/glib-genmarshal.1, gobject/Makefile.am, gobject/gtype.c: + Remove references to gruntime. This includes renaming the test + program testgruntime to testgobject and the debug envvar + GRUNTIME_DEBUG to GOBJECT_DEBUG. (#50877) + Tue Feb 26 14:56:31 2002 Owen Taylor * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 1143d2f..72e0b4e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2002-02-26 Matthias Clasen + + * docs/debugging.txt, gobject/glib-genmarshal.c, + gobject/glib-genmarshal.1, gobject/Makefile.am, gobject/gtype.c: + Remove references to gruntime. This includes renaming the test + program testgruntime to testgobject and the debug envvar + GRUNTIME_DEBUG to GOBJECT_DEBUG. (#50877) + Tue Feb 26 14:56:31 2002 Owen Taylor * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1143d2f..72e0b4e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2002-02-26 Matthias Clasen + + * docs/debugging.txt, gobject/glib-genmarshal.c, + gobject/glib-genmarshal.1, gobject/Makefile.am, gobject/gtype.c: + Remove references to gruntime. This includes renaming the test + program testgruntime to testgobject and the debug envvar + GRUNTIME_DEBUG to GOBJECT_DEBUG. (#50877) + Tue Feb 26 14:56:31 2002 Owen Taylor * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1143d2f..72e0b4e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2002-02-26 Matthias Clasen + + * docs/debugging.txt, gobject/glib-genmarshal.c, + gobject/glib-genmarshal.1, gobject/Makefile.am, gobject/gtype.c: + Remove references to gruntime. This includes renaming the test + program testgruntime to testgobject and the debug envvar + GRUNTIME_DEBUG to GOBJECT_DEBUG. (#50877) + Tue Feb 26 14:56:31 2002 Owen Taylor * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1143d2f..72e0b4e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2002-02-26 Matthias Clasen + + * docs/debugging.txt, gobject/glib-genmarshal.c, + gobject/glib-genmarshal.1, gobject/Makefile.am, gobject/gtype.c: + Remove references to gruntime. This includes renaming the test + program testgruntime to testgobject and the debug envvar + GRUNTIME_DEBUG to GOBJECT_DEBUG. (#50877) + Tue Feb 26 14:56:31 2002 Owen Taylor * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1143d2f..72e0b4e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2002-02-26 Matthias Clasen + + * docs/debugging.txt, gobject/glib-genmarshal.c, + gobject/glib-genmarshal.1, gobject/Makefile.am, gobject/gtype.c: + Remove references to gruntime. This includes renaming the test + program testgruntime to testgobject and the debug envvar + GRUNTIME_DEBUG to GOBJECT_DEBUG. (#50877) + Tue Feb 26 14:56:31 2002 Owen Taylor * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case diff --git a/docs/debugging.txt b/docs/debugging.txt index abef4dd..8ab2028 100644 --- a/docs/debugging.txt +++ b/docs/debugging.txt @@ -31,8 +31,8 @@ static volatile gpointer *g_trace_instance_signals; Environment variables for debugging =================================== -When G_ENABLE_DEBUG was defined upon compilation, GRuntime supports -an environment variable GRUNTIME_DEBUG that can be set to a +When G_ENABLE_DEBUG was defined upon compilation, the GObject library +supports an environment variable GOBJECT_DEBUG that can be set to a combination of the flags passed in to g_type_init() (currently "objects" and "signals") to trigger debugging messages about object bookkeeping and signal emissions during runtime. diff --git a/gobject/Makefile.am b/gobject/Makefile.am index 1919c47..ca5fa10 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -1,4 +1,4 @@ -# GRuntime - GLib Type, Object, Parameter and Signal Library +# GObject - GLib Type, Object, Parameter and Signal Library # Copyright (C) 1997,98,99,2000 Tim Janik and Red Hat, Inc. # ## Process this file with automake to produce Makefile.in @@ -61,8 +61,8 @@ libgobject_1_3_la_DEPENDENCIES = @G_OBJECT_WIN32_RESOURCE@ @GOBJECT_DEF@ # # setup source file variables # -# GRuntime header files for public installation (non-generated) -gruntime_public_h_sources = @STRIP_BEGIN@ \ +# GObject library header files for public installation (non-generated) +gobject_public_h_sources = @STRIP_BEGIN@ \ gboxed.h \ gclosure.h \ genums.h \ @@ -80,11 +80,11 @@ gruntime_public_h_sources = @STRIP_BEGIN@ \ gvaluetypes.h \ gobjectnotifyqueue.c \ @STRIP_END@ -# GRuntime header files that don't get installed -gruntime_private_h_sources = @STRIP_BEGIN@ \ +# GObject library header files that don't get installed +gobject_private_h_sources = @STRIP_BEGIN@ \ @STRIP_END@ -# GRuntime C sources to build the library from -gruntime_c_sources = @STRIP_BEGIN@ \ +# GObject library C sources to build the library from +gobject_c_sources = @STRIP_BEGIN@ \ gboxed.c \ gclosure.c \ genums.c \ @@ -109,33 +109,33 @@ gruntime_c_sources = @STRIP_BEGIN@ \ # content # built sources that get installed with the header files -gruntime_built_public_sources = @STRIP_BEGIN@ \ +gobject_built_public_sources = @STRIP_BEGIN@ \ gmarshal.h \ @STRIP_END@ # built sources that don't get installed -gruntime_built_sources = @STRIP_BEGIN@ \ +gobject_built_sources = @STRIP_BEGIN@ \ stamp-gmarshal.h \ gmarshal.c \ - ${gruntime_built_public_sources} \ + ${gobject_built_public_sources} \ @STRIP_END@ # non-header sources (headers should be specified in the above variables) # that don't serve as direct make target sources, i.e. they don't have # their own .lo rules and don't get publically installed -gruntime_extra_sources = @STRIP_BEGIN@ \ +gobject_extra_sources = @STRIP_BEGIN@ \ gmarshal.list \ gmarshal.strings \ @STRIP_END@ # -# setup GRuntime sources and their dependancies +# setup GObject library sources and their dependancies # -gruntime_target_headers = $(gruntime_public_h_sources) $(gruntime_built_public_sources) -gruntime_target_sources = $(gruntime_c_sources) -MAINTAINERCLEANFILES += $(gruntime_built_sources) +gobject_target_headers = $(gobject_public_h_sources) $(gobject_built_public_sources) +gobject_target_sources = $(gobject_c_sources) +MAINTAINERCLEANFILES += $(gobject_built_sources) EXTRA_HEADERS += -EXTRA_DIST += $(gruntime_private_h_sources) $(gruntime_extra_sources) -EXTRA_DIST += $(gruntime_built_sources) +EXTRA_DIST += $(gobject_private_h_sources) $(gobject_extra_sources) +EXTRA_DIST += $(gobject_built_sources) # # rules to generate built sources @@ -144,7 +144,7 @@ EXTRA_DIST += $(gruntime_built_sources) gen_sources = xgen-gmh xgen-gmc xgen-gms CLEANFILES += $(gen_sources) -$(libgobject_1_3_la_OBJECTS): $(gruntime_built_sources) ${gruntime_built_public_sources} # this is our oldest file, used for implicit auto-generation deps +$(libgobject_1_3_la_OBJECTS): $(gobject_built_sources) ${gobject_built_public_sources} # this is our oldest file, used for implicit auto-generation deps # initial creation of the real stamp-* files gmarshal.h: # never add deps here test -f "$(srcdir)/$@" || touch $(srcdir)/$@ @@ -175,8 +175,8 @@ glib-genmarshal.o: gmarshal.strings # target platform: -libgobjectinclude_HEADERS = $(gruntime_target_headers) -libgobject_1_3_la_SOURCES = $(gruntime_target_sources) +libgobjectinclude_HEADERS = $(gobject_target_headers) +libgobject_1_3_la_SOURCES = $(gobject_target_sources) # # programs to compile and install diff --git a/gobject/glib-genmarshal.1 b/gobject/glib-genmarshal.1 index 7fcca91..aa0b97a 100644 --- a/gobject/glib-genmarshal.1 +++ b/gobject/glib-genmarshal.1 @@ -36,7 +36,7 @@ Specify marshaller prefix. The default prefix is `\fIg_cclosure_marshal\fP'. Skip source location remarks in generated comments. .TP \fI--nostdinc -Do not use the standard GRuntime marshallers, and skip gmarshal.h include +Do not use the standard marshallers of the GObject library, and skip gmarshal.h include directive in generated header files. .TP \fI--g-fatal-warnings diff --git a/gobject/glib-genmarshal.c b/gobject/glib-genmarshal.c index c8008dc..73112a9 100644 --- a/gobject/glib-genmarshal.c +++ b/gobject/glib-genmarshal.c @@ -595,7 +595,7 @@ int main (int argc, char *argv[]) { - const gchar *gruntime_marshallers[] = { + const gchar *gobject_marshallers[] = { #include "gmarshal.strings" }; GScanner *scanner; @@ -619,11 +619,11 @@ main (int argc, fout = stdout; marshallers = g_hash_table_new (g_str_hash, g_str_equal); - /* add GRuntime standard marshallers */ + /* add standard marshallers of the GObject library */ if (std_includes) - for (i = 0; i < sizeof (gruntime_marshallers) / sizeof (gruntime_marshallers[0]); i++) + for (i = 0; i < sizeof (gobject_marshallers) / sizeof (gobject_marshallers[0]); i++) { - gchar *tmp = g_strdup (gruntime_marshallers[i]); + gchar *tmp = g_strdup (gobject_marshallers[i]); g_hash_table_insert (marshallers, tmp, tmp); } @@ -861,7 +861,7 @@ print_blurb (FILE *bout, fprintf (bout, " --body generate C code\n"); fprintf (bout, " --prefix=string specify marshaller prefix\n"); fprintf (bout, " --skip-source skip source location comments\n"); - fprintf (bout, " --stdinc, --nostdinc include/use GRuntime standard marshallers\n"); + fprintf (bout, " --stdinc, --nostdinc include/use standard marshallers\n"); fprintf (bout, " -h, --help show this help message\n"); fprintf (bout, " -v, --version print version informations\n"); fprintf (bout, " --g-fatal-warnings make warnings fatal (abort)\n"); diff --git a/gobject/gtype.c b/gobject/gtype.c index 103fd4a..49d7fda 100644 --- a/gobject/gtype.c +++ b/gobject/gtype.c @@ -2854,9 +2854,9 @@ g_type_init_with_debug_flags (GTypeDebugFlags debug_flags) return; } - /* setup GRuntime wide debugging flags */ + /* setup GObject library wide debugging flags */ _g_type_debug_flags = debug_flags & G_TYPE_DEBUG_MASK; - env_string = g_getenv ("GRUNTIME_DEBUG"); + env_string = g_getenv ("GOBJECT_DEBUG"); if (env_string != NULL) { static GDebugKey debug_keys[] = {