Update.

2001-10-26  Tor Lillqvist  <tml@iki.fi>

	* glib/glib.def: Update.

	* tests/makefile.{mingw,msc}.in: Add ../* to PATH before running
	tests to find DLLs. Separate the interactive tests, don't run them
	in the check target.

	* */makefile.msc.in: Include make.msc from GLib's build directory.

15 files changed, 90 insertions, 27 deletions

diff --git a/ChangeLog b/ChangeLog
index 2cd489cb9..2bfa76fb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,8 +2,14 @@
 
 	* README.win32: Updates.
 
+	* glib/glib.def: Update.
+
 	* tests/makefile.mingw.in
-	* tests/makefile.msc.in: Remove mainloop-test here, too.
+	* tests/makefile.msc.in: Remove mainloop-test here, too.  Add ../*
+	to PATH before running tests to find DLLs. Separate the
+	interactive tests, don't run them in the check target.
+
+	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
 Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 2cd489cb9..2bfa76fb9 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -2,8 +2,14 @@
 
 	* README.win32: Updates.
 
+	* glib/glib.def: Update.
+
 	* tests/makefile.mingw.in
-	* tests/makefile.msc.in: Remove mainloop-test here, too.
+	* tests/makefile.msc.in: Remove mainloop-test here, too.  Add ../*
+	to PATH before running tests to find DLLs. Separate the
+	interactive tests, don't run them in the check target.
+
+	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
 Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2cd489cb9..2bfa76fb9 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -2,8 +2,14 @@
 
 	* README.win32: Updates.
 
+	* glib/glib.def: Update.
+
 	* tests/makefile.mingw.in
-	* tests/makefile.msc.in: Remove mainloop-test here, too.
+	* tests/makefile.msc.in: Remove mainloop-test here, too.  Add ../*
+	to PATH before running tests to find DLLs. Separate the
+	interactive tests, don't run them in the check target.
+
+	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
 Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 2cd489cb9..2bfa76fb9 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -2,8 +2,14 @@
 
 	* README.win32: Updates.
 
+	* glib/glib.def: Update.
+
 	* tests/makefile.mingw.in
-	* tests/makefile.msc.in: Remove mainloop-test here, too.
+	* tests/makefile.msc.in: Remove mainloop-test here, too.  Add ../*
+	to PATH before running tests to find DLLs. Separate the
+	interactive tests, don't run them in the check target.
+
+	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
 Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 2cd489cb9..2bfa76fb9 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -2,8 +2,14 @@
 
 	* README.win32: Updates.
 
+	* glib/glib.def: Update.
+
 	* tests/makefile.mingw.in
-	* tests/makefile.msc.in: Remove mainloop-test here, too.
+	* tests/makefile.msc.in: Remove mainloop-test here, too.  Add ../*
+	to PATH before running tests to find DLLs. Separate the
+	interactive tests, don't run them in the check target.
+
+	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
 Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2cd489cb9..2bfa76fb9 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -2,8 +2,14 @@
 
 	* README.win32: Updates.
 
+	* glib/glib.def: Update.
+
 	* tests/makefile.mingw.in
-	* tests/makefile.msc.in: Remove mainloop-test here, too.
+	* tests/makefile.msc.in: Remove mainloop-test here, too.  Add ../*
+	to PATH before running tests to find DLLs. Separate the
+	interactive tests, don't run them in the check target.
+
+	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
 Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2cd489cb9..2bfa76fb9 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -2,8 +2,14 @@
 
 	* README.win32: Updates.
 
+	* glib/glib.def: Update.
+
 	* tests/makefile.mingw.in
-	* tests/makefile.msc.in: Remove mainloop-test here, too.
+	* tests/makefile.msc.in: Remove mainloop-test here, too.  Add ../*
+	to PATH before running tests to find DLLs. Separate the
+	interactive tests, don't run them in the check target.
+
+	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
 Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2cd489cb9..2bfa76fb9 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -2,8 +2,14 @@
 
 	* README.win32: Updates.
 
+	* glib/glib.def: Update.
+
 	* tests/makefile.mingw.in
-	* tests/makefile.msc.in: Remove mainloop-test here, too.
+	* tests/makefile.msc.in: Remove mainloop-test here, too.  Add ../*
+	to PATH before running tests to find DLLs. Separate the
+	interactive tests, don't run them in the check target.
+
+	* */makefile.msc.in: Include make.msc from GLib's build directory.
 
 Wed Oct 24 11:10:54 2001  Owen Taylor  <otaylor@redhat.com>
 
diff --git a/glib/glib.def b/glib/glib.def
index ec1b9ff84..28b0bad1b 100644
--- a/glib/glib.def
+++ b/glib/glib.def
@@ -13,9 +13,11 @@ EXPORTS
 	g_array_sort
 	g_array_sort_with_data
 	g_ascii_digit_value
+	g_ascii_dtostr
 	g_ascii_strcasecmp
 	g_ascii_strncasecmp
 	g_ascii_strdown
+	g_ascii_strtod
 	g_ascii_strup
 	g_ascii_table
 	g_ascii_tolower
diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in
index 300f284c7..043eaf463 100644
--- a/glib/makefile.msc.in
+++ b/glib/makefile.msc.in
@@ -3,7 +3,7 @@
 
 TOP = ..\..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE ..\build\win32\make.msc
 
 ################################################################
 
diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in
index 653ab6e8e..297d80332 100644
--- a/gmodule/makefile.msc.in
+++ b/gmodule/makefile.msc.in
@@ -3,7 +3,7 @@
 
 TOP = ..\..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE ..\build\win32\make.msc
 
 ################################################################
 
diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in
index 731ed0612..3bdde15ff 100644
--- a/gobject/makefile.msc.in
+++ b/gobject/makefile.msc.in
@@ -3,7 +3,7 @@
 
 TOP = ..\..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE ..\build\win32\make.msc
 
 # Possibly override GLib version in build\win32\object.defs
 GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in
index 2cf7d5672..2d100072c 100644
--- a/gthread/makefile.msc.in
+++ b/gthread/makefile.msc.in
@@ -5,14 +5,12 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
 
 TOP = ..\..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE ..\build\win32\make.msc
 
 ################################################################
 
 INCLUDES = -I .. -I . -I ..\glib
 DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
-# DEPCFLAGS = $(PTHREAD_CFLAGS)
-# DEPCLIBS = $(PTHREAD_LIBS) 
 all : \
 	libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
 
diff --git a/tests/makefile.mingw.in b/tests/makefile.mingw.in
index 12bba68e6..f2e73a373 100644
--- a/tests/makefile.mingw.in
+++ b/tests/makefile.mingw.in
@@ -12,12 +12,17 @@ include ../build/win32/make.mingw
 INCLUDES = -I .. -I ../glib -I ../gmodule
 DEFINES = -DHAVE_CONFIG_H
 
-# mainloop-test removed for now until it is fixed
-
-TESTS = \
+NONAUTOMATIC_TESTS = \
 	testglib.exe	\
 	testgdate.exe	\
 	testgdateparser.exe \
+	patterntest.exe \
+	unicode-normalize.exe \
+	unicode-collate.exe
+
+# mainloop-test removed for now until it is fixed
+
+TESTS = \
 	array-test.exe	\
 	date-test.exe	\
 	dirname-test.exe\
@@ -35,17 +40,19 @@ TESTS = \
 	spawn-test.exe	\
 	strfunc-test.exe\
 	string-test.exe	\
+	strtod-test.exe \
 	thread-test.exe	\
 	threadpool-test.exe\
 	tree-test.exe	\
 	type-test.exe	\
-	unicode-encoding.exe \
+	unicode-caseconv.exe \
+	unicode-encoding.exe
 
 DLLS = \
 	libmoduletestplugin_a.dll \
 	libmoduletestplugin_b.dll
 
-all:	$(TESTS) $(DLLS)
+all:	$(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS)
 
 .SUFFIXES: .c .i .exe
 
@@ -66,5 +73,5 @@ libmoduletestplugin_b.dll : libmoduletestplugin_b.o
 	$(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3
 
 check:	all
-	@for P in $(TESTS) ; do echo $$P; ./$$P; done
+	@for P in $(TESTS) ; do echo $$P; PATH=../glib:../gmodule:../gobject:../gthread:$$PATH ./$$P; done
 	@echo All tests successful.
diff --git a/tests/makefile.msc.in b/tests/makefile.msc.in
index 1081ec4bc..76c6092cd 100644
--- a/tests/makefile.msc.in
+++ b/tests/makefile.msc.in
@@ -3,24 +3,28 @@
 
 TOP = ..\..
 
-!INCLUDE $(TOP)\build\win32\make.msc
+!INCLUDE ..\build\win32\make.msc
 
 ################################################################
 
 INCLUDES = -I .. -I ..\glib -I ..\gmodule
 DEFINES = -DHAVE_CONFIG_H
 
+NONAUTOMATIC_TESTS = \
+	testglib.exe	\
+	testgdate.exe	\
+	testgdateparser.exe \
+	patterntest.exe \
+	unicode-normalize.exe \
+	unicode-collate.exe
+
 # mainloop-test removed for now until it is fixed
 
 TESTS = \
-	testglib.exe \
-	testgdate.exe \
-	testgdateparser.exe \
 	array-test.exe	\
 	date-test.exe	\
 	dirname-test.exe\
 	gio-test.exe	\
-	iochannel-test.exe	\
 	hash-test.exe	\
 	list-test.exe	\
 	markup-test.exe	\
@@ -35,15 +39,19 @@ TESTS = \
 # strfunc-test doesn't compile with MSVC
 #	strfunc-test.exe\
 	string-test.exe	\
+	strtod-test.exe \
 	thread-test.exe	\
 	threadpool-test.exe\
 	tree-test.exe	\
 	type-test.exe	\
-	unicode-encoding.exe \
+	unicode-caseconv.exe \
+	unicode-encoding.exe
+
+DLLS = \
 	libmoduletestplugin_a.dll \
 	libmoduletestplugin_b.dll
 
-all :	$(TESTS)
+all :	$(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS)
 
 .c.exe :
 	$(CC) $(CFLAGS) -c $<