luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 03:16:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove references to gruntime. This includes renaming the test program

Browse Source 
* 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)
This commit is contained in:
Matthias Clasen 2002-02-26 21:23:52 +00:00
parent 9d31301606
commit b9c695f47c
13 changed files with 94 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2002-02-26 Matthias Clasen <maclas@gmx.de>
* 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 <otaylor@redhat.com> Tue Feb 26 14:56:31 2002 Owen Taylor <otaylor@redhat.com>
* glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case

8
ChangeLog.pre-2-0
View File

@ -1,3 +1,11 @@
2002-02-26 Matthias Clasen <maclas@gmx.de>
* 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 <otaylor@redhat.com> Tue Feb 26 14:56:31 2002 Owen Taylor <otaylor@redhat.com>
* glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
2002-02-26 Matthias Clasen <maclas@gmx.de>
* 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 <otaylor@redhat.com> Tue Feb 26 14:56:31 2002 Owen Taylor <otaylor@redhat.com>
* glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case

8
ChangeLog.pre-2-12
View File

@ -1,3 +1,11 @@
2002-02-26 Matthias Clasen <maclas@gmx.de>
* 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 <otaylor@redhat.com> Tue Feb 26 14:56:31 2002 Owen Taylor <otaylor@redhat.com>
* glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case

8
ChangeLog.pre-2-2
View File

@ -1,3 +1,11 @@
2002-02-26 Matthias Clasen <maclas@gmx.de>
* 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 <otaylor@redhat.com> Tue Feb 26 14:56:31 2002 Owen Taylor <otaylor@redhat.com>
* glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
2002-02-26 Matthias Clasen <maclas@gmx.de>
* 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 <otaylor@redhat.com> Tue Feb 26 14:56:31 2002 Owen Taylor <otaylor@redhat.com>
* glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
2002-02-26 Matthias Clasen <maclas@gmx.de>
* 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 <otaylor@redhat.com> Tue Feb 26 14:56:31 2002 Owen Taylor <otaylor@redhat.com>
* glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
2002-02-26 Matthias Clasen <maclas@gmx.de>
* 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 <otaylor@redhat.com> Tue Feb 26 14:56:31 2002 Owen Taylor <otaylor@redhat.com>
* glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case * glib-2.0.pc.in: Reorder @INTL_LIBS@ and @ICONV_LIBS@ in case

4
docs/debugging.txt
View File

@ -31,8 +31,8 @@ static volatile gpointer *g_trace_instance_signals;
Environment variables for debugging Environment variables for debugging
=================================== ===================================
When G_ENABLE_DEBUG was defined upon compilation, GRuntime supports When G_ENABLE_DEBUG was defined upon compilation, the GObject library
an environment variable GRUNTIME_DEBUG that can be set to a supports an environment variable GOBJECT_DEBUG that can be set to a
combination of the flags passed in to g_type_init() (currently combination of the flags passed in to g_type_init() (currently
"objects" and "signals") to trigger debugging messages about "objects" and "signals") to trigger debugging messages about
object bookkeeping and signal emissions during runtime. object bookkeeping and signal emissions during runtime.

40
gobject/Makefile.am
View File

