Hacky script to fix up your .msc.in files on windows. Dunno if this is a

2001-08-04  Alexander Larsson   <alexl@redhat.com>

	* 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.
This commit is contained in:
Alexander Larsson 2001-08-04 15:49:55 +00:00 committed by Alexander Larsson
parent 1ff027aa2d
commit 3339995d87
12 changed files with 203 additions and 6 deletions

View File

@ -1,3 +1,21 @@
2001-08-04 Alexander Larsson <alexl@redhat.com>
* 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 <rsteinke@w-link.net>
* glib/giochannel.c: Fixed g_io_channel_seek_position()

View File

@ -1,3 +1,21 @@
2001-08-04 Alexander Larsson <alexl@redhat.com>
* 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 <rsteinke@w-link.net>
* glib/giochannel.c: Fixed g_io_channel_seek_position()

View File

@ -1,3 +1,21 @@
2001-08-04 Alexander Larsson <alexl@redhat.com>
* 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 <rsteinke@w-link.net>
* glib/giochannel.c: Fixed g_io_channel_seek_position()

View File

@ -1,3 +1,21 @@
2001-08-04 Alexander Larsson <alexl@redhat.com>
* 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 <rsteinke@w-link.net>
* glib/giochannel.c: Fixed g_io_channel_seek_position()

View File

@ -1,3 +1,21 @@
2001-08-04 Alexander Larsson <alexl@redhat.com>
* 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 <rsteinke@w-link.net>
* glib/giochannel.c: Fixed g_io_channel_seek_position()

View File

@ -1,3 +1,21 @@
2001-08-04 Alexander Larsson <alexl@redhat.com>
* 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 <rsteinke@w-link.net>
* glib/giochannel.c: Fixed g_io_channel_seek_position()

View File

@ -1,3 +1,21 @@
2001-08-04 Alexander Larsson <alexl@redhat.com>
* 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 <rsteinke@w-link.net>
* glib/giochannel.c: Fixed g_io_channel_seek_position()

View File

@ -1,3 +1,21 @@
2001-08-04 Alexander Larsson <alexl@redhat.com>
* 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 <rsteinke@w-link.net>
* glib/giochannel.c: Fixed g_io_channel_seek_position()

View File

@ -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

View File

@ -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

View File

@ -0,0 +1,9 @@
#!/usr/bin/perl
open (List, "gmarshal.list");
while (<List>) {
next unless /^[A-Z]/;
s/^/"g_cclosure_marshal_/; s/:/__/; s/,/_/g; s/$/",/;
print;
}

35
win32-fixup.pl Normal file
View File

@ -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 (<INPUT>) {
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");