mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-09-20 01:06:15 +02:00
New files, for putting version info in the DLLs on Win32.
2000-02-05 Tor Lillqvist <tml@iki.fi> * glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting version info in the DLLs on Win32. * Makefile.am: Generate corresponding *.rc files and distribute them. * makefile.cygwin.in: Add rules to automatically bump a "build number" in the version info in the rc files each time the DLL is built. But do this only for the person who releases binaries. If others build the DLLs, the build number is set to zero.
This commit is contained in:
Tor Lillqvist
Tor Lillqvist
parent
bbb532d59c
commit
2701653ce5
13
ChangeLog
13
ChangeLog
@ -1,3 +1,16 @@
|
||||
2000-02-05 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting
|
||||
version info in the DLLs on Win32.
|
||||
|
||||
* Makefile.am: Generate corresponding *.rc files and distribute
|
||||
them.
|
||||
|
||||
* makefile.cygwin.in: Add rules to automatically bump a "build
|
||||
number" in the version info in the rc files each time the DLL is
|
||||
built. But do this only for the person who releases binaries. If
|
||||
others build the DLLs, the build number is set to zero.
|
||||
|
||||
Fri Feb 4 19:36:05 2000 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
2000-02-05 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting
|
||||
version info in the DLLs on Win32.
|
||||
|
||||
* Makefile.am: Generate corresponding *.rc files and distribute
|
||||
them.
|
||||
|
||||
* makefile.cygwin.in: Add rules to automatically bump a "build
|
||||
number" in the version info in the rc files each time the DLL is
|
||||
built. But do this only for the person who releases binaries. If
|
||||
others build the DLLs, the build number is set to zero.
|
||||
|
||||
Fri Feb 4 19:36:05 2000 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
2000-02-05 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting
|
||||
version info in the DLLs on Win32.
|
||||
|
||||
* Makefile.am: Generate corresponding *.rc files and distribute
|
||||
them.
|
||||
|
||||
* makefile.cygwin.in: Add rules to automatically bump a "build
|
||||
number" in the version info in the rc files each time the DLL is
|
||||
built. But do this only for the person who releases binaries. If
|
||||
others build the DLLs, the build number is set to zero.
|
||||
|
||||
Fri Feb 4 19:36:05 2000 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
2000-02-05 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting
|
||||
version info in the DLLs on Win32.
|
||||
|
||||
* Makefile.am: Generate corresponding *.rc files and distribute
|
||||
them.
|
||||
|
||||
* makefile.cygwin.in: Add rules to automatically bump a "build
|
||||
number" in the version info in the rc files each time the DLL is
|
||||
built. But do this only for the person who releases binaries. If
|
||||
others build the DLLs, the build number is set to zero.
|
||||
|
||||
Fri Feb 4 19:36:05 2000 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
2000-02-05 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting
|
||||
version info in the DLLs on Win32.
|
||||
|
||||
* Makefile.am: Generate corresponding *.rc files and distribute
|
||||
them.
|
||||
|
||||
* makefile.cygwin.in: Add rules to automatically bump a "build
|
||||
number" in the version info in the rc files each time the DLL is
|
||||
built. But do this only for the person who releases binaries. If
|
||||
others build the DLLs, the build number is set to zero.
|
||||
|
||||
Fri Feb 4 19:36:05 2000 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
2000-02-05 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting
|
||||
version info in the DLLs on Win32.
|
||||
|
||||
* Makefile.am: Generate corresponding *.rc files and distribute
|
||||
them.
|
||||
|
||||
* makefile.cygwin.in: Add rules to automatically bump a "build
|
||||
number" in the version info in the rc files each time the DLL is
|
||||
built. But do this only for the person who releases binaries. If
|
||||
others build the DLLs, the build number is set to zero.
|
||||
|
||||
Fri Feb 4 19:36:05 2000 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
2000-02-05 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting
|
||||
version info in the DLLs on Win32.
|
||||
|
||||
* Makefile.am: Generate corresponding *.rc files and distribute
|
||||
them.
|
||||
|
||||
* makefile.cygwin.in: Add rules to automatically bump a "build
|
||||
number" in the version info in the rc files each time the DLL is
|
||||
built. But do this only for the person who releases binaries. If
|
||||
others build the DLLs, the build number is set to zero.
|
||||
|
||||
Fri Feb 4 19:36:05 2000 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
2000-02-05 Tor Lillqvist <tml@iki.fi>
|
||||
|
||||
* glib.rc.in gmodule.rc.in gthread.rc.in: New files, for putting
|
||||
version info in the DLLs on Win32.
|
||||
|
||||
* Makefile.am: Generate corresponding *.rc files and distribute
|
||||
them.
|
||||
|
||||
* makefile.cygwin.in: Add rules to automatically bump a "build
|
||||
number" in the version info in the rc files each time the DLL is
|
||||
built. But do this only for the person who releases binaries. If
|
||||
others build the DLLs, the build number is set to zero.
|
||||
|
||||
Fri Feb 4 19:36:05 2000 Tim Janik <timj@gtk.org>
|
||||
|
||||
* glib.h:
|
||||
|
||||
14
Makefile.am
14
Makefile.am
@ -23,7 +23,10 @@ EXTRA_DIST = \
|
||||
glibconfig.h.win32 \
|
||||
gwin32.c \
|
||||
config.h.win32 \
|
||||
build-dll
|
||||
build-dll \
|
||||
glib.rc \
|
||||
gmodule.rc \
|
||||
gthread.rc
|
||||
|
||||
lib_LTLIBRARIES = libglib.la
|
||||
|
||||
@ -103,6 +106,15 @@ makefile.msc: $(top_builddir)/config.status $(top_srcdir)/makefile.msc.in
|
||||
makefile.cygwin: $(top_builddir)/config.status $(top_srcdir)/makefile.cygwin.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule.rc.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread.rc.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
.PHONY: files release sanity snapshot
|
||||
|
||||
files:
|
||||
|
||||
3106
configure.in
3106
configure.in
File diff suppressed because it is too large
Load Diff
30
glib.rc.in
Normal file
30
glib.rc.in
Normal file
@ -0,0 +1,30 @@
|
||||
#include <winver.h>
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,BUILDNUMBER
|
||||
PRODUCTVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,0
|
||||
FILEFLAGSMASK 0
|
||||
FILEFLAGS 0
|
||||
FILEOS VOS__WINDOWS32
|
||||
FILETYPE VFT_DLL
|
||||
FILESUBTYPE VFT2_UNKNOWN
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904B0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "The GLib developer community"
|
||||
VALUE "FileDescription", "GLib"
|
||||
VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
|
||||
VALUE "InternalName", "glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@"
|
||||
VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GLib Team and others 1997-2000."
|
||||
VALUE "OriginalFilename", "glib-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.dll"
|
||||
VALUE "ProductName", "GLib"
|
||||
VALUE "ProductVersion", "@GLIB_VERSION@"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
@ -23,7 +23,10 @@ EXTRA_DIST = \
|
||||
glibconfig.h.win32 \
|
||||
gwin32.c \
|
||||
config.h.win32 \
|
||||
build-dll
|
||||
build-dll \
|
||||
glib.rc \
|
||||
gmodule.rc \
|
||||
gthread.rc
|
||||
|
||||
lib_LTLIBRARIES = libglib.la
|
||||
|
||||
@ -103,6 +106,15 @@ makefile.msc: $(top_builddir)/config.status $(top_srcdir)/makefile.msc.in
|
||||
makefile.cygwin: $(top_builddir)/config.status $(top_srcdir)/makefile.cygwin.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
glib.rc: $(top_builddir)/config.status $(top_srcdir)/glib.rc.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
gmodule.rc: $(top_builddir)/config.status $(top_srcdir)/gmodule.rc.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
gthread.rc: $(top_builddir)/config.status $(top_srcdir)/gthread.rc.in
|
||||
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
||||
|
||||
.PHONY: files release sanity snapshot
|
||||
|
||||
files:
|
||||
|
||||
30
gmodule.rc.in
Normal file
30
gmodule.rc.in
Normal file
@ -0,0 +1,30 @@
|
||||
#include <winver.h>
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,BUILDNUMBER
|
||||
PRODUCTVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,0
|
||||
FILEFLAGSMASK 0
|
||||
FILEFLAGS 0
|
||||
FILEOS VOS__WINDOWS32
|
||||
FILETYPE VFT_DLL
|
||||
FILESUBTYPE VFT2_UNKNOWN
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904B0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "The GLib developer community"
|
||||
VALUE "FileDescription", "GLib"
|
||||
VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
|
||||
VALUE "InternalName", "gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@"
|
||||
VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GLib Team and others 1997-2000."
|
||||
VALUE "OriginalFilename", "gmodule-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.dll"
|
||||
VALUE "ProductName", "GLib"
|
||||
VALUE "ProductVersion", "@GLIB_VERSION@"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
30
gthread.rc.in
Normal file
30
gthread.rc.in
Normal file
@ -0,0 +1,30 @@
|
||||
#include <winver.h>
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,BUILDNUMBER
|
||||
PRODUCTVERSION @GLIB_MAJOR_VERSION@,@GLIB_MINOR_VERSION@,@GLIB_MICRO_VERSION@,0
|
||||
FILEFLAGSMASK 0
|
||||
FILEFLAGS 0
|
||||
FILEOS VOS__WINDOWS32
|
||||
FILETYPE VFT_DLL
|
||||
FILESUBTYPE VFT2_UNKNOWN
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904B0"
|
||||
BEGIN
|
||||
VALUE "CompanyName", "The GLib developer community"
|
||||
VALUE "FileDescription", "GLib"
|
||||
VALUE "FileVersion", "@GLIB_VERSION@.BUILDNUMBER"
|
||||
VALUE "InternalName", "gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@"
|
||||
VALUE "LegalCopyright", "Copyright © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald. Modified by the GLib Team and others 1997-2000."
|
||||
VALUE "OriginalFilename", "gthread-@GLIB_MAJOR_VERSION@.@GLIB_MINOR_VERSION@.dll"
|
||||
VALUE "ProductName", "GLib"
|
||||
VALUE "ProductVersion", "@GLIB_VERSION@"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1200
|
||||
END
|
||||
END
|
||||
@ -1,5 +1,5 @@
|
||||
## Makefile for building the GLib, gmodule and gthread DLLs with
|
||||
## egcs on cygwin.
|
||||
## gcc on cygwin or mingw32.
|
||||
## Use: make -f makefile.cygwin install
|
||||
|
||||
# Change this to wherever you want to install the DLLs. This directory
|
||||
@ -21,8 +21,6 @@ OPTIMIZE = -g -O
|
||||
|
||||
CC = gcc -mno-cygwin -mpentium -fnative-struct
|
||||
|
||||
CP = cp
|
||||
LD = ld
|
||||
DLLTOOL = dlltool
|
||||
INSTALL = install
|
||||
|
||||
@ -75,16 +73,39 @@ glib_OBJECTS = \
|
||||
gstrfuncs.o \
|
||||
gscanner.o \
|
||||
gutils.o \
|
||||
gwin32.o
|
||||
gwin32.o \
|
||||
glib-win32res.o
|
||||
|
||||
glib-$(GLIB_VER).dll : $(glib_OBJECTS) glib.def
|
||||
./build-dll glib $(GLIB_VER) glib.def $(glib_OBJECTS) -luser32 -lwsock32
|
||||
|
||||
# Kludge to get the path to the win32 headers
|
||||
WIN32APIHEADERS = $(shell echo "\#include <winver.h>" | $(CC) -M -E - | tail -1 | sed -e 's!/winver.h!!')
|
||||
|
||||
# The *.stamp files aren't distributed. Thus, this takes care of only
|
||||
# tml building libraries with nonzero build number.
|
||||
|
||||
ifeq ($(wildcard glib-build.stamp),glib-build.stamp)
|
||||
# Bump the build number
|
||||
glib-build.tmp :
|
||||
bash -c "read number && echo $$[number+1]" <glib-build.stamp >glib-build.tmp
|
||||
cp glib-build.tmp glib-build.stamp
|
||||
else
|
||||
# Use zero as build number.
|
||||
glib-build.tmp :
|
||||
echo 0 >glib-build.tmp
|
||||
endif
|
||||
|
||||
%-win32res.o : %.rc %-build.tmp
|
||||
m4 -DBUILDNUMBER=`cat $*-build.tmp` <$*.rc >$*-win32res.rc
|
||||
windres --include-dir $(WIN32APIHEADERS) $*-win32res.rc $*-win32res.o
|
||||
rm $*-build.tmp $*-win32res.rc
|
||||
|
||||
glibconfig.h: glibconfig.h.win32
|
||||
$(CP) glibconfig.h.win32 glibconfig.h
|
||||
cp glibconfig.h.win32 glibconfig.h
|
||||
|
||||
config.h: config.h.win32
|
||||
$(CP) config.h.win32 config.h
|
||||
cp config.h.win32 config.h
|
||||
|
||||
.SUFFIXES: .c .o .i
|
||||
|
||||
@ -95,7 +116,19 @@ config.h: config.h.win32
|
||||
$(CC) $(CFLAGS) -E -DGLIB_COMPILATION -DG_LOG_DOMAIN=g_log_domain_glib $< >$@
|
||||
|
||||
gmodule_OBJECTS = \
|
||||
gmodule.o
|
||||
gmodule.o \
|
||||
gmodule-win32res.o
|
||||
|
||||
# Unfortunately I couldn't use a pattern rule for this, so copy-paste
|
||||
# from above.
|
||||
ifeq ($(wildcard glib-build.stamp),glib-build.stamp)
|
||||
gmodule-build.tmp :
|
||||
bash -c "read number && echo $$[number+1]" <gmodule-build.stamp >gmodule-build.tmp
|
||||
cp gmodule-build.tmp gmodule-build.stamp
|
||||
else
|
||||
gmodule-build.tmp :
|
||||
echo 0 >gmodule-build.tmp
|
||||
endif
|
||||
|
||||
gmodule-$(GLIB_VER).dll : $(gmodule_OBJECTS) gmodule/gmodule.def
|
||||
./build-dll gmodule $(GLIB_VER) gmodule/gmodule.def $(gmodule_OBJECTS) -L. -lglib-$(GLIB_VER) -lwsock32
|
||||
@ -104,10 +137,21 @@ gmodule.o : gmodule/gmodule.c gmodule/gmodule-win32.c
|
||||
$(CC) $(CFLAGS) -Igmodule -c -DG_LOG_DOMAIN=g_log_domain_gmodule gmodule/gmodule.c
|
||||
|
||||
gmodule/gmoduleconf.h: gmodule/gmoduleconf.h.win32
|
||||
$(CP) gmodule/gmoduleconf.h.win32 gmodule/gmoduleconf.h
|
||||
cp gmodule/gmoduleconf.h.win32 gmodule/gmoduleconf.h
|
||||
|
||||
gthread_OBJECTS = \
|
||||
gthread-impl.o
|
||||
gthread-impl.o \
|
||||
gthread-win32res.o
|
||||
|
||||
# Ditto copy-pasting
|
||||
ifeq ($(wildcard glib-build.stamp),glib-build.stamp)
|
||||
gthread-build.tmp :
|
||||
bash -c "read number && echo $$[number+1]" <gthread-build.stamp >gthread-build.tmp
|
||||
cp gthread-build.tmp gthread-build.stamp
|
||||
else
|
||||
gthread-build.tmp :
|
||||
echo 0 >gthread-build.tmp
|
||||
endif
|
||||
|
||||
gthread-$(GLIB_VER).dll : $(gthread_OBJECTS) glib-$(GLIB_VER).dll gthread/gthread.def
|
||||
./build-dll gthread $(GLIB_VER) gthread/gthread.def $(gthread_OBJECTS) -L. -lglib-$(GLIB_VER) $(PTHREAD_LIB)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user