@ -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. # Copyright (C) 1997,98,99,2000 Tim Janik and Red Hat, Inc.
# #
## Process this file with automake to produce Makefile.in ## 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 # setup source file variables
# #
# GRuntime header files for public installation (non-generated) # GObject library header files for public installation (non-generated)
gruntime_public_h_sources = @STRIP_BEGIN@ \ gobject_public_h_sources = @STRIP_BEGIN@ \
gboxed.h \ gboxed.h \
gclosure.h \ gclosure.h \
genums.h \ genums.h \
@ -80,11 +80,11 @@ gruntime_public_h_sources = @STRIP_BEGIN@ \
gvaluetypes.h \ gvaluetypes.h \
gobjectnotifyqueue.c \ gobjectnotifyqueue.c \
@STRIP_END@ @STRIP_END@
# GRuntime header files that don't get installed # GObject library header files that don't get installed
gruntime_private_h_sources = @STRIP_BEGIN@ \ gobject_private_h_sources = @STRIP_BEGIN@ \
@STRIP_END@ @STRIP_END@
# GRuntime C sources to build the library from # GObject library C sources to build the library from
gruntime_c_sources = @STRIP_BEGIN@ \ gobject_c_sources = @STRIP_BEGIN@ \
gboxed.c \ gboxed.c \
gclosure.c \ gclosure.c \
genums.c \ genums.c \
@ -109,33 +109,33 @@ gruntime_c_sources = @STRIP_BEGIN@ \
# content # content
# built sources that get installed with the header files # built sources that get installed with the header files
gruntime_built_public_sources = @STRIP_BEGIN@ \ gobject_built_public_sources = @STRIP_BEGIN@ \
gmarshal.h \ gmarshal.h \
@STRIP_END@ @STRIP_END@
# built sources that don't get installed # built sources that don't get installed
gruntime_built_sources = @STRIP_BEGIN@ \ gobject_built_sources = @STRIP_BEGIN@ \
stamp-gmarshal.h \ stamp-gmarshal.h \
gmarshal.c \ gmarshal.c \
${gruntime_built_public_sources} \ ${gobject_built_public_sources} \
@STRIP_END@ @STRIP_END@
# non-header sources (headers should be specified in the above variables) # 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 # 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 # their own .lo rules and don't get publically installed
gruntime_extra_sources = @STRIP_BEGIN@ \ gobject_extra_sources = @STRIP_BEGIN@ \
gmarshal.list \ gmarshal.list \
gmarshal.strings \ gmarshal.strings \
@STRIP_END@ @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) gobject_target_headers = $(gobject_public_h_sources) $(gobject_built_public_sources)
gruntime_target_sources = $(gruntime_c_sources) gobject_target_sources = $(gobject_c_sources)
MAINTAINERCLEANFILES += $(gruntime_built_sources) MAINTAINERCLEANFILES += $(gobject_built_sources)
EXTRA_HEADERS += EXTRA_HEADERS +=
EXTRA_DIST += $(gruntime_private_h_sources) $(gruntime_extra_sources) EXTRA_DIST += $(gobject_private_h_sources) $(gobject_extra_sources)
EXTRA_DIST += $(gruntime_built_sources) EXTRA_DIST += $(gobject_built_sources)
# #
# rules to generate built sources # rules to generate built sources
@ -144,7 +144,7 @@ EXTRA_DIST += $(gruntime_built_sources)
gen_sources = xgen-gmh xgen-gmc xgen-gms gen_sources = xgen-gmh xgen-gmc xgen-gms
CLEANFILES += $(gen_sources) 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 # initial creation of the real stamp-* files
gmarshal.h: # never add deps here gmarshal.h: # never add deps here
test -f "$(srcdir)/$@" || touch $(srcdir)/$@ test -f "$(srcdir)/$@" || touch $(srcdir)/$@
@ -175,8 +175,8 @@ glib-genmarshal.o: gmarshal.strings
# target platform: # target platform:
libgobjectinclude_HEADERS = $(gruntime_target_headers) libgobjectinclude_HEADERS = $(gobject_target_headers)
libgobject_1_3_la_SOURCES = $(gruntime_target_sources) libgobject_1_3_la_SOURCES = $(gobject_target_sources)
# #
# programs to compile and install # programs to compile and install

2
gobject/glib-genmarshal.1
View File

@ -36,7 +36,7 @@ Specify marshaller prefix. The default prefix is `\fIg_cclosure_marshal\fP'.
Skip source location remarks in generated comments. Skip source location remarks in generated comments.
.TP .TP
\fI--nostdinc \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. directive in generated header files.
.TP .TP
\fI--g-fatal-warnings \fI--g-fatal-warnings

10
gobject/glib-genmarshal.c
View File

@ -595,7 +595,7 @@ int
main (int argc, main (int argc,
char *argv[]) char *argv[])
{ {
const gchar *gruntime_marshallers[] = { const gchar *gobject_marshallers[] = {
#include "gmarshal.strings" #include "gmarshal.strings"
}; };
GScanner *scanner; GScanner *scanner;
@ -619,11 +619,11 @@ main (int argc,
fout = stdout; fout = stdout;
marshallers = g_hash_table_new (g_str_hash, g_str_equal); 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) 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); g_hash_table_insert (marshallers, tmp, tmp);
} }
@ -861,7 +861,7 @@ print_blurb (FILE *bout,
fprintf (bout, " --body generate C code\n"); fprintf (bout, " --body generate C code\n");
fprintf (bout, " --prefix=string specify marshaller prefix\n"); fprintf (bout, " --prefix=string specify marshaller prefix\n");
fprintf (bout, " --skip-source skip source location comments\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, " -h, --help show this help message\n");
fprintf (bout, " -v, --version print version informations\n"); fprintf (bout, " -v, --version print version informations\n");
fprintf (bout, " --g-fatal-warnings make warnings fatal (abort)\n"); fprintf (bout, " --g-fatal-warnings make warnings fatal (abort)\n");

4
gobject/gtype.c
View File

@ -2854,9 +2854,9 @@ g_type_init_with_debug_flags (GTypeDebugFlags debug_flags)
return; return;
} }
/* setup GRuntime wide debugging flags */ /* setup GObject library wide debugging flags */
_g_type_debug_flags = debug_flags & G_TYPE_DEBUG_MASK; _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) if (env_string != NULL)
{ {
static GDebugKey debug_keys[] = { static GDebugKey debug_keys[] = {