Commit 3729dc28 authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

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.
parent 7d916740
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
* README.win32: Updates. * README.win32: Updates.
* glib/glib.def: Update.
* tests/makefile.mingw.in * 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> Wed Oct 24 11:10:54 2001 Owen Taylor <otaylor@redhat.com>
......
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
* README.win32: Updates. * README.win32: Updates.
* glib/glib.def: Update.
* tests/makefile.mingw.in * 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> Wed Oct 24 11:10:54 2001 Owen Taylor <otaylor@redhat.com>
......
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
* README.win32: Updates. * README.win32: Updates.
* glib/glib.def: Update.
* tests/makefile.mingw.in * 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> Wed Oct 24 11:10:54 2001 Owen Taylor <otaylor@redhat.com>
......
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
* README.win32: Updates. * README.win32: Updates.
* glib/glib.def: Update.
* tests/makefile.mingw.in * 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> Wed Oct 24 11:10:54 2001 Owen Taylor <otaylor@redhat.com>
......
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
* README.win32: Updates. * README.win32: Updates.
* glib/glib.def: Update.
* tests/makefile.mingw.in * 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> Wed Oct 24 11:10:54 2001 Owen Taylor <otaylor@redhat.com>
......
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
* README.win32: Updates. * README.win32: Updates.
* glib/glib.def: Update.
* tests/makefile.mingw.in * 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> Wed Oct 24 11:10:54 2001 Owen Taylor <otaylor@redhat.com>
......
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
* README.win32: Updates. * README.win32: Updates.
* glib/glib.def: Update.
* tests/makefile.mingw.in * 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> Wed Oct 24 11:10:54 2001 Owen Taylor <otaylor@redhat.com>
......
...@@ -2,8 +2,14 @@ ...@@ -2,8 +2,14 @@
* README.win32: Updates. * README.win32: Updates.
* glib/glib.def: Update.
* tests/makefile.mingw.in * 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> Wed Oct 24 11:10:54 2001 Owen Taylor <otaylor@redhat.com>
......
...@@ -13,9 +13,11 @@ EXPORTS ...@@ -13,9 +13,11 @@ EXPORTS
g_array_sort g_array_sort
g_array_sort_with_data g_array_sort_with_data
g_ascii_digit_value g_ascii_digit_value
g_ascii_dtostr
g_ascii_strcasecmp g_ascii_strcasecmp
g_ascii_strncasecmp g_ascii_strncasecmp
g_ascii_strdown g_ascii_strdown
g_ascii_strtod
g_ascii_strup g_ascii_strup
g_ascii_table g_ascii_table
g_ascii_tolower g_ascii_tolower
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
TOP = ..\.. TOP = ..\..
!INCLUDE $(TOP)\build\win32\make.msc !INCLUDE ..\build\win32\make.msc
################################################################ ################################################################
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
TOP = ..\.. TOP = ..\..
!INCLUDE $(TOP)\build\win32\make.msc !INCLUDE ..\build\win32\make.msc
################################################################ ################################################################
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
TOP = ..\.. TOP = ..\..
!INCLUDE $(TOP)\build\win32\make.msc !INCLUDE ..\build\win32\make.msc
# Possibly override GLib version in build\win32\object.defs # Possibly override GLib version in build\win32\object.defs
GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
......
...@@ -5,14 +5,12 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@ ...@@ -5,14 +5,12 @@ GLIB_VER = @GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@
TOP = ..\.. TOP = ..\..
!INCLUDE $(TOP)\build\win32\make.msc !INCLUDE ..\build\win32\make.msc
################################################################ ################################################################
INCLUDES = -I .. -I . -I ..\glib INCLUDES = -I .. -I . -I ..\glib
DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\" DEFINES = -DHAVE_CONFIG_H -DG_LOG_DOMAIN=\"GThread\"
# DEPCFLAGS = $(PTHREAD_CFLAGS)
# DEPCLIBS = $(PTHREAD_LIBS)
all : \ all : \
libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll libgthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@-@LT_CURRENT_MINUS_AGE@.dll
......
...@@ -12,12 +12,17 @@ include ../build/win32/make.mingw ...@@ -12,12 +12,17 @@ include ../build/win32/make.mingw
INCLUDES = -I .. -I ../glib -I ../gmodule INCLUDES = -I .. -I ../glib -I ../gmodule
DEFINES = -DHAVE_CONFIG_H DEFINES = -DHAVE_CONFIG_H
# mainloop-test removed for now until it is fixed NONAUTOMATIC_TESTS = \
TESTS = \
testglib.exe \ testglib.exe \
testgdate.exe \ testgdate.exe \
testgdateparser.exe \ testgdateparser.exe \
patterntest.exe \
unicode-normalize.exe \
unicode-collate.exe
# mainloop-test removed for now until it is fixed
TESTS = \
array-test.exe \ array-test.exe \
date-test.exe \ date-test.exe \
dirname-test.exe\ dirname-test.exe\
...@@ -35,17 +40,19 @@ TESTS = \ ...@@ -35,17 +40,19 @@ TESTS = \
spawn-test.exe \ spawn-test.exe \
strfunc-test.exe\ strfunc-test.exe\
string-test.exe \ string-test.exe \
strtod-test.exe \
thread-test.exe \ thread-test.exe \
threadpool-test.exe\ threadpool-test.exe\
tree-test.exe \ tree-test.exe \
type-test.exe \ type-test.exe \
unicode-encoding.exe \ unicode-caseconv.exe \
unicode-encoding.exe
DLLS = \ DLLS = \
libmoduletestplugin_a.dll \ libmoduletestplugin_a.dll \
libmoduletestplugin_b.dll libmoduletestplugin_b.dll
all: $(TESTS) $(DLLS) all: $(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS)
.SUFFIXES: .c .i .exe .SUFFIXES: .c .i .exe
...@@ -66,5 +73,5 @@ libmoduletestplugin_b.dll : libmoduletestplugin_b.o ...@@ -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 $(BUILD_DLL) libmoduletestplugin_b - libmoduletestplugin_b.o -L ../glib -lglib-1.3 -L ../gmodule -lgmodule-1.3
check: all 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. @echo All tests successful.
...@@ -3,24 +3,28 @@ ...@@ -3,24 +3,28 @@
TOP = ..\.. TOP = ..\..
!INCLUDE $(TOP)\build\win32\make.msc !INCLUDE ..\build\win32\make.msc
################################################################ ################################################################
INCLUDES = -I .. -I ..\glib -I ..\gmodule INCLUDES = -I .. -I ..\glib -I ..\gmodule
DEFINES = -DHAVE_CONFIG_H DEFINES = -DHAVE_CONFIG_H
# mainloop-test removed for now until it is fixed NONAUTOMATIC_TESTS = \
TESTS = \
testglib.exe \ testglib.exe \
testgdate.exe \ testgdate.exe \
testgdateparser.exe \ testgdateparser.exe \
patterntest.exe \
unicode-normalize.exe \
unicode-collate.exe
# mainloop-test removed for now until it is fixed
TESTS = \
array-test.exe \ array-test.exe \
date-test.exe \ date-test.exe \
dirname-test.exe\ dirname-test.exe\
gio-test.exe \ gio-test.exe \
iochannel-test.exe \
hash-test.exe \ hash-test.exe \
list-test.exe \ list-test.exe \
markup-test.exe \ markup-test.exe \
...@@ -35,15 +39,19 @@ TESTS = \ ...@@ -35,15 +39,19 @@ TESTS = \
# strfunc-test doesn't compile with MSVC # strfunc-test doesn't compile with MSVC
# strfunc-test.exe\ # strfunc-test.exe\
string-test.exe \ string-test.exe \
strtod-test.exe \
thread-test.exe \ thread-test.exe \
threadpool-test.exe\ threadpool-test.exe\
tree-test.exe \ tree-test.exe \
type-test.exe \ type-test.exe \
unicode-encoding.exe \ unicode-caseconv.exe \
unicode-encoding.exe
DLLS = \
libmoduletestplugin_a.dll \ libmoduletestplugin_a.dll \
libmoduletestplugin_b.dll libmoduletestplugin_b.dll
all : $(TESTS) all : $(TESTS) $(NONAUTOMATIC_TESTS) $(DLLS)
.c.exe : .c.exe :
$(CC) $(CFLAGS) -c $< $(CC) $(CFLAGS) -c $<
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment