build: Add Windows-format metainfo also to libgettextlib and libgettextsrc.

Reported by Michele Locati <mlocati@gmail.com>
at <https://savannah.gnu.org/bugs/index.php?66267>.

* gettext-tools/gnulib-lib/libgettextlib.rc: New file.
* gettext-tools/gnulib-lib/Makefile.am (EXTRA_DIST): Add it.
(WOE32_LIBADD): New macro.
(libgettextlib.res.lo): New rule.
(libgettextlib_la_LIBADD, libgettextlib_la_DEPENDENCIES): Add the .res.lo file.
* gettext-tools/src/libgettextsrc.rc: New file.
* gettext-tools/src/Makefile.am (EXTRA_DIST): Add it.
(WOE32_LIBADD): New macro.
(libgettextsrc.res.lo): New rule.
(libgettextsrc_la_LIBADD, libgettextsrc_la_DEPENDENCIES): New macros.
* gettext-runtime/intl/libintl.rc: Update copyright year.
* gettext-runtime/libasprintf/libasprintf.rc: Likewise.
* gettext-tools/libgettextpo/libgettextpo.rc: Likewise.
* libtextstyle/lib/libtextstyle.rc: Likewise.
* windows/gettext.rc: Likewise.
This commit is contained in:
Bruno Haible 2024-09-29 20:49:51 +02:00
parent 23b3c788d4
commit a411f51af0
10 changed files with 141 additions and 8 deletions

1
.gitignore vendored
View File

@ -48,6 +48,7 @@
/gettext-tools/gnulib-m4/
/gettext-tools/gnulib-lib/
!/gettext-tools/gnulib-lib/Makefile.am
!/gettext-tools/gnulib-lib/libgettextlib.rc
/gettext-tools/gnulib-tests/
!/gettext-tools/gnulib-tests/ChangeLog.0
!/gettext-tools/gnulib-tests/Makefile.am

View File

@ -19,12 +19,12 @@ BEGIN
BEGIN
BLOCK "04090000" /* Lang = US English, Charset = ASCII */
BEGIN
VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License. You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <https://www.gnu.org/licenses/>.\0"
VALUE "Comments", "This library is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License. You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <https://www.gnu.org/licenses/>.\0"
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "LGPLed libintl for Windows\0"
VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
VALUE "InternalName", "intl.dll\0"
VALUE "LegalCopyright", "Copyright (C) 1995-2019\0"
VALUE "LegalCopyright", "Copyright (C) 1995-2024\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "intl.dll\0"
VALUE "ProductName", "GNU libintl: accessing NLS message catalogs\0"

View File

@ -19,12 +19,12 @@ BEGIN
BEGIN
BLOCK "04090000" /* Lang = US English, Charset = ASCII */
BEGIN
VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License. You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <https://www.gnu.org/licenses/>.\0"
VALUE "Comments", "This library is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License. You should have received a copy of the GNU Lesser General Public License along with this library; if not, see <https://www.gnu.org/licenses/>.\0"
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "LGPLed libasprintf for Windows\0"
VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
VALUE "InternalName", "asprintf.dll\0"
VALUE "LegalCopyright", "Copyright (C) 2002-2019\0"
VALUE "LegalCopyright", "Copyright (C) 2002-2024\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "asprintf.dll\0"
VALUE "ProductName", "GNU libasprintf: automatic formatted output\0"

View File

