From 09683edc5c1cd1defcfa3ab01b397c3c058966a2 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 27 Oct 2000 20:43:42 +0000 Subject: [PATCH] Add gmarkup. 2000-10-27 Tor Lillqvist * makefile.{mingw,msc}.in (glib_OBJECTS): Add gmarkup. * glib.def: Add missing functions. * tests/makefile.{mingw,msc}.in (TESTS): Add markup-test. --- ChangeLog | 8 ++++++++ ChangeLog.pre-2-0 | 8 ++++++++ ChangeLog.pre-2-10 | 8 ++++++++ ChangeLog.pre-2-12 | 8 ++++++++ ChangeLog.pre-2-2 | 8 ++++++++ ChangeLog.pre-2-4 | 8 ++++++++ ChangeLog.pre-2-6 | 8 ++++++++ ChangeLog.pre-2-8 | 8 ++++++++ glib.def | 7 +++++++ glib/glib.def | 7 +++++++ glib/makefile.mingw.in | 1 + glib/makefile.msc.in | 1 + makefile.mingw.in | 1 + makefile.msc.in | 1 + tests/makefile.mingw.in | 9 ++++----- tests/makefile.msc.in | 3 ++- 16 files changed, 88 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9031af43c..b42044f33 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-10-27 Tor Lillqvist + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gmarkup. + + * glib.def: Add missing functions. + + * tests/makefile.{mingw,msc}.in (TESTS): Add markup-test. + 2000-10-24 Havoc Pennington * gmarkup.h, gmarkup.c: New module to parse a simple diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9031af43c..b42044f33 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +2000-10-27 Tor Lillqvist + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gmarkup. + + * glib.def: Add missing functions. + + * tests/makefile.{mingw,msc}.in (TESTS): Add markup-test. + 2000-10-24 Havoc Pennington * gmarkup.h, gmarkup.c: New module to parse a simple diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9031af43c..b42044f33 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +2000-10-27 Tor Lillqvist + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gmarkup. + + * glib.def: Add missing functions. + + * tests/makefile.{mingw,msc}.in (TESTS): Add markup-test. + 2000-10-24 Havoc Pennington * gmarkup.h, gmarkup.c: New module to parse a simple diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 9031af43c..b42044f33 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,11 @@ +2000-10-27 Tor Lillqvist + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gmarkup. + + * glib.def: Add missing functions. + + * tests/makefile.{mingw,msc}.in (TESTS): Add markup-test. + 2000-10-24 Havoc Pennington * gmarkup.h, gmarkup.c: New module to parse a simple diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9031af43c..b42044f33 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +2000-10-27 Tor Lillqvist + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gmarkup. + + * glib.def: Add missing functions. + + * tests/makefile.{mingw,msc}.in (TESTS): Add markup-test. + 2000-10-24 Havoc Pennington * gmarkup.h, gmarkup.c: New module to parse a simple diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9031af43c..b42044f33 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +2000-10-27 Tor Lillqvist + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gmarkup. + + * glib.def: Add missing functions. + + * tests/makefile.{mingw,msc}.in (TESTS): Add markup-test. + 2000-10-24 Havoc Pennington * gmarkup.h, gmarkup.c: New module to parse a simple diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9031af43c..b42044f33 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +2000-10-27 Tor Lillqvist + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gmarkup. + + * glib.def: Add missing functions. + + * tests/makefile.{mingw,msc}.in (TESTS): Add markup-test. + 2000-10-24 Havoc Pennington * gmarkup.h, gmarkup.c: New module to parse a simple diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9031af43c..b42044f33 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +2000-10-27 Tor Lillqvist + + * makefile.{mingw,msc}.in (glib_OBJECTS): Add gmarkup. + + * glib.def: Add missing functions. + + * tests/makefile.{mingw,msc}.in (TESTS): Add markup-test. + 2000-10-24 Havoc Pennington * gmarkup.h, gmarkup.c: New module to parse a simple diff --git a/glib.def b/glib.def index 5ff0501ff..543288ad3 100644 --- a/glib.def +++ b/glib.def @@ -99,6 +99,7 @@ EXPORTS g_error_matches g_error_new g_error_new_literal + g_file_get_contents g_file_test g_filename_from_utf8 g_filename_to_utf8 @@ -218,6 +219,12 @@ EXPORTS g_main_win32_get_poll_func g_malloc g_malloc0 + g_markup_escape_text + g_markup_parse_context_end_parse + g_markup_parse_context_free + g_markup_parse_context_get_position + g_markup_parse_context_new + g_markup_parse_context_parse g_mem_check g_mem_chunk_alloc g_mem_chunk_alloc0 diff --git a/glib/glib.def b/glib/glib.def index 5ff0501ff..543288ad3 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -99,6 +99,7 @@ EXPORTS g_error_matches g_error_new g_error_new_literal + g_file_get_contents g_file_test g_filename_from_utf8 g_filename_to_utf8 @@ -218,6 +219,12 @@ EXPORTS g_main_win32_get_poll_func g_malloc g_malloc0 + g_markup_escape_text + g_markup_parse_context_end_parse + g_markup_parse_context_free + g_markup_parse_context_get_position + g_markup_parse_context_new + g_markup_parse_context_parse g_mem_check g_mem_chunk_alloc g_mem_chunk_alloc0 diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in index 86a403923..5e7c94853 100644 --- a/glib/makefile.mingw.in +++ b/glib/makefile.mingw.in @@ -58,6 +58,7 @@ glib_OBJECTS = \ giowin32.o \ glist.o \ gmain.o \ + gmarkup.o \ gmem.o \ gmessages.o \ gnode.o \ diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in index 36efd3817..53002c383 100644 --- a/glib/makefile.msc.in +++ b/glib/makefile.msc.in @@ -55,6 +55,7 @@ glib_OBJECTS = \ giowin32.obj \ glist.obj \ gmain.obj \ + gmarkup.obj \ gmem.obj \ gmessages.obj \ gnode.obj \ diff --git a/makefile.mingw.in b/makefile.mingw.in index 86a403923..5e7c94853 100644 --- a/makefile.mingw.in +++ b/makefile.mingw.in @@ -58,6 +58,7 @@ glib_OBJECTS = \ giowin32.o \ glist.o \ gmain.o \ + gmarkup.o \ gmem.o \ gmessages.o \ gnode.o \ diff --git a/makefile.msc.in b/makefile.msc.in index 36efd3817..53002c383 100644 --- a/makefile.msc.in +++ b/makefile.msc.in @@ -55,6 +55,7 @@ glib_OBJECTS = \ giowin32.obj \ glist.obj \ gmain.obj \ + gmarkup.obj \ gmem.obj \ gmessages.obj \ gnode.obj \ diff --git a/tests/makefile.mingw.in b/tests/makefile.mingw.in index 42deca541..c6b48d870 100644 --- a/tests/makefile.mingw.in +++ b/tests/makefile.mingw.in @@ -1,12 +1,13 @@ ## Makefile for building the GLib test programs with gcc for mingw. ## Use: make -f makefile.mingw check -GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ - TOP = ../.. include ../build/win32/make.mingw +# Possibly override GLib version in build\win32\module.defs +GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ + ################################################################ # Nothing much configurable below @@ -21,6 +22,7 @@ TESTS = \ gio-test.exe \ hash-test.exe \ list-test.exe \ + markup-test.exe \ node-test.exe \ queue-test.exe \ rand-test.exe \ @@ -50,6 +52,3 @@ makefile.mingw: makefile.mingw.in check: all @for P in $(TESTS) ; do echo $$P; ./$$P; done @echo All tests successful. - -clean:: - -rm *.exe *.o diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in index 7029215c1..8d9036621 100644 --- a/tests/makefile.msc.in +++ b/tests/makefile.msc.in @@ -13,7 +13,7 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ # Nothing much configurable below INCLUDES = -I.. -DEFINES = -DHAVE_CONFIG_H +DEFINES = -DHAVE_CONFIG_H TESTS = \ array-test.exe \ @@ -22,6 +22,7 @@ TESTS = \ gio-test.exe \ hash-test.exe \ list-test.exe \ + markup-test.exe \ node-test.exe \ queue-test.exe \ rand-test.exe \