Ticket #4619: mc-4619-autogen.sh-improve-potfiles_in-creating.patch

File mc-4619-autogen.sh-improve-potfiles_in-creating.patch, 2.9 KB (added by and, 3 weeks ago)

  • autogen.sh 

    From 65a7fe564d7043e93d8676adbe582ef3891ebd78 Mon Sep 17 00:00:00 2001
From: Andreas Mohr <and@gmx.li>
Date: Tue, 17 Dec 2024 15:00:00 +0000
Subject: [PATCH] (autogen.sh) improve POTFILES.in creating

 - current POTFILES.in file detection can output wrong filename
     xgettext output
     #: src/background.c:221 src/filemanager/file.c:858 src/filemanager/file.c:952
     result in
     src/background.csrc/filemanager/file.csrc/filemanager/file.c
 - simplify POTFILES.in file detection by using grep only
 - find command search files only
 - find/grep option should be Solaris OS friendly (please verify)
 - move POTFILES.in creating to configure.ac (more BUILD friendly and future autogen.sh get rid possibility)
 - autoconf AC_CONFIG_COMMANDS_POST support since <2.64
 - comparing current vs simplify grep file detection result in additional files:
    lib/search/regex.c
    lib/widget/history.c
    lib/widget/quick.h
    src/diffviewer/internal.h
    src/diffviewer/search.c
    src/editor/editdraw.c
    src/editor/etags.c
    src/filemanager/command.c
    src/vfs/tar/tar.c
    src/viewer/lib.c
    tests/src/execute__common.c
    tests/src/execute__execute_with_vfs_arg.c

Signed-off-by: Andreas Mohr <and@gmx.li>
---
 autogen.sh               | 11 -----------
 configure.ac             |  4 ++++
 po/create-potfiles_in.sh |  7 +++++++
 3 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100755 po/create-potfiles_in.sh

diff --git a/autogen.sh b/autogen.sh
index a37064c6a..4639915bb 100755
    a b ${AUTORECONF:-autoreconf} --verbose --install --force -I m4 ${AUTORECONF_FLAGS} 
    1313# Customize the INSTALL file 
    1414rm -f INSTALL && ln -s doc/INSTALL . 
    1515 
    16 # Generate po/POTFILES.in 
    17 if ! xgettext -h 2>&1 | grep -- '--keyword' >/dev/null ; then 
    18   echo "gettext is unable to extract translations, set XGETTEXT to GNU gettext!" >&2 
    19   touch po/POTFILES.in 
    20 else 
    21   ${XGETTEXT:-xgettext} --keyword=_ --keyword=N_ --keyword=Q_ --output=- \ 
    22         `find . -name '*.[ch]'` | ${SED-sed} -ne '/^#:/{s/#://;s/:[0-9]*/\ 
    23 /g;s/ //g;p;}' | \ 
    24         grep -v '^$' | sort | uniq >po/POTFILES.in 
    25 fi 
    26  
    2716"$srcdir/version.sh" "$srcdir" 
    2817 
    2918if test -x "$srcdir/configure.mc"; then 

  • configure.ac 

    diff --git a/configure.ac b/configure.ac
index a3761a4ee..4883def37 100644
    a b tests/src/vfs/extfs/helpers-list/misc/Makefile 
    736736tests/src/vfs/ftpfs/Makefile 
    737737]) 
    738738 
     739AC_CONFIG_COMMANDS_POST([ 
     740"${srcdir}"/po/create-potfiles_in.sh "${srcdir}" 
     741]) 
     742 
    739743AC_OUTPUT 
    740744 
    741745AC_MSG_NOTICE([ 

  • new file po/create-potfiles_in.sh 

    diff --git a/po/create-potfiles_in.sh b/po/create-potfiles_in.sh
new file mode 100755
index 000000000..5f36d2907
    - +  
     1#!/bin/sh 
     2set -e 
     3 
     4if [ -z "$1" ] ;then 
     5    echo "usage: $0 <toplevel-source-dir>" 
     6    exit 1 
     7fi 
     8 
     9cd "$1" && \ 
     10    "${FIND:-find}" . -type f -name '*.[ch]' -exec \ 
     11    "${GREP:-grep}" -l '_\s*(\s*"' {} + | \ 
     12    "${SORT:-sort}" | "${UNIQ:-uniq}" > po/POTFILES.in