diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-12 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 14 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 14 | ||||
| -rw-r--r-- | README.win32 | 13 | ||||
| -rwxr-xr-x | glib-zip.in | 26 | ||||
| -rw-r--r-- | glib/glib.def | 4 | ||||
| -rwxr-xr-x | glib/libcharset/config.charset | 2 | ||||
| -rw-r--r-- | glib/makefile.mingw.in | 1 |
13 files changed, 140 insertions, 18 deletions
@@ -1,3 +1,17 @@ +2001-11-05 Tor Lillqvist <tml@iki.fi> + + * README.win32: Minor edits. + + * glib-zip.in: Build separate runtime and developer packages. + + * glib/libcharset/config.charset (os): Don't need to match mingw + after all, the charset.alias file isn't even used on Win32... (see + localcharset.c). + + * glib/makefile.mingw.in: Add gdir. + + * glib/glib.def: Add g_dir_* entry points. + Sun Nov 4 20:45:21 2001 Owen Taylor <otaylor@redhat.com> * configure.in (CFLAGS): Add check for dirent.h diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ec3d3b3de..36d64539e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,17 @@ +2001-11-05 Tor Lillqvist <tml@iki.fi> + + * README.win32: Minor edits. + + * glib-zip.in: Build separate runtime and developer packages. + + * glib/libcharset/config.charset (os): Don't need to match mingw + after all, the charset.alias file isn't even used on Win32... (see + localcharset.c). + + * glib/makefile.mingw.in: Add gdir. + + * glib/glib.def: Add g_dir_* entry points. + Sun Nov 4 20:45:21 2001 Owen Taylor <otaylor@redhat.com> * configure.in (CFLAGS): Add check for dirent.h diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ec3d3b3de..36d64539e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +2001-11-05 Tor Lillqvist <tml@iki.fi> + + * README.win32: Minor edits. + + * glib-zip.in: Build separate runtime and developer packages. + + * glib/libcharset/config.charset (os): Don't need to match mingw + after all, the charset.alias file isn't even used on Win32... (see + localcharset.c). + + * glib/makefile.mingw.in: Add gdir. + + * glib/glib.def: Add g_dir_* entry points. + Sun Nov 4 20:45:21 2001 Owen Taylor <otaylor@redhat.com> * configure.in (CFLAGS): Add check for dirent.h diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index ec3d3b3de..36d64539e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,17 @@ +2001-11-05 Tor Lillqvist <tml@iki.fi> + + * README.win32: Minor edits. + + * glib-zip.in: Build separate runtime and developer packages. + + * glib/libcharset/config.charset (os): Don't need to match mingw + after all, the charset.alias file isn't even used on Win32... (see + localcharset.c). + + * glib/makefile.mingw.in: Add gdir. + + * glib/glib.def: Add g_dir_* entry points. + Sun Nov 4 20:45:21 2001 Owen Taylor <otaylor@redhat.com> * configure.in (CFLAGS): Add check for dirent.h diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ec3d3b3de..36d64539e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +2001-11-05 Tor Lillqvist <tml@iki.fi> + + * README.win32: Minor edits. + + * glib-zip.in: Build separate runtime and developer packages. + + * glib/libcharset/config.charset (os): Don't need to match mingw + after all, the charset.alias file isn't even used on Win32... (see + localcharset.c). + + * glib/makefile.mingw.in: Add gdir. + + * glib/glib.def: Add g_dir_* entry points. + Sun Nov 4 20:45:21 2001 Owen Taylor <otaylor@redhat.com> * configure.in (CFLAGS): Add check for dirent.h diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ec3d3b3de..36d64539e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +2001-11-05 Tor Lillqvist <tml@iki.fi> + + * README.win32: Minor edits. + + * glib-zip.in: Build separate runtime and developer packages. + + * glib/libcharset/config.charset (os): Don't need to match mingw + after all, the charset.alias file isn't even used on Win32... (see + localcharset.c). + + * glib/makefile.mingw.in: Add gdir. + + * glib/glib.def: Add g_dir_* entry points. + Sun Nov 4 20:45:21 2001 Owen Taylor <otaylor@redhat.com> * configure.in (CFLAGS): Add check for dirent.h diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ec3d3b3de..36d64539e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +2001-11-05 Tor Lillqvist <tml@iki.fi> + + * README.win32: Minor edits. + + * glib-zip.in: Build separate runtime and developer packages. + + * glib/libcharset/config.charset (os): Don't need to match mingw + after all, the charset.alias file isn't even used on Win32... (see + localcharset.c). + + * glib/makefile.mingw.in: Add gdir. + + * glib/glib.def: Add g_dir_* entry points. + Sun Nov 4 20:45:21 2001 Owen Taylor <otaylor@redhat.com> * configure.in (CFLAGS): Add check for dirent.h diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ec3d3b3de..36d64539e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +2001-11-05 Tor Lillqvist <tml@iki.fi> + + * README.win32: Minor edits. + + * glib-zip.in: Build separate runtime and developer packages. + + * glib/libcharset/config.charset (os): Don't need to match mingw + after all, the charset.alias file isn't even used on Win32... (see + localcharset.c). + + * glib/makefile.mingw.in: Add gdir. + + * glib/glib.def: Add g_dir_* entry points. + Sun Nov 4 20:45:21 2001 Owen Taylor <otaylor@redhat.com> * configure.in (CFLAGS): Add check for dirent.h diff --git a/README.win32 b/README.win32 index c6f6da0ac..ffd6f4220 100644 --- a/README.win32 +++ b/README.win32 @@ -1,7 +1,7 @@ General ======= -For more information about the port or GLib, GTk+ and the GIMP to +For more information about the port or GLib, GTK+ and the GIMP to native Windows, and pre-built binaries (DLLs), surf to http://www.gimp.org/win32/ . "Native" means that we use the Win32 API only, and no POSIX (Unix) emulation layer except that provided by the @@ -19,8 +19,7 @@ related to Win32: - G_OS_WIN32 is defined when compiling for Win32, *and* without any POSIX emulation, other that to the extent provided by the - bundled Microsoft C library (msvcrt.dll) and the pthreads-win32 - library. For instance, pathnames are in the native Windows syntax. + bundled Microsoft C library (msvcrt.dll). - G_WITH_CYGWIN is defined if compiling for the Cygwin environment. Note that G_OS_WIN32 is *not* defined in that case, as @@ -32,7 +31,7 @@ related to Win32: The Win32 port of GLib and related software uses only G_OS_WIN32. As G_OS_WIN32 is defined in glibconfig.h, it is available to all source -files that use GLib (or GTk+, which uses GLib). +files that use GLib (or GTK+, which uses GLib). Additionally, there are the compiler-specific macros: - __GNUC__ is defined when using GCC @@ -40,12 +39,12 @@ Additionally, there are the compiler-specific macros: G_OS_WIN32 implies using the Microsoft C runtime MSVCRT.DLL. GLib is not known to work with the older CRTDLL.DLL runtime, or the static -Microsoft C runtime libraries. +Microsoft C runtime libraries LIBC.LIB and LIBCMT.LIB. -Building software that use GLib or GTk+ +Building software that use GLib or GTK+ ======================================= -Even building software that just *use* GLib or GTk+ also require to +Even building software that just *use* GLib or GTK+ also require to have the right compiler set up the right way, so if you intend to use gcc, follow the relevant instructions below in that case, too. diff --git a/glib-zip.in b/glib-zip.in index 1faca690d..4e01e860c 100755 --- a/glib-zip.in +++ b/glib-zip.in @@ -1,31 +1,38 @@ #!/bin/sh -# Build zipfile for GLib on Win32: both runtime and developer stuff +# Build zipfiles for GLib on Win32: Separate runtime and developer ones. # After running make install, run this. -# These paths obviously are system-dependent: -ZIP=/g/tmp/glib-@GLIB_VERSION@.zip -cd /target +ZIP=/tmp/glib-@GLIB_VERSION@.zip +DEVZIP=/tmp/glib-dev-@GLIB_VERSION@.zip + +cd @prefix@ rm $ZIP zip -r $ZIP -@ <<EOF COPYING.LIB-2 +bin/gspawn-win32-helper.exe +lib/libglib-1.3-@LT_CURRENT_MINUS_AGE@.dll +lib/libgmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll +lib/libgobject-1.3-@LT_CURRENT_MINUS_AGE@.dll +lib/libgthread-1.3-@LT_CURRENT_MINUS_AGE@.dll +EOF + +zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo + +rm $DEVZIP +zip -r $DEVZIP -@ <<EOF bin/glib-genmarshal.exe bin/glib-gettextize bin/glib-mkenums bin/gobject-query.exe -bin/gspawn-win32-helper.exe include/glib-2.0 -lib/libglib-1.3-@LT_CURRENT_MINUS_AGE@.dll lib/libglib-1.3.dll.a lib/glib-1.3.lib -lib/libgmodule-1.3-@LT_CURRENT_MINUS_AGE@.dll lib/libgmodule-1.3.dll.a lib/gmodule-1.3.lib -lib/libgobject-1.3-@LT_CURRENT_MINUS_AGE@.dll lib/libgobject-1.3.dll.a lib/gobject-1.3.lib -lib/libgthread-1.3-@LT_CURRENT_MINUS_AGE@.dll lib/libgthread-1.3.dll.a lib/gthread-1.3.lib lib/glib-2.0 @@ -39,4 +46,3 @@ man/man1/glib-mkenums.1 man/man1/glib-genmarshal.1 EOF -zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo diff --git a/glib/glib.def b/glib/glib.def index cab33c0c4..dd03f15bf 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -141,6 +141,10 @@ EXPORTS g_date_valid_month g_date_valid_weekday g_date_valid_year + g_dir_close + g_dir_open + g_dir_read_name + g_dir_rewind g_direct_equal g_direct_hash g_error_copy diff --git a/glib/libcharset/config.charset b/glib/libcharset/config.charset index 0b1f2db17..f4f2611c5 100755 --- a/glib/libcharset/config.charset +++ b/glib/libcharset/config.charset @@ -274,7 +274,7 @@ case "$os" in # BeOS has a single locale, and it has UTF-8 encoding. echo "* UTF-8" ;; - msdosdjgpp*|mingw*) + msdosdjgpp*) # DJGPP 2.03 doesn't have nl_langinfo(CODESET); therefore # localcharset.c falls back to using the full locale name # from the environment variables. diff --git a/glib/makefile.mingw.in b/glib/makefile.mingw.in index 4da9506b5..c48dd3b6b 100644 --- a/glib/makefile.mingw.in +++ b/glib/makefile.mingw.in @@ -31,6 +31,7 @@ glib_OBJECTS = \ gconvert.o \ gdataset.o \ gdate.o \ + gdir.o \ gerror.o \ gfileutils.o \ ghash.o \ |