@ -60,6 +60,34 @@ AM_CFLAGS = @WARN_CFLAGS@
# Rules generated and collected by gnulib-tool.
include Makefile.gnulib
# Version information according to Woe32 conventions.
EXTRA_DIST += libgettextlib.rc
if WOE32
WOE32_LIBADD = libgettextlib.res.lo
# This rule is executed only on Woe32 systems.
# Use $(RC) with libtool, $(WINDRES) when not using libtool.
# The following sed expressions come from the windres-options script. They are
# inlined here, so that they can be written in a Makefile without requiring a
# temporary file. They must contain literal newlines rather than semicolons,
# so that they work with the sed-3.02 that is shipped with MSYS.
libgettextlib.res.lo: $(srcdir)/libgettextlib.rc
nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
$(LIBTOOL) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) \
"-DPACKAGE_VERSION_STRING=\\\"$(VERSION)\\\"" \
"-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_major"` \
"-DPACKAGE_VERSION_MINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_minor"` \
"-DPACKAGE_VERSION_SUBMINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_subminor"` \
-i $(srcdir)/libgettextlib.rc -o libgettextlib.res.lo --output-format=coff
MOSTLYCLEANFILES += libgettextlib.res.lo
else
WOE32_LIBADD =
endif
libgettextlib_la_LIBADD += $(WOE32_LIBADD)
libgettextlib_la_DEPENDENCIES += $(WOE32_LIBADD)
# OS/2 does not support a DLL name longer than 8 characters.
if OS2
libgettextlib_la_LDFLAGS += -os2dllname gtlib

View File

@ -0,0 +1,38 @@
/* Resources for gettextlib.dll */
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION PACKAGE_VERSION_MAJOR,PACKAGE_VERSION_MINOR,PACKAGE_VERSION_SUBMINOR,0
PRODUCTVERSION PACKAGE_VERSION_MAJOR,PACKAGE_VERSION_MINOR,PACKAGE_VERSION_SUBMINOR,0
FILEFLAGSMASK 0x3fL /* VS_FFI_FILEFLAGSMASK */
#ifdef _DEBUG
FILEFLAGS 0x1L /* VS_FF_DEBUG */
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x10004L /* VOS_DOS_WINDOWS32 */
FILETYPE 0x1L /* VFT_APP */
FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "04090000" /* Lang = US English, Charset = ASCII */
BEGIN
VALUE "Comments", "This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License. You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.\0"
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GPLed library for Windows\0"
VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
VALUE "InternalName", "gettextlib.dll\0"
VALUE "LegalCopyright", "Copyright (C) 1995-2024\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "gettextlib.dll\0"
VALUE "ProductName", "GNU gettext utilities\0"
VALUE "ProductVersion", PACKAGE_VERSION_STRING "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0409, 0 /* US English, ASCII */
END
END

View File

@ -24,7 +24,7 @@ BEGIN
VALUE "FileDescription", "GPLed libgettextpo for Windows\0"
VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
VALUE "InternalName", "gettextpo.dll\0"
VALUE "LegalCopyright", "Copyright (C) 1995-2019\0"
VALUE "LegalCopyright", "Copyright (C) 1995-2024\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "gettextpo.dll\0"
VALUE "ProductName", "GNU libgettextpo: public API for PO files\0"

View File

@ -352,6 +352,34 @@ MOSTLYCLEANFILES += textstyle.h textstyle/stdbool.h textstyle/version.h textstyl
LT_LIBTEXTSTYLE = ../../libtextstyle/lib/libtextstyle.la
endif
# Version information according to Woe32 conventions.
EXTRA_DIST += libgettextsrc.rc
if WOE32
WOE32_LIBADD = libgettextsrc.res.lo
# This rule is executed only on Woe32 systems.
# Use $(RC) with libtool, $(WINDRES) when not using libtool.
# The following sed expressions come from the windres-options script. They are
# inlined here, so that they can be written in a Makefile without requiring a
# temporary file. They must contain literal newlines rather than semicolons,
# so that they work with the sed-3.02 that is shipped with MSYS.
libgettextsrc.res.lo: $(srcdir)/libgettextsrc.rc
nlinit=`echo 'nl="'; echo '"'`; eval "$$nlinit"; \
sed_extract_major='/^[0-9]/{'$${nl}'s/^\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
sed_extract_minor='/^[0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
sed_extract_subminor='/^[0-9][0-9]*[.][0-9][0-9]*[.][0-9]/{'$${nl}'s/^[0-9]*[.][0-9]*[.]\([0-9]*\).*/\1/p'$${nl}q$${nl}'}'$${nl}'c\'$${nl}0$${nl}q; \
$(LIBTOOL) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) \
"-DPACKAGE_VERSION_STRING=\\\"$(VERSION)\\\"" \
"-DPACKAGE_VERSION_MAJOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_major"` \
"-DPACKAGE_VERSION_MINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_minor"` \
"-DPACKAGE_VERSION_SUBMINOR="`echo '$(VERSION)' | sed -n -e "$$sed_extract_subminor"` \
-i $(srcdir)/libgettextsrc.rc -o libgettextsrc.res.lo --output-format=coff
MOSTLYCLEANFILES += libgettextsrc.res.lo
else
WOE32_LIBADD =
endif
libgettextsrc_la_LIBADD = $(WOE32_LIBADD)
libgettextsrc_la_DEPENDENCIES = $(WOE32_LIBADD)
# How to build libgettextsrc.la.
# Need ../gnulib-lib/libgettextlib.la.
# Need $(LTLIBUNISTRING) because ulc_width_linebreaks, uc_width, etc. may be

View File

@ -0,0 +1,38 @@
/* Resources for gettextsrc.dll */
#include <winver.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION PACKAGE_VERSION_MAJOR,PACKAGE_VERSION_MINOR,PACKAGE_VERSION_SUBMINOR,0
PRODUCTVERSION PACKAGE_VERSION_MAJOR,PACKAGE_VERSION_MINOR,PACKAGE_VERSION_SUBMINOR,0
FILEFLAGSMASK 0x3fL /* VS_FFI_FILEFLAGSMASK */
#ifdef _DEBUG
FILEFLAGS 0x1L /* VS_FF_DEBUG */
#else
FILEFLAGS 0x0L
#endif
FILEOS 0x10004L /* VOS_DOS_WINDOWS32 */
FILETYPE 0x1L /* VFT_APP */
FILESUBTYPE 0x0L /* VFT2_UNKNOWN */
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "04090000" /* Lang = US English, Charset = ASCII */
BEGIN
VALUE "Comments", "This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License. You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.\0"
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GPLed library for Windows\0"
VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
VALUE "InternalName", "gettextsrc.dll\0"
VALUE "LegalCopyright", "Copyright (C) 1995-2024\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "gettextsrc.dll\0"
VALUE "ProductName", "GNU gettext utilities\0"
VALUE "ProductVersion", PACKAGE_VERSION_STRING "\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x0409, 0 /* US English, ASCII */
END
END

View File

@ -19,12 +19,12 @@ BEGIN
BEGIN
BLOCK "04090000" /* Lang = US English, Charset = ASCII */
BEGIN
VALUE "Comments", "This library is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 or later. You should have received a copy of the GNU General Public License along with this library; if not, see <https://www.gnu.org/licenses/>\0"
VALUE "Comments", "This library is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3 or later. You should have received a copy of the GNU General Public License along with this library; if not, see <https://www.gnu.org/licenses/>\0"
VALUE "CompanyName", "Free Software Foundation\0"
VALUE "FileDescription", "GPLed libtextstyle for Windows\0"
VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
VALUE "InternalName", "textstyle.dll\0"
VALUE "LegalCopyright", "Copyright (C) 2006-2019\0"
VALUE "LegalCopyright", "Copyright (C) 2006-2024\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "textstyle.dll\0"
VALUE "ProductName", "GNU libtextstyle: Text styling library\0"

View File

@ -24,7 +24,7 @@ BEGIN
VALUE "FileDescription", "GPLed program for Windows\0"
VALUE "FileVersion", PACKAGE_VERSION_STRING "\0"
VALUE "InternalName", "*.exe\0"
VALUE "LegalCopyright", "Copyright (C) 1995-2019\0"
VALUE "LegalCopyright", "Copyright (C) 1995-2024\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "*.exe\0"
VALUE "ProductName", "GNU gettext utilities\0"