From 3339995d877c825b22b344bda079fa3a05db55b4 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Sat, 4 Aug 2001 15:49:55 +0000 Subject: [PATCH] Hacky script to fix up your .msc.in files on windows. Dunno if this is a 2001-08-04 Alexander Larsson * win32-fixup.pl: Hacky script to fix up your .msc.in files on windows. Dunno if this is a good solution yet. * build/win32/module.defs: Back down libiconv version to 1.3, since that is what tor distributes. * glib/glib.def: Update * gobject/makefile.msc.in: build gobject-query.exe and gmarshal.strings, add libiconv dependency to linklines. * gobject/marshal-genstrings.pl: New file. perl script to generate gmarshal.strings. --- ChangeLog | 18 ++++++++++++++++++ ChangeLog.pre-2-0 | 18 ++++++++++++++++++ ChangeLog.pre-2-10 | 18 ++++++++++++++++++ ChangeLog.pre-2-12 | 18 ++++++++++++++++++ ChangeLog.pre-2-2 | 18 ++++++++++++++++++ ChangeLog.pre-2-4 | 18 ++++++++++++++++++ ChangeLog.pre-2-6 | 18 ++++++++++++++++++ ChangeLog.pre-2-8 | 18 ++++++++++++++++++ glib/glib.def | 1 - gobject/makefile.msc.in | 20 +++++++++++++++----- gobject/marshal-genstrings.pl | 9 +++++++++ win32-fixup.pl | 35 +++++++++++++++++++++++++++++++++++ 12 files changed, 203 insertions(+), 6 deletions(-) create mode 100644 gobject/marshal-genstrings.pl create mode 100644 win32-fixup.pl diff --git a/ChangeLog b/ChangeLog index 2d7822c..58ffb78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,21 @@ +2001-08-04 Alexander Larsson + + * win32-fixup.pl: + Hacky script to fix up your .msc.in files on windows. + Dunno if this is a good solution yet. + + * build/win32/module.defs: + Back down libiconv version to 1.3, since that is what tor distributes. + + * glib/glib.def: + Update + + * gobject/makefile.msc.in: + build gobject-query.exe and gmarshal.strings, add libiconv dependency to linklines. + + * gobject/marshal-genstrings.pl: + New file. perl script to generate gmarshal.strings. + 2001-08-03 Ron Steinke * glib/giochannel.c: Fixed g_io_channel_seek_position() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2d7822c..58ffb78 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,21 @@ +2001-08-04 Alexander Larsson + + * win32-fixup.pl: + Hacky script to fix up your .msc.in files on windows. + Dunno if this is a good solution yet. + + * build/win32/module.defs: + Back down libiconv version to 1.3, since that is what tor distributes. + + * glib/glib.def: + Update + + * gobject/makefile.msc.in: + build gobject-query.exe and gmarshal.strings, add libiconv dependency to linklines. + + * gobject/marshal-genstrings.pl: + New file. perl script to generate gmarshal.strings. + 2001-08-03 Ron Steinke * glib/giochannel.c: Fixed g_io_channel_seek_position() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2d7822c..58ffb78 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,21 @@ +2001-08-04 Alexander Larsson + + * win32-fixup.pl: + Hacky script to fix up your .msc.in files on windows. + Dunno if this is a good solution yet. + + * build/win32/module.defs: + Back down libiconv version to 1.3, since that is what tor distributes. + + * glib/glib.def: + Update + + * gobject/makefile.msc.in: + build gobject-query.exe and gmarshal.strings, add libiconv dependency to linklines. + + * gobject/marshal-genstrings.pl: + New file. perl script to generate gmarshal.strings. + 2001-08-03 Ron Steinke * glib/giochannel.c: Fixed g_io_channel_seek_position() diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2d7822c..58ffb78 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,21 @@ +2001-08-04 Alexander Larsson + + * win32-fixup.pl: + Hacky script to fix up your .msc.in files on windows. + Dunno if this is a good solution yet. + + * build/win32/module.defs: + Back down libiconv version to 1.3, since that is what tor distributes. + + * glib/glib.def: + Update + + * gobject/makefile.msc.in: + build gobject-query.exe and gmarshal.strings, add libiconv dependency to linklines. + + * gobject/marshal-genstrings.pl: + New file. perl script to generate gmarshal.strings. + 2001-08-03 Ron Steinke * glib/giochannel.c: Fixed g_io_channel_seek_position() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2d7822c..58ffb78 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,21 @@ +2001-08-04 Alexander Larsson + + * win32-fixup.pl: + Hacky script to fix up your .msc.in files on windows. + Dunno if this is a good solution yet. + + * build/win32/module.defs: + Back down libiconv version to 1.3, since that is what tor distributes. + + * glib/glib.def: + Update + + * gobject/makefile.msc.in: + build gobject-query.exe and gmarshal.strings, add libiconv dependency to linklines. + + * gobject/marshal-genstrings.pl: + New file. perl script to generate gmarshal.strings. + 2001-08-03 Ron Steinke * glib/giochannel.c: Fixed g_io_channel_seek_position() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2d7822c..58ffb78 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,21 @@ +2001-08-04 Alexander Larsson + + * win32-fixup.pl: + Hacky script to fix up your .msc.in files on windows. + Dunno if this is a good solution yet. + + * build/win32/module.defs: + Back down libiconv version to 1.3, since that is what tor distributes. + + * glib/glib.def: + Update + + * gobject/makefile.msc.in: + build gobject-query.exe and gmarshal.strings, add libiconv dependency to linklines. + + * gobject/marshal-genstrings.pl: + New file. perl script to generate gmarshal.strings. + 2001-08-03 Ron Steinke * glib/giochannel.c: Fixed g_io_channel_seek_position() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2d7822c..58ffb78 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,21 @@ +2001-08-04 Alexander Larsson + + * win32-fixup.pl: + Hacky script to fix up your .msc.in files on windows. + Dunno if this is a good solution yet. + + * build/win32/module.defs: + Back down libiconv version to 1.3, since that is what tor distributes. + + * glib/glib.def: + Update + + * gobject/makefile.msc.in: + build gobject-query.exe and gmarshal.strings, add libiconv dependency to linklines. + + * gobject/marshal-genstrings.pl: + New file. perl script to generate gmarshal.strings. + 2001-08-03 Ron Steinke * glib/giochannel.c: Fixed g_io_channel_seek_position() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2d7822c..58ffb78 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,21 @@ +2001-08-04 Alexander Larsson + + * win32-fixup.pl: + Hacky script to fix up your .msc.in files on windows. + Dunno if this is a good solution yet. + + * build/win32/module.defs: + Back down libiconv version to 1.3, since that is what tor distributes. + + * glib/glib.def: + Update + + * gobject/makefile.msc.in: + build gobject-query.exe and gmarshal.strings, add libiconv dependency to linklines. + + * gobject/marshal-genstrings.pl: + New file. perl script to generate gmarshal.strings. + 2001-08-03 Ron Steinke * glib/giochannel.c: Fixed g_io_channel_seek_position() diff --git a/glib/glib.def b/glib/glib.def index bc5e421..f3d8c8f 100644 --- a/glib/glib.def +++ b/glib/glib.def @@ -419,7 +419,6 @@ EXPORTS g_scanner_scope_lookup_symbol g_scanner_scope_remove_symbol g_scanner_set_scope - g_scanner_stat_mode g_scanner_sync_file_offset g_scanner_unexp_token g_scanner_warn diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in index 81b4361..f418656 100644 --- a/gobject/makefile.msc.in +++ b/gobject/makefile.msc.in @@ -19,9 +19,10 @@ DEFINES = -DHAVE_CONFIG_H -DGOBJECT_COMPILATION -DG_LOG_DOMAIN=g_log_domain_grun # -DG_DISABLE_CAST_CHECKS all : \ - glib-genmarshal.exe \ - gmarshal.h \ - gmarshal.c \ + glib-genmarshal.exe \ + gobject-query.exe \ + gmarshal.h \ + gmarshal.c \ gobject-$(GLIB_VER).dll \ gobject-$(GLIB_VER)s.lib @@ -64,6 +65,15 @@ gobject-$(GLIB_VER)s.lib : $(gobject_OBJECTS) lib /out:gobject-$(GLIB_VER)s.lib $(gobject_OBJECTS) # link glib's static version to avoid installing -glib-genmarshal.exe : glib-genmarshal.c ..\glib\glib-$(GLIB_VER)s.lib +glib-genmarshal.exe : glib-genmarshal.c ..\glib\glib-$(GLIB_VER)s.lib gmarshal.strings $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \ - ..\glib\glib-$(GLIB_VER)s.lib user32.lib advapi32.lib $(INTL_LIBS) + ..\glib\glib-$(GLIB_VER)s.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS) + +gobject-query.exe : gobject-query.c ..\glib\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).dll + $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION gobject-query.c \ + ..\glib\glib-$(GLIB_VER).lib gobject-$(GLIB_VER).lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS) + +gmarshal.strings : gmarshal.list + perl marshal-genstrings.pl > gmarshal.strings + + diff --git a/gobject/marshal-genstrings.pl b/gobject/marshal-genstrings.pl new file mode 100644 index 0000000..93fceb4 --- /dev/null +++ b/gobject/marshal-genstrings.pl @@ -0,0 +1,9 @@ +#!/usr/bin/perl + +open (List, "gmarshal.list"); + +while () { + next unless /^[A-Z]/; + s/^/"g_cclosure_marshal_/; s/:/__/; s/,/_/g; s/$/",/; + print; +} diff --git a/win32-fixup.pl b/win32-fixup.pl new file mode 100644 index 0000000..cb1a7a8 --- /dev/null +++ b/win32-fixup.pl @@ -0,0 +1,35 @@ +#!/usr/bin/perl + +$major = 1; +$minor = 3; +$micro = 7; +$binary_age = 0; +$interface_age = 0; +$gettext_package = "glib20"; + +sub process_file +{ + my $outfilename = shift; + my $infilename = $outfilename . ".in"; + + open (INPUT, "< $infilename") || exit 1; + open (OUTPUT, "> $outfilename") || exit 1; + + while () { + s/\@GLIB_MAJOR_VERSION\@/$major/g; + s/\@GLIB_MINOR_VERSION\@/$minor/g; + s/\@GLIB_MICRO_VERSION\@/$micro/g; + s/\@GLIB_INTERFACE_AGE\@/$interface_age/g; + s/\@GLIB_BINARY_AGE\@/$binary_age/g; + s/\@GETTEXT_PACKAGE\@/$gettext_package/g; + print OUTPUT; + } +} + +process_file ("config.h.win32"); +process_file ("glibconfig.h.win32"); +process_file ("glib/makefile.msc"); +process_file ("gmodule/makefile.msc"); +process_file ("gobject/makefile.msc"); +process_file ("gthread/makefile.msc"); +process_file ("tests/makefile.msc"); -- 2.7.4