From a0781a1747e01fa776c75e61d4a165d55fe6d29e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 29 Oct 2001 22:33:34 +0000 Subject: [PATCH] New file, used to build distribution packages for Windows. 2001-10-30 Tor Lillqvist * glib-zip.in: New file, used to build distribution packages for Windows. * configure.in: Expand it. * Makefile.am: Distribute it. * config.h.win32.in: Update to match currently produced config.h --- ChangeLog | 11 +++++++++++ ChangeLog.pre-2-0 | 11 +++++++++++ ChangeLog.pre-2-10 | 11 +++++++++++ ChangeLog.pre-2-12 | 11 +++++++++++ ChangeLog.pre-2-2 | 11 +++++++++++ ChangeLog.pre-2-4 | 11 +++++++++++ ChangeLog.pre-2-6 | 11 +++++++++++ ChangeLog.pre-2-8 | 11 +++++++++++ Makefile.am | 4 +++- config.h.win32.in | 15 +++++++++++++++ configure.in | 1 + glib-zip.in | 42 ++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 149 insertions(+), 1 deletion(-) create mode 100755 glib-zip.in diff --git a/ChangeLog b/ChangeLog index c09eb29..5413138 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2001-10-30 Tor Lillqvist + + * glib-zip.in: New file, used to build distribution packages for + Windows. + + * configure.in: Expand it. + + * Makefile.am: Distribute it. + + * config.h.win32.in: Update to match currently produced config.h + 2001-10-29 Daniel Egger * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c09eb29..5413138 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,14 @@ +2001-10-30 Tor Lillqvist + + * glib-zip.in: New file, used to build distribution packages for + Windows. + + * configure.in: Expand it. + + * Makefile.am: Distribute it. + + * config.h.win32.in: Update to match currently produced config.h + 2001-10-29 Daniel Egger * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c09eb29..5413138 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,14 @@ +2001-10-30 Tor Lillqvist + + * glib-zip.in: New file, used to build distribution packages for + Windows. + + * configure.in: Expand it. + + * Makefile.am: Distribute it. + + * config.h.win32.in: Update to match currently produced config.h + 2001-10-29 Daniel Egger * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index c09eb29..5413138 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,14 @@ +2001-10-30 Tor Lillqvist + + * glib-zip.in: New file, used to build distribution packages for + Windows. + + * configure.in: Expand it. + + * Makefile.am: Distribute it. + + * config.h.win32.in: Update to match currently produced config.h + 2001-10-29 Daniel Egger * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c09eb29..5413138 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,14 @@ +2001-10-30 Tor Lillqvist + + * glib-zip.in: New file, used to build distribution packages for + Windows. + + * configure.in: Expand it. + + * Makefile.am: Distribute it. + + * config.h.win32.in: Update to match currently produced config.h + 2001-10-29 Daniel Egger * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c09eb29..5413138 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,14 @@ +2001-10-30 Tor Lillqvist + + * glib-zip.in: New file, used to build distribution packages for + Windows. + + * configure.in: Expand it. + + * Makefile.am: Distribute it. + + * config.h.win32.in: Update to match currently produced config.h + 2001-10-29 Daniel Egger * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c09eb29..5413138 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,14 @@ +2001-10-30 Tor Lillqvist + + * glib-zip.in: New file, used to build distribution packages for + Windows. + + * configure.in: Expand it. + + * Makefile.am: Distribute it. + + * config.h.win32.in: Update to match currently produced config.h + 2001-10-29 Daniel Egger * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c09eb29..5413138 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,14 @@ +2001-10-30 Tor Lillqvist + + * glib-zip.in: New file, used to build distribution packages for + Windows. + + * configure.in: Expand it. + + * Makefile.am: Distribute it. + + * config.h.win32.in: Update to match currently produced config.h + 2001-10-29 Daniel Egger * glib/gbacktrace.h: Fix non-Intel/-Alpha version of the diff --git a/Makefile.am b/Makefile.am index f23a226..bd402b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,6 +12,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \ EXTRA_DIST = \ ChangeLog.pre-1-2 \ glib.spec.in \ + glib-zip.in \ NEWS.pre-1-3 \ acglib.m4 \ sanity_check \ @@ -35,7 +36,8 @@ EXTRA_DIST = \ BUILT_EXTRA_DIST = \ glibconfig.h.win32 \ config.h.win32 \ - glib.spec + glib.spec \ + glib-zip configexecincludedir = $(libdir)/glib-2.0/include #configexecinclude_DATA = glibconfig.h diff --git a/config.h.win32.in b/config.h.win32.in index e9ea947..dad493d 100644 --- a/config.h.win32.in +++ b/config.h.win32.in @@ -180,6 +180,15 @@ /* Define if you have the header file. */ /* #undef HAVE_INTTYPES_H */ +/* Define if you have and nl_langinfo(CODESET). */ +/* #undef HAVE_LANGINFO_CODESET */ + +/* Define if you have the header file. */ +/* #undef HAVE_LANGINFO_H */ + +/* Define if your file defines LC_MESSAGES. */ +/* #undef HAVE_LC_MESSAGES */ + /* Define if you have the header file. */ #define HAVE_LIMITS_H 1 @@ -213,6 +222,9 @@ /* Define if you have the `nanosleep' function. */ /* #undef HAVE_NANOSLEEP */ +/* Define if you have the `nl_langinfo' function. */ +/* #undef HAVE_NL_LANGINFO */ + /* Define if you have the header file. */ /* #undef HAVE_NL_TYPES_H */ @@ -246,6 +258,9 @@ /* Define if you have the `setlocale' function. */ #define HAVE_SETLOCALE 1 +/* Define if you have the header file. */ +#define HAVE_STDDEF_H 1 + /* Define if you have the header file. */ #ifndef _MSC_VER #define HAVE_STDINT_H 1 diff --git a/configure.in b/configure.in index 2d76e9a..96f01c5 100644 --- a/configure.in +++ b/configure.in @@ -2144,6 +2144,7 @@ gthread-2.0-uninstalled.pc gobject-2.0.pc gobject-2.0-uninstalled.pc glib.spec +glib-zip glib-gettextize Makefile build/Makefile diff --git a/glib-zip.in b/glib-zip.in new file mode 100755 index 0000000..1faca69 --- /dev/null +++ b/glib-zip.in @@ -0,0 +1,42 @@ +#!/bin/sh + +# Build zipfile for GLib on Win32: both runtime and developer stuff +# After running make install, run this. + +# These paths obviously are system-dependent: +ZIP=/g/tmp/glib-@GLIB_VERSION@.zip +cd /target + +rm $ZIP +zip -r $ZIP -@ <