Copy more files from lib/libexec

mlocati · Oct 24, 2024 · 71d1652 · 71d1652
1 parent 773e4cf
commit 71d1652
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/build-exe/create-output.sh b/build-exe/create-output.sh
@@ -83,23 +83,18 @@ find "$SOURCE/bin/" -type f \( -name '*.exe' -o -name '*.dll' \) -print0 | while
     copyFile "$i"
 done
 if [ -d "$SOURCE/lib/" ]; then
-    find "$SOURCE/lib/" -type f \( -name '*.exe' -o -name '*.dll' \) -print0 | while IFS= read -r -d '' i; do
+    find "$SOURCE/lib/" -type f -print0 | while IFS= read -r -d '' i; do
         case "$i" in
-            */hostname.exe | */urlget.exe) ;;
+            *.dll.a | *.la) ;;
             *)
                 copyFile "$i"
                 ;;
         esac
     done
 fi
 if [ -d "$SOURCE/libexec/" ]; then
-    find "$SOURCE/libexec/" -type f \( -name '*.exe' -o -name '*.dll' \) -print0 | while IFS= read -r -d '' i; do
-        case "$i" in
-            */hostname.exe | */urlget.exe) ;;
-            *)
-                copyFile "$i"
-                ;;
-        esac
+    find "$SOURCE/libexec/" -type f -print0 | while IFS= read -r -d '' i; do
+        copyFile "$i"
     done
 fi
 if [ -f "$SOURCE/lib/charset.alias" ]; then

diff --git a/signpath/artifact-configuration/gh_sign_files-0.22.xml b/signpath/artifact-configuration/gh_sign_files-0.22.xml
@@ -42,6 +42,8 @@
             <include path="bin/recode-sr-latin.exe" min-matches="1" max-matches="1" product-name="GNU gettext utilities" product-version="${gettextPEVersion}" />
             <include path="bin/xgettext.exe" min-matches="1" max-matches="1" product-name="GNU gettext utilities" product-version="${gettextPEVersion}" />
             <include path="lib/gettext/cldr-plurals.exe" min-matches="1" max-matches="1" product-name="GNU gettext utilities" product-version="${gettextPEVersion}" />
+            <include path="lib/gettext/hostname.exe" min-matches="1" max-matches="1" product-name="GNU gettext utilities" product-version="${gettextPEVersion}" />
+            <include path="lib/gettext/urlget.exe" min-matches="1" max-matches="1" product-name="GNU gettext utilities" product-version="${gettextPEVersion}" />
             <!-- Missing metadata: see https://savannah.gnu.org/bugs/?66267
             <include path="bin/libgettextlib-*.dll" min-matches="0" max-matches="1" product-name="${gettextPENameLibGettextLib}" product-version="${gettextPEVersionLibGettextLib}" />
             <include path="bin/libgettextsrc-*.dll" min-matches="0" max-matches="1" product-name="${gettextPENameLibGettextSrc}" product-version="${gettextPEVersionLibGettextSrc}" />

diff --git a/signpath/artifact-configuration/gh_sign_files-0.23.xml b/signpath/artifact-configuration/gh_sign_files-0.23.xml
@@ -44,6 +44,8 @@
             <include path="bin/recode-sr-latin.exe" min-matches="1" max-matches="1" product-name="GNU gettext utilities" product-version="${gettextPEVersion}" />
             <include path="bin/xgettext.exe" min-matches="1" max-matches="1" product-name="GNU gettext utilities" product-version="${gettextPEVersion}" />
             <include path="libexec/gettext/cldr-plurals.exe" min-matches="1" max-matches="1" product-name="GNU gettext utilities" product-version="${gettextPEVersion}" />
+            <include path="libexec/gettext/hostname.exe" min-matches="1" max-matches="1" product-name="GNU gettext utilities" product-version="${gettextPEVersion}" />
+            <include path="libexec/gettext/urlget.exe" min-matches="1" max-matches="1" product-name="GNU gettext utilities" product-version="${gettextPEVersion}" />
             <!-- Missing metadata: see https://lists.gnu.org/archive/html/bug-gettext/2024-10/msg00058.html
             <include path="lib/gettext/GNU.Gettext.dll" min-matches="0" max-matches="1" product-name="" product-version="0.0.0.0" />
             <include path="lib/gettext/msgfmt.net.exe" min-matches="0" max-matches="1" product-name="" product-version="0.0.0.0" />