[PATCH] gnulib-tool.py: Follow gnulib-tool changes, part 39.

2024-03-02 Thread Collin Funk
On 3/2/24 7:02 PM, Collin Funk wrote: > When working on the one of the TODO entries I noticed that > the gnulib-comp.m4 output was incorrect. Here is the item I was working on. I _think_ I understood it correctly but you guys are much more talented at shell than me. :) Specifically, I was a bit c

[PATCH] gnulib-tool.py: Fix output of gnulib-comp.m4.

2024-03-02 Thread Collin Funk
When working on the one of the TODO entries I noticed that the gnulib-comp.m4 output was incorrect. The indentation was slightly off and the output also had "if True;" conditionals. Here is a diff from Emacs merge-gnulib to show the difference: @@ -784,8 +785,12 @@ AC_DEFUN if $gl_gnulib_enab

Re: Best way to solve this diff between gnulib-tool and gnulib-tool.py?

2024-03-02 Thread Collin Funk
Hi Bruno, On 3/2/24 2:18 AM, Bruno Haible wrote: > The output needs to be deterministic; the natural order from the module > description is perfectly fine. Therefore the sorting in the Python code should > go away. I've attached a patch if you haven't changed it yet. > is not only to sort, but a

Re: Best way to solve this diff between gnulib-tool and gnulib-tool.py?

2024-03-02 Thread Bruno Haible
Hi Collin, > $ gnulib-tool --create-testdir --dir test-shell fts > $ gnulib-tool.py --create-testdir --dir test-python fts > $ git diff --no-index test-python/gltests/Makefile.am > test-shell/gltests/Makefile.am > > Gives lots of lines like this: > > -EXTRA_DIST += macros.h signature.h test-ftr

Best way to solve this diff between gnulib-tool and gnulib-tool.py?

2024-03-02 Thread Collin Funk
When testing the last patch I noticed that gnulib-tool and gnulib-tool.py output file lists assigned to Make variables in a different order. Here is an example: $ gnulib-tool --create-testdir --dir test-shell fts $ gnulib-tool.py --create-testdir --dir test-python fts $ git diff --no-index test-py