]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
build: Add Windows-format metainfo also to libgettextlib and libgettextsrc.
authorBruno Haible <bruno@clisp.org>
Sun, 29 Sep 2024 18:49:51 +0000 (20:49 +0200)
committerBruno Haible <bruno@clisp.org>
Sun, 29 Sep 2024 23:56:57 +0000 (01:56 +0200)
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.

.gitignore
gettext-runtime/intl/libintl.rc
gettext-runtime/libasprintf/libasprintf.rc
gettext-tools/gnulib-lib/Makefile.am
gettext-tools/gnulib-lib/libgettextlib.rc [new file with mode: 0644]
gettext-tools/libgettextpo/libgettextpo.rc
gettext-tools/src/Makefile.am
gettext-tools/src/libgettextsrc.rc [new file with mode: 0644]
libtextstyle/lib/libtextstyle.rc
windows/gettext.rc

index 71aba41e98b23d6a0a77a5b3e71a1f0ce587487b..04c65990d2cae9de18342463252d9d8fdec6d87b 100644 (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
index 25224183bcac7748683f7cd23008fcd72782dd8b..8deb649951af240df6d11b47383a52f48f5c70bc 100644 (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"
index 7502e50721f20f3ba1fc70f49715eb6c0f4ebad5..32a9a5f13a1ccb3f55fb53cc60ffdf83982bf96d 100644 (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"
index 79f5d4d49de82c4febdaba91edb4ce65a136d23e..a7fa494fa6e0a6b8a3d1c2a56c5fdd41c31d238d 100644 (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
diff --git a/gettext-tools/gnulib-lib/libgettextlib.rc b/gettext-tools/gnulib-lib/libgettextlib.rc
new file mode 100644 (file)
index 0000000..f2b12d3
--- /dev/null
@@ -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
index 1b6fb690767c3d6d4ce616973e6d8aff9e26f6ed..4cc772d5fead956cbd1a7aa35bf9560648d50913 100644 (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"
index d99da82aba77148cd7ab34873ade7438f044ea56..07392c1bef2651856b9691fd5bd64a424c85959a 100644 (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
diff --git a/gettext-tools/src/libgettextsrc.rc b/gettext-tools/src/libgettextsrc.rc
new file mode 100644 (file)
index 0000000..cb318d6
--- /dev/null
@@ -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
index 4536676e4748093da21ae2cc135d09a402dfc4bb..6c3a999972a60bea40df160ac59bd3b71bb6d08c 100644 (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"
index 800d1b21362b618c64f084f3e67d38b923f1c992..8356be6d1c28753a75722e356934307203076e80 100644 (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"