mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2025-01-26 22:16:16 +01:00
Find test case for srcdir != builddir, miscellaneous cleanups.
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com> * tests/iochannel-test.c (main): Find test case for srcdir != builddir, miscellaneous cleanups. * tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt, casemap.txt iochannel-test-infile. * glib-2.0-uninstalled.pc.in: Fix for move of glib files into subdir. (Pointed out by Steve Baker)
This commit is contained in:
parent
9a9b43bca8
commit
dff516edc8
11
ChangeLog
11
ChangeLog
@ -1,3 +1,14 @@
|
||||
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* tests/iochannel-test.c (main): Find test case for
|
||||
srcdir != builddir, miscellaneous cleanups.
|
||||
|
||||
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
|
||||
casemap.txt iochannel-test-infile.
|
||||
|
||||
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
|
||||
into subdir. (Pointed out by Steve Baker)
|
||||
|
||||
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
|
||||
|
@ -1,3 +1,14 @@
|
||||
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* tests/iochannel-test.c (main): Find test case for
|
||||
srcdir != builddir, miscellaneous cleanups.
|
||||
|
||||
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
|
||||
casemap.txt iochannel-test-infile.
|
||||
|
||||
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
|
||||
into subdir. (Pointed out by Steve Baker)
|
||||
|
||||
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
|
||||
|
@ -1,3 +1,14 @@
|
||||
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* tests/iochannel-test.c (main): Find test case for
|
||||
srcdir != builddir, miscellaneous cleanups.
|
||||
|
||||
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
|
||||
casemap.txt iochannel-test-infile.
|
||||
|
||||
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
|
||||
into subdir. (Pointed out by Steve Baker)
|
||||
|
||||
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
|
||||
|
@ -1,3 +1,14 @@
|
||||
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* tests/iochannel-test.c (main): Find test case for
|
||||
srcdir != builddir, miscellaneous cleanups.
|
||||
|
||||
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
|
||||
casemap.txt iochannel-test-infile.
|
||||
|
||||
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
|
||||
into subdir. (Pointed out by Steve Baker)
|
||||
|
||||
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
|
||||
|
@ -1,3 +1,14 @@
|
||||
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* tests/iochannel-test.c (main): Find test case for
|
||||
srcdir != builddir, miscellaneous cleanups.
|
||||
|
||||
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
|
||||
casemap.txt iochannel-test-infile.
|
||||
|
||||
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
|
||||
into subdir. (Pointed out by Steve Baker)
|
||||
|
||||
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
|
||||
|
@ -1,3 +1,14 @@
|
||||
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* tests/iochannel-test.c (main): Find test case for
|
||||
srcdir != builddir, miscellaneous cleanups.
|
||||
|
||||
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
|
||||
casemap.txt iochannel-test-infile.
|
||||
|
||||
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
|
||||
into subdir. (Pointed out by Steve Baker)
|
||||
|
||||
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
|
||||
|
@ -1,3 +1,14 @@
|
||||
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* tests/iochannel-test.c (main): Find test case for
|
||||
srcdir != builddir, miscellaneous cleanups.
|
||||
|
||||
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
|
||||
casemap.txt iochannel-test-infile.
|
||||
|
||||
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
|
||||
into subdir. (Pointed out by Steve Baker)
|
||||
|
||||
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
|
||||
|
@ -1,3 +1,14 @@
|
||||
Sun Aug 12 10:09:00 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* tests/iochannel-test.c (main): Find test case for
|
||||
srcdir != builddir, miscellaneous cleanups.
|
||||
|
||||
* tests/Makefile.am (EXTRA_DIST): Distribute casefold.txt,
|
||||
casemap.txt iochannel-test-infile.
|
||||
|
||||
* glib-2.0-uninstalled.pc.in: Fix for move of glib files
|
||||
into subdir. (Pointed out by Steve Baker)
|
||||
|
||||
Sat Aug 4 01:04:08 2001 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib/gscanner.c (g_scanner_unexp_token): fix INT and FLOAT warnings
|
||||
|
@ -5,5 +5,5 @@ glib_mkenums=${pc_top_builddir}/${pcfiledir}/@srcdir@/gobject/glib-mkenums
|
||||
Name: GLib Uninstalled
|
||||
Description: C Utility Library, Not Installed
|
||||
Version: @VERSION@
|
||||
Libs: ${pc_top_builddir}/${pcfiledir}/libglib-1.3.la @ICONV_LIBS@ @INTLLIBS@
|
||||
Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@
|
||||
Libs: ${pc_top_builddir}/${pcfiledir}/glib/libglib-1.3.la @ICONV_LIBS@ @INTLLIBS@
|
||||
Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}/@srcdir@/glib
|
||||
|
@ -13,14 +13,19 @@ libadd_libglib = $(libglib)
|
||||
no_undefined = -no-undefined
|
||||
endif
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(test_scripts) \
|
||||
makefile.msc.in \
|
||||
makefile.mingw.in \
|
||||
EXTRA_DIST = \
|
||||
$(test_scripts) \
|
||||
makefile.msc.in \
|
||||
makefile.mingw.in \
|
||||
casefold.txt \
|
||||
casemap.txt \
|
||||
gen-casefold-txt.pl \
|
||||
gen-casemap-txt.pl \
|
||||
iochannel-test-infile \
|
||||
utf8.txt
|
||||
|
||||
BUILT_EXTRA_DIST = \
|
||||
makefile.mingw \
|
||||
BUILT_EXTRA_DIST = \
|
||||
makefile.mingw \
|
||||
makefile.msc
|
||||
|
||||
if HAVE_CXX
|
||||
|
@ -13,37 +13,41 @@ gint main (gint argc, gchar * argv[])
|
||||
GIOChannel *gio_r, *gio_w ;
|
||||
GError *gerr = NULL;
|
||||
GString *buffer;
|
||||
char *filename;
|
||||
char *srcdir = getenv ("srcdir");
|
||||
gint rlength = 0, wlength = 0, length_out, line_term_len;
|
||||
gboolean block;
|
||||
const gchar encoding[] = "EUC-JP", line_term[] = "\n";
|
||||
GIOStatus status;
|
||||
GIOFlags flags;
|
||||
|
||||
if (!srcdir)
|
||||
srcdir = ".";
|
||||
filename = g_strconcat (srcdir, G_DIR_SEPARATOR_S, "iochannel-test-infile", NULL);
|
||||
|
||||
setbuf(stdout, NULL); /* For debugging */
|
||||
|
||||
gio_r = g_io_channel_new_file ("iochannel-test-infile", "r", &gerr);
|
||||
gio_r = g_io_channel_new_file (filename, "r", &gerr);
|
||||
if (gerr)
|
||||
{
|
||||
g_warning(gerr->message);
|
||||
g_warning("Unable to open file %s", "iochannel-test-infile");
|
||||
g_free(gerr);
|
||||
return 0;
|
||||
g_warning("Unable to open file %s: %s", filename, gerr->message);
|
||||
g_error_free(gerr);
|
||||
return 1;
|
||||
}
|
||||
gio_w = g_io_channel_new_file( "iochannel-test-outfile", "w", &gerr);
|
||||
if (gerr)
|
||||
{
|
||||
g_warning(gerr->message);
|
||||
g_warning("Unable to open file %s", "iochannel-test-outfile");
|
||||
g_free(gerr);
|
||||
return 0;
|
||||
g_warning("Unable to open file %s: %s", "iochannel-test-outfile", gerr->message);
|
||||
g_error_free(gerr);
|
||||
return 1;
|
||||
}
|
||||
|
||||
g_io_channel_set_encoding (gio_r, encoding, &gerr);
|
||||
if (gerr)
|
||||
{
|
||||
g_warning(gerr->message);
|
||||
g_free(gerr);
|
||||
return 0;
|
||||
g_error_free(gerr);
|
||||
return 1;
|
||||
}
|
||||
|
||||
g_io_channel_set_buffer_size (gio_r, BUFFER_SIZE);
|
||||
|
Loading…
Reference in New Issue
Block a user