From aa410edee6042a526559f0c534072013252cce52 Mon Sep 17 00:00:00 2001 From: Hans Breuer Date: Fri, 29 Oct 2004 20:58:04 +0000 Subject: [PATCH] updated [and finally fixed my script to produce ready to go de-in(ed) 2004-10-29 Hans Breuer * glibconfig.h */makefile.msc.in : updated [and finally fixed my script to produce ready to go de-in(ed) files, w/o autotools] * */*.rc.in : updated copyrights to 2004 * glib/gutils.c : some CSIDL_* defines lacking from older SDK; use the same fallback mecahnism as on *NIX where ever applicable --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-12 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ glib/glib.rc.in | 2 +- glib/gutils.c | 30 ++++++++++++++++++++---------- glib/makefile.msc.in | 18 +++++++++++++++--- glibconfig.h.win32.in | 4 +++- gmodule/gmodule.rc.in | 2 +- gmodule/makefile.msc.in | 7 +++++-- gobject/gobject.rc.in | 2 +- gobject/makefile.msc.in | 19 ++++++++++++++----- gthread/gthread.rc.in | 2 +- gthread/makefile.msc.in | 8 ++++++-- 15 files changed, 117 insertions(+), 27 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09f5489..8c3b566 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2004-10-29 Hans Breuer + + * glibconfig.h */makefile.msc.in : updated [and finally fixed my + script to produce ready to go de-in(ed) files, w/o autotools] + + * */*.rc.in : updated copyrights to 2004 + + * glib/gutils.c : some CSIDL_* defines lacking from older SDK; + use the same fallback mecahnism as on *NIX where ever applicable + 2004-10-29 Matthias Clasen * tests/option-test.c: Add tests for the handling of diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 09f5489..8c3b566 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2004-10-29 Hans Breuer + + * glibconfig.h */makefile.msc.in : updated [and finally fixed my + script to produce ready to go de-in(ed) files, w/o autotools] + + * */*.rc.in : updated copyrights to 2004 + + * glib/gutils.c : some CSIDL_* defines lacking from older SDK; + use the same fallback mecahnism as on *NIX where ever applicable + 2004-10-29 Matthias Clasen * tests/option-test.c: Add tests for the handling of diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 09f5489..8c3b566 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,13 @@ +2004-10-29 Hans Breuer + + * glibconfig.h */makefile.msc.in : updated [and finally fixed my + script to produce ready to go de-in(ed) files, w/o autotools] + + * */*.rc.in : updated copyrights to 2004 + + * glib/gutils.c : some CSIDL_* defines lacking from older SDK; + use the same fallback mecahnism as on *NIX where ever applicable + 2004-10-29 Matthias Clasen * tests/option-test.c: Add tests for the handling of diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 09f5489..8c3b566 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +2004-10-29 Hans Breuer + + * glibconfig.h */makefile.msc.in : updated [and finally fixed my + script to produce ready to go de-in(ed) files, w/o autotools] + + * */*.rc.in : updated copyrights to 2004 + + * glib/gutils.c : some CSIDL_* defines lacking from older SDK; + use the same fallback mecahnism as on *NIX where ever applicable + 2004-10-29 Matthias Clasen * tests/option-test.c: Add tests for the handling of diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 09f5489..8c3b566 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +2004-10-29 Hans Breuer + + * glibconfig.h */makefile.msc.in : updated [and finally fixed my + script to produce ready to go de-in(ed) files, w/o autotools] + + * */*.rc.in : updated copyrights to 2004 + + * glib/gutils.c : some CSIDL_* defines lacking from older SDK; + use the same fallback mecahnism as on *NIX where ever applicable + 2004-10-29 Matthias Clasen * tests/option-test.c: Add tests for the handling of diff --git a/glib/glib.rc.in b/glib/glib.rc.in index c5a02b8..7851411 100644 --- a/glib/glib.rc.in +++ b/glib/glib.rc.in @@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "GLib" VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER" VALUE "InternalName", "libglib-2.0-@LT_CURRENT_MINUS_AGE@" - VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GLib Team and others 1997-2000." + VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GLib Team and others 1997-2004." VALUE "OriginalFilename", "libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll" VALUE "ProductName", "GLib" VALUE "ProductVersion", "@GLIB_VERSION@" diff --git a/glib/gutils.c b/glib/gutils.c index 0fea41e..3a98543 100644 --- a/glib/gutils.c +++ b/glib/gutils.c @@ -75,6 +75,19 @@ #ifdef G_OS_WIN32 # include # include + /* older SDK (e.g. msvc 5.0) does not have these*/ +# ifndef CSIDL_INTERNET_CACHE +# define CSIDL_INTERNET_CACHE 32 +# endif +# ifndef CSIDL_COMMON_APPDATA +# define CSIDL_COMMON_APPDATA 35 +# endif +# ifndef CSIDL_COMMON_DOCUMENTS +# define CSIDL_COMMON_DOCUMENTS 46 +# endif +# ifndef CSIDL_PROFILE +# define CSIDL_PROFILE 40 +# endif #endif #ifdef HAVE_CODESET @@ -937,10 +950,7 @@ get_special_folder (int csidl) } CoTaskMemFree (pidl); } - if (retval == NULL) - return "C:\\"; - else - return retval; + return retval; } #endif @@ -1008,7 +1018,7 @@ g_get_any_init (void) if (!g_home_dir) g_home_dir = get_special_folder (CSIDL_PROFILE); - + if (!g_home_dir) { /* At least at some time, HOMEDRIVE and HOMEPATH were used @@ -1368,6 +1378,7 @@ g_get_user_data_dir (void) data_dir = get_special_folder (CSIDL_PERSONAL); #else data_dir = (gchar *) g_getenv ("XDG_DATA_HOME"); +#endif if (data_dir && data_dir[0]) data_dir = g_strdup (data_dir); @@ -1379,7 +1390,7 @@ g_get_user_data_dir (void) data_dir = g_build_filename (g_home_dir, ".local", "share", NULL); } -#endif + g_user_data_dir = data_dir; } else @@ -1417,7 +1428,8 @@ g_get_user_config_dir (void) config_dir = get_special_folder (CSIDL_APPDATA); #else config_dir = (gchar *) g_getenv ("XDG_CONFIG_HOME"); - +#endif + if (config_dir && config_dir[0]) config_dir = g_strdup (config_dir); else @@ -1427,7 +1439,6 @@ g_get_user_config_dir (void) config_dir = g_build_filename (g_home_dir, ".config", NULL); } -#endif g_user_config_dir = config_dir; } else @@ -1465,7 +1476,7 @@ g_get_user_cache_dir (void) cache_dir = get_special_folder (CSIDL_INTERNET_CACHE); /* XXX correct? */ #else cache_dir = (gchar *) g_getenv ("XDG_CACHE_HOME"); - +#endif if (cache_dir && cache_dir[0]) cache_dir = g_strdup (cache_dir); else @@ -1475,7 +1486,6 @@ g_get_user_cache_dir (void) cache_dir = g_build_filename (g_home_dir, ".cache", NULL); } -#endif g_user_cache_dir = cache_dir; } else diff --git a/glib/makefile.msc.in b/glib/makefile.msc.in index 77a77d1..a0c75b0 100644 --- a/glib/makefile.msc.in +++ b/glib/makefile.msc.in @@ -40,6 +40,7 @@ glib_OBJECTS = \ gfileutils.obj \ ghash.obj \ ghook.obj \ + gkeyfile.obj \ giochannel.obj \ giowin32.obj \ glist.obj \ @@ -60,6 +61,7 @@ glib_OBJECTS = \ gshell.obj \ gslist.obj \ gspawn-win32.obj \ + gstdio.obj \ gstrfuncs.obj \ gstring.obj \ gthread.obj \ @@ -81,9 +83,19 @@ glib_OBJECTS = \ ..\config.h: ..\config.h.win32 copy ..\config.h.win32 ..\config.h +galias.h: glib.symbols + perl makegalias.pl < glib.symbols > galias.h + localcharset.c : libcharset/localcharset.c copy libcharset\localcharset.c localcharset.c +glib.def: glib.symbols + echo EXPORTS > glib.def + cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 -DINCLUDE_INTERNAL_SYMBOLS glib.symbols >> glib.def + +glib.res : glib.rc + rc -DBUILDNUMBER=0 -r -fo glib.res glib.rc + ################ glib # create a static libary @@ -91,9 +103,9 @@ localcharset.c : libcharset/localcharset.c glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(glib_OBJECTS) gnulib\gnulib.lib lib /out:glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib $(glib_OBJECTS) gnulib\gnulib.lib -libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) gnulib\gnulib.lib glib.def - $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) $(LIBICONV_LIBS) $(INTL_LIBS) \ - gnulib\gnulib.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def +libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(glib_OBJECTS) gnulib\gnulib.lib glib.def glib.res + $(CC) $(CFLAGS) -LD -Fe$@ $(glib_OBJECTS) glib.res $(LIBICONV_LIBS) $(INTL_LIBS) \ + gnulib\gnulib.lib $(DIRENT_LIBS) user32.lib advapi32.lib shell32.lib wsock32.lib ole32.lib $(LDFLAGS) /implib:glib-2.0.lib /def:glib.def gspawn-win32-helper.exe : gspawn-win32-helper.c libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll $(CC) $(CFLAGS) -Fe$@ -DG_LOG_DOMAIN=\"gspawn-win32-helper\" gspawn-win32-helper.c glib-2.0.lib $(LDFLAGS) /subsystem:windows user32.lib diff --git a/glibconfig.h.win32.in b/glibconfig.h.win32.in index 84ddda2..14008ba 100644 --- a/glibconfig.h.win32.in +++ b/glibconfig.h.win32.in @@ -8,7 +8,9 @@ #define __G_LIBCONFIG_H__ #include - +#ifndef __GNUC__ +#define G_GNUC_INTERNAL /* wont have that */ +#endif #include #include diff --git a/gmodule/gmodule.rc.in b/gmodule/gmodule.rc.in index 757ce52..0a3ae0a 100644 --- a/gmodule/gmodule.rc.in +++ b/gmodule/gmodule.rc.in @@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "GModule" VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER" VALUE "InternalName", "libgmodule-2.0-@LT_CURRENT_MINUS_AGE@" - VALUE "LegalCopyright", "Copyright © 1998-2000 Tim Janik. Modified by the GLib Team and others 1998-2000." + VALUE "LegalCopyright", "Copyright © 1998-2000 Tim Janik. Modified by the GLib Team and others 1998-2004." VALUE "OriginalFilename", "libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll" VALUE "ProductName", "GLib" VALUE "ProductVersion", "@GLIB_VERSION@" diff --git a/gmodule/makefile.msc.in b/gmodule/makefile.msc.in index a819169..da36511 100644 --- a/gmodule/makefile.msc.in +++ b/gmodule/makefile.msc.in @@ -20,8 +20,11 @@ gmodule_OBJECTS = \ gmoduleconf.h: gmoduleconf.h.win32 copy gmoduleconf.h.win32 gmoduleconf.h -libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gmodule_OBJECTS) gmodule.def - $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) \ +gmodule.res : gmodule.rc + rc -DBUILDNUMBER=0 -r -fo gmodule.res gmodule.rc + +libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gmodule_OBJECTS) gmodule.def gmodule.res + $(CC) $(CFLAGS) -LD -Fe$@ $(gmodule_OBJECTS) gmodule.res \ ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gmodule-2.0.lib /def:gmodule.def clean:: diff --git a/gobject/gobject.rc.in b/gobject/gobject.rc.in index b88dce5..0f489d3 100644 --- a/gobject/gobject.rc.in +++ b/gobject/gobject.rc.in @@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "GObject" VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER" VALUE "InternalName", "libgobject-2.0-@LT_CURRENT_MINUS_AGE@" - VALUE "LegalCopyright", "Copyright © 1998-2000 Tim Janik and Red Hat, Inc." + VALUE "LegalCopyright", "Copyright © 1998-2004 Tim Janik and Red Hat, Inc." VALUE "OriginalFilename", "libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll" VALUE "ProductName", "GLib" VALUE "ProductVersion", "@GLIB_VERSION@" diff --git a/gobject/makefile.msc.in b/gobject/makefile.msc.in index 2d06e60..54f99ff 100644 --- a/gobject/makefile.msc.in +++ b/gobject/makefile.msc.in @@ -21,8 +21,7 @@ all : \ gobject-query.exe \ libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll \ gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib \ - testgobject.exe \ - testoverride.exe + testgobject.exe gobject_OBJECTS = \ gboxed.obj \ @@ -41,6 +40,16 @@ gobject_OBJECTS = \ gvaluetypes.obj \ gvaluetransform.obj +gobjectalias.h: gobject.symbols + perl makegobjectalias.pl < gobject.symbols > gobjectalias.h + +gobject.def: gobject.symbols + echo EXPORTS > gobject.def + cl /EP -DINCLUDE_VARIABLES -DG_OS_WIN32 gobject.symbols >> gobject.def + +gobject.res : gobject.rc + rc -DBUILDNUMBER=0 -r -fo gobject.res gobject.rc + gmarshal.h : gmarshal.list glib-genmarshal.exe echo #ifndef __G_MARSHAL_H__ > xgen-gmh echo #define __G_MARSHAL_H__ >> xgen-gmh @@ -51,8 +60,8 @@ gmarshal.h : gmarshal.list glib-genmarshal.exe gmarshal.c: gmarshal.list gmarshal.h glib-genmarshal.exe glib-genmarshal --nostdinc --prefix=g_cclosure_marshal gmarshal.list --body > gmarshal.c -libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gobject_OBJECTS) gobject.def - $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) \ +libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gobject_OBJECTS) gobject.def gobject.res + $(CC) $(CFLAGS) -Fm -LD -Fe$@ $(gobject_OBJECTS) gobject.res \ ..\glib\glib-2.0.lib $(LDFLAGS) /implib:gobject-2.0.lib /def:gobject.def gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(gobject_OBJECTS) @@ -61,7 +70,7 @@ gobject-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib : $(gobject_OBJECTS) # link glib's static version to avoid installing glib-genmarshal.exe : glib-genmarshal.c gmarshal.strings $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION glib-genmarshal.c \ - ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib user32.lib advapi32.lib $(INTL_LIBS) $(LIBICONV_LIBS) + ..\glib\glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@s.lib user32.lib advapi32.lib ole32.lib shell32.lib $(INTL_LIBS) $(LIBICONV_LIBS) gobject-query.exe : gobject-query.c libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll $(CC) -Fe$@ $(CFLAGS) -UGOBJECT_COMPILATION gobject-query.c \ diff --git a/gthread/gthread.rc.in b/gthread/gthread.rc.in index caa7095..3a9e2da 100644 --- a/gthread/gthread.rc.in +++ b/gthread/gthread.rc.in @@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", "GThread" VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER" VALUE "InternalName", "libgthread-2.0-@LT_CURRENT_MINUS_AGE@" - VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Copyright © 1998 Sebastian Wilhelmi. Modified by the GLib Team and others 1997-2000." + VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Copyright © 1998 Sebastian Wilhelmi. Modified by the GLib Team and others 1997-2004." VALUE "OriginalFilename", "libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll" VALUE "ProductName", "GLib" VALUE "ProductVersion", "@GLIB_VERSION@" diff --git a/gthread/makefile.msc.in b/gthread/makefile.msc.in index 2905b01..c672e29 100644 --- a/gthread/makefile.msc.in +++ b/gthread/makefile.msc.in @@ -18,5 +18,9 @@ gthread_OBJECTS = \ gthread-impl.obj : gthread-impl.c gthread-win32.c $(CC) -c $(CFLAGS) gthread-impl.c -libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def - $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) ..\glib\glib-2.0.lib $(DEPCLIBS) $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def +gthread.res : gthread.rc + rc -DBUILDNUMBER=0 -r -fo gthread.res gthread.rc + +libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll : $(gthread_OBJECTS) gthread.def gthread.res + $(CC) $(CFLAGS) -LD -Fe$@ $(gthread_OBJECTS) gthread.res \ + ..\glib\glib-2.0.lib $(DEPCLIBS) $(LDFLAGS) /implib:gthread-2.0.lib /def:gthread.def -- 2.7.4