On 7/4/24 09:17, Collin Funk wrote:
As long as a
Python version ≥ 3.7 is installed everything should be fine on that
end:
Yes, though sometimes Python is misinstalled.
When I run "sh -x ./gnulib-tool --list", the last thing it does is:
exec /home/eggert/src/gnu/gnulib/./gnulib-tool.py --list
and when I run "sh -x /home/eggert/src/gnu/gnulib/./gnulib-tool.py
--list", the last thing it does is:
exec python3 /home/eggert/src/gnu/gnulib-savannah/./.gnulib-tool.py --list
so there should be not much going on other than running Python. Perhaps
the bug reporter could try running these "sh -x" commands and letting is
know what happens.
PS. There's a lot of machinery in those shell scripts for the minor
benefit of letting gnulib-tool be a symlink in your $PATH to the real
gnulib-tool. How about if we drop support for this? That'd simplify
startup quite a bit (if we're lucky it'll even fix the reporter's bug or
at least make it easier to diagnose), and there is a better way to get
the benefits of that minor feature that doesn't involve so much
problematic shell rigamarole.
Something like the attached patch, perhaps? I haven't installed it.
PPS. Why do we have both gnulib-tool.py and .gnulib-tool.py? Is this
commented in the source code?From 6e51dd21e8b62eb5dba5d2164d418fe22ee572a9 Mon Sep 17 00:00:00 2001
From: Paul Eggert <egg...@cs.ucla.edu>
Date: Thu, 4 Jul 2024 13:19:23 +0200
Subject: [PATCH] gnulib-tool: simplify startup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnulib-tool, gnulib-tool.py (func_readlink, func_gnulib_dir): Remove.
In main program, use shell substitution rather than external
programs, to reduce dependencies on external programs, to
simplify, and to speed things up a little.
* doc/gnulib-tool.texi (Invoking gnulib-tool): This means that we
no longer support the trick of putting a symlink to gnulib-tool
somewhere in your PATH, but it’s just as easy to put gnulib-tool
in your PATH so document that.
---
ChangeLog | 12 +++++
doc/gnulib-tool.texi | 6 +--
gnulib-tool | 113 ++++++-------------------------------------
gnulib-tool.py | 97 +++----------------------------------
4 files changed, 35 insertions(+), 193 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b19c2a482a..d9ddf46ce5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2024-07-04 Paul Eggert <egg...@cs.ucla.edu>
+
+ gnulib-tool: simplify startup
+ * gnulib-tool, gnulib-tool.py (func_readlink, func_gnulib_dir): Remove.
+ In main program, use shell substitution rather than external
+ programs, to reduce dependencies on external programs, to
+ simplify, and to speed things up a little.
+ * doc/gnulib-tool.texi (Invoking gnulib-tool): This means that we
+ no longer support the trick of putting a symlink to gnulib-tool
+ somewhere in your PATH, but it’s just as easy to put gnulib-tool
+ in your PATH so document that.
+
2024-07-03 Collin Funk <collin.fu...@gmail.com>
gitlog-to-changelog: Add a new --commit-timezone option.
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index 0f059e1287..a3b74830ef 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -24,11 +24,9 @@ simplifies the management of source files, @file{Makefile.am}s and
contained in the @code{PATH} variable. It needs to be run directly in
the directory that contains the Gnulib source code. You can do this
either by specifying the absolute filename of @file{gnulib-tool}, or
-you can also use a symbolic link from a place inside your @code{PATH}
-to the @file{gnulib-tool} file of your preferred and most up-to-date
-Gnulib checkout, like this:
+by putting the Gnulib source code directory in your @env{PATH}, like this:
@smallexample
-$ ln -s $HOME/gnu/src/gnulib.git/gnulib-tool $HOME/bin/gnulib-tool
+$ export PATH=$HOME/gnu/src/gnulib.git:$PATH
@end smallexample
Run @samp{gnulib-tool --help} for information. To get familiar with
diff --git a/gnulib-tool b/gnulib-tool
index 789fe916a8..0737945b12 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -50,110 +50,21 @@ func_fatal_error ()
func_exit 1
}
-# func_readlink SYMLINK
-# outputs the target of the given symlink.
-if (type readlink) > /dev/null 2>&1; then
- func_readlink ()
- {
- # Use the readlink program from GNU coreutils.
- readlink "$1"
- }
-else
- func_readlink ()
- {
- # Use two sed invocations. A single sed -n -e 's,^.* -> \(.*\)$,\1,p'
- # would do the wrong thing if the link target contains " -> ".
- LC_ALL=C ls -l "$1" | sed -e 's, -> ,#%%#,' | sed -n -e 's,^.*#%%#\(.*\)$,\1,p'
- }
-fi
-
-# func_gnulib_dir
-# locates the directory where the gnulib repository lives
-# Input:
-# - progname name of this program
-# Sets variables
-# - self_abspathname absolute pathname of gnulib-tool
-# - gnulib_dir absolute pathname of gnulib repository
-func_gnulib_dir ()
-{
- case "$progname" in
- /* | ?:*) self_abspathname="$progname" ;;
- */*) self_abspathname=`pwd`/"$progname" ;;
- *)
- # Look in $PATH.
- # Iterate through the elements of $PATH.
- # We use IFS=: instead of
- # for d in `echo ":$PATH:" | sed -e 's/:::*/:.:/g' | sed -e 's/:/ /g'`
- # because the latter does not work when some PATH element contains spaces.
- # We use a canonicalized $pathx instead of $PATH, because empty PATH
- # elements are by definition equivalent to '.', however field splitting
- # according to IFS=: loses empty fields in many shells:
- # - /bin/sh on OSF/1 and Solaris loses all empty fields (at the
- # beginning, at the end, and in the middle),
- # - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields
- # at the beginning and at the end,
- # - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX,
- # Solaris lose empty fields at the end.
- # The 'case' statement is an optimization, to avoid evaluating the
- # explicit canonicalization command when $PATH contains no empty fields.
- self_abspathname=
- if test "$PATH_SEPARATOR" = ";"; then
- # On Windows, programs are searched in "." before $PATH.
- pathx=".;$PATH"
- else
- # On Unix, we have to convert empty PATH elements to ".".
- pathx="$PATH"
- case :$PATH: in
- *::*)
- pathx=`echo ":$PATH:" | sed -e 's/:::*/:.:/g' -e 's/^://' -e 's/:\$//'`
- ;;
- esac
- fi
- saved_IFS="$IFS"
- IFS="$PATH_SEPARATOR"
- for d in $pathx; do
- IFS="$saved_IFS"
- test -z "$d" && d=.
- if test -x "$d/$progname" && test ! -d "$d/$progname"; then
- self_abspathname="$d/$progname"
- break
- fi
- done
- IFS="$saved_IFS"
- if test -z "$self_abspathname"; then
- func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?"
- fi
- ;;
- esac
- while test -h "$self_abspathname"; do
- # Resolve symbolic link.
- linkval=`func_readlink "$self_abspathname"`
- test -n "$linkval" || break
- case "$linkval" in
- /* | ?:* ) self_abspathname="$linkval" ;;
- * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
- esac
- done
- gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
-}
-
-func_gnulib_dir
-
case "$GNULIB_TOOL_IMPL" in
'')
# Use the Python implementation if a suitable Python version is found
# in $PATH. This is the same Python version test as in gnulib-tool.py.
if (python3 -c 'import sys; sys.exit(not sys.version_info >= (3,7))') 2>/dev/null; then
- exec "$gnulib_dir/gnulib-tool.py" "$@"
+ exec "$progname.py" "$@"
else
echo "gnulib-tool: warning: python3 not found or too old, using the slow shell-based implementation" 1>&2
- exec "$gnulib_dir/gnulib-tool.sh" "$@"
+ exec "$progname.sh" "$@"
fi
;;
sh)
- exec "$gnulib_dir/gnulib-tool.sh" "$@" ;;
+ exec "$progname.sh" "$@" ;;
py)
- exec "$gnulib_dir/gnulib-tool.py" "$@" ;;
+ exec "$progname.py" "$@" ;;
sh+py)
case " $* " in
*" --import"* | *" --add-import"* | *" --remove-import"* | *" --update"* | *" --copy-file"*)
@@ -183,10 +94,14 @@ case "$GNULIB_TOOL_IMPL" in
func_exit 1
}
# Execute gnulib-tool.py in the clone directory.
- (cd "$tmp" && "$gnulib_dir/gnulib-tool.py" "$@" >"$tmp-py-out" 2>"$tmp-py-err")
+ (case $progname in
+ /*) abs_progname=$progname ;;
+ *) abs_progname=$PWD/$progname ;;
+ esac
+ cd "$tmp" && "$abs_progname.py" "$@" >"$tmp-py-out" 2>"$tmp-py-err")
pyrc=$?
# Execute gnulib-tool.sh in the current directory.
- "$gnulib_dir/gnulib-tool.sh" "$@" >"$tmp-sh-out" 2>"$tmp-sh-err"
+ "$progname.sh" "$@" >"$tmp-sh-out" 2>"$tmp-sh-err"
shrc=$?
if test $shrc != 0; then
if test $pyrc = 0; then
@@ -233,10 +148,10 @@ case "$GNULIB_TOOL_IMPL" in
# Find another directory name.
tmp="$dir-glpy$$"
# Execute gnulib-tool.py, creating a different directory.
- "$gnulib_dir/gnulib-tool.py" "$@" --dir="$tmp" >"$tmp-py-out" 2>"$tmp-py-err"
+ "$progname.py" "$@" --dir="$tmp" >"$tmp-py-out" 2>"$tmp-py-err"
pyrc=$?
# Execute gnulib-tool.sh, creating the intended directory.
- "$gnulib_dir/gnulib-tool.sh" "$@" >"$tmp-sh-out" 2>"$tmp-sh-err"
+ "$progname.sh" "$@" >"$tmp-sh-out" 2>"$tmp-sh-err"
shrc=$?
if test $shrc != 0; then
if test $pyrc = 0; then
@@ -274,10 +189,10 @@ case "$GNULIB_TOOL_IMPL" in
# A gnulib-tool invocation that produces only output, no files.
tmp="glpy$$"
# Execute gnulib-tool.py.
- "$gnulib_dir/gnulib-tool.py" "$@" >"$tmp-py-out" 2>"$tmp-py-err"
+ "$progname.py" "$@" >"$tmp-py-out" 2>"$tmp-py-err"
pyrc=$?
# Execute gnulib-tool.sh.
- "$gnulib_dir/gnulib-tool.sh" "$@" >"$tmp-sh-out" 2>"$tmp-sh-err"
+ "$progname.sh" "$@" >"$tmp-sh-out" 2>"$tmp-sh-err"
shrc=$?
if test $shrc != 0; then
if test $pyrc = 0; then
diff --git a/gnulib-tool.py b/gnulib-tool.py
index 52389dcd78..6de6625d55 100755
--- a/gnulib-tool.py
+++ b/gnulib-tool.py
@@ -41,95 +41,6 @@
func_exit 1
}
-# func_readlink SYMLINK
-# outputs the target of the given symlink.
-if (type readlink) > /dev/null 2>&1; then
- func_readlink ()
- {
- # Use the readlink program from GNU coreutils.
- readlink "$1"
- }
-else
- func_readlink ()
- {
- # Use two sed invocations. A single sed -n -e 's,^.* -> \(.*\)$,\1,p'
- # would do the wrong thing if the link target contains " -> ".
- LC_ALL=C ls -l "$1" | sed -e 's, -> ,#%%#,' | sed -n -e 's,^.*#%%#\(.*\)$,\1,p'
- }
-fi
-
-# func_gnulib_dir
-# locates the directory where the gnulib repository lives
-# Input:
-# - progname name of this program
-# Sets variables
-# - self_abspathname absolute pathname of gnulib-tool
-# - gnulib_dir absolute pathname of gnulib repository
-func_gnulib_dir ()
-{
- case "$progname" in
- /* | ?:*) self_abspathname="$progname" ;;
- */*) self_abspathname=`pwd`/"$progname" ;;
- *)
- # Look in $PATH.
- # Iterate through the elements of $PATH.
- # We use IFS=: instead of
- # for d in `echo ":$PATH:" | sed -e 's/:::*/:.:/g' | sed -e 's/:/ /g'`
- # because the latter does not work when some PATH element contains spaces.
- # We use a canonicalized $pathx instead of $PATH, because empty PATH
- # elements are by definition equivalent to '.', however field splitting
- # according to IFS=: loses empty fields in many shells:
- # - /bin/sh on OSF/1 and Solaris loses all empty fields (at the
- # beginning, at the end, and in the middle),
- # - /bin/sh on IRIX and /bin/ksh on IRIX and OSF/1 lose empty fields
- # at the beginning and at the end,
- # - GNU bash, /bin/sh on AIX and HP-UX, and /bin/ksh on AIX, HP-UX,
- # Solaris lose empty fields at the end.
- # The 'case' statement is an optimization, to avoid evaluating the
- # explicit canonicalization command when $PATH contains no empty fields.
- self_abspathname=
- if test "$PATH_SEPARATOR" = ";"; then
- # On Windows, programs are searched in "." before $PATH.
- pathx=".;$PATH"
- else
- # On Unix, we have to convert empty PATH elements to ".".
- pathx="$PATH"
- case :$PATH: in
- *::*)
- pathx=`echo ":$PATH:" | sed -e 's/:::*/:.:/g' -e 's/^://' -e 's/:\$//'`
- ;;
- esac
- fi
- saved_IFS="$IFS"
- IFS="$PATH_SEPARATOR"
- for d in $pathx; do
- IFS="$saved_IFS"
- test -z "$d" && d=.
- if test -x "$d/$progname" && test ! -d "$d/$progname"; then
- self_abspathname="$d/$progname"
- break
- fi
- done
- IFS="$saved_IFS"
- if test -z "$self_abspathname"; then
- func_fatal_error "could not locate the gnulib-tool program - how did you invoke it?"
- fi
- ;;
- esac
- while test -h "$self_abspathname"; do
- # Resolve symbolic link.
- linkval=`func_readlink "$self_abspathname"`
- test -n "$linkval" || break
- case "$linkval" in
- /* | ?:* ) self_abspathname="$linkval" ;;
- * ) self_abspathname=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`/"$linkval" ;;
- esac
- done
- gnulib_dir=`echo "$self_abspathname" | sed -e 's,/[^/]*$,,'`
-}
-
-func_gnulib_dir
-
# Check the Python version.
if (python3 -c 'import sys; sys.exit(not sys.version_info >= (3,7))') 2>/dev/null; then
:
@@ -157,4 +68,10 @@
profiler_args=
# For profiling, cf. <https://docs.python.org/3/library/profile.html>.
#profiler_args="-m cProfile -s tottime"
-exec python3 $profiler_args "$gnulib_dir/.gnulib-tool.py" "$@"
+
+case $progname in
+ */*) dotprogname=${progname%/*}/.${progname##*/} ;;
+ *) dotprogname=.${progname} ;;
+esac
+
+exec python3 $profiler_args "$dotprogname" "$@"
--
2.34.1
