Re: gnulib-tool.sh: Match sorting of gnulib-tool.py in output.

2024-04-28 Thread Collin Funk
On 4/28/24 2:52 AM, Bruno Haible wrote: > Thanks! OK to push in 1 or 2 days. Sounds good. >> Though, the correct way to fix this would be making instance variables >> local when they are only used in one function. > > I agree that this kind of doing side effects on a GLConfig object that > is al

Re: gnulib-tool.sh: Match sorting of gnulib-tool.py in output.

2024-04-28 Thread Bruno Haible
Hi Collin, > > The 'libtests' value read from the config in self.emitter is > > incorrect. > > This patch seems to support what I was saying here. > > diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py > index 002eb30267..11b067e085 100644 > --- a/pygnulib/GLTestDir.py > +++ b/pygnulib/G

Re: gnulib-tool.sh: Match sorting of gnulib-tool.py in output.

2024-04-27 Thread Collin Funk
Hi Bruno, On 4/27/24 5:29 PM, Collin Funk wrote: > I'm thinking that this is due to GLTestDir creating a GLEmiter in > __init__() like this: [...] > The 'libtests' value read from the config in self.emitter is > incorrect. This patch seems to support what I was saying here. diff --git a/pygnulib

Re: gnulib-tool.sh: Match sorting of gnulib-tool.py in output.

2024-04-27 Thread Collin Funk
On 4/27/24 4:06 PM, Bruno Haible wrote: > The remaining problem now is: > > $ rm -rf ../testdir3; GNULIB_TOOL_IMPL=sh+py ./gnulib-tool > --create-megatestdir --dir=../testdir3 --single-configure stdio > sys_types > ./gnulib-tool: *** gnulib-tool.py produced different files than > gnulib-tool.sh

Re: gnulib-tool.sh: Match sorting of gnulib-tool.py in output.

2024-04-27 Thread Bruno Haible
Hi Collin, > > GNULIB_TOOL_IMPL=sh+py ./gnulib-tool --create-megatestdir > > --dir=testdir2 --single-configure sys_types stdio > > > > Can you double check on your machine? > > I confirm, it passes for me as well now. The remaining problem now is: $ rm -rf ../testdir3; GNULIB_TOOL_IMPL=s

Re: gnulib-tool.sh: Match sorting of gnulib-tool.py in output.

2024-04-27 Thread Collin Funk
On 4/27/24 3:22 PM, Bruno Haible wrote: > Thanks. There's a nit, though: These lines do not remove duplicates. > > module_set = set(modules) > modules = [ module > for module in modules > if module in module_set ] Oops... Today isn't my day

Re: gnulib-tool.sh: Match sorting of gnulib-tool.py in output.

2024-04-27 Thread Bruno Haible
Hi Collin, > I've pushed the attached patch Thanks. There's a nit, though: These lines do not remove duplicates. module_set = set(modules) modules = [ module for module in modules if module in module_set ] See: >>> modules = ['a', 'b', 'a'

Re: gnulib-tool.sh: Match sorting of gnulib-tool.py in output.

2024-04-27 Thread Collin Funk
On 4/27/24 2:29 PM, Bruno Haible wrote: > Also, the SUBDIRS variable in a Makefile.am determines the order in which > the subdirectories are traversed during a build. If a subdirectory has some > chances to fail the build or the tests, it should be mentioned last, so > that the other (more reliable

Re: gnulib-tool.sh: Match sorting of gnulib-tool.py in output.

2024-04-27 Thread Bruno Haible
Hi Collin, > diff -ru testdir2/Makefile.am testdir2-glpy85706/Makefile.am > --- testdir2/Makefile.am 2024-04-27 13:53:51.443692945 -0700 > +++ testdir2-glpy85706/Makefile.am2024-04-27 13:53:33.063660555 -0700 > @@ -2,6 +2,6 @@ > > AUTOMAKE_OPTIONS = 1.14 foreign > > -SUBDIRS = sys_ty

gnulib-tool.sh: Match sorting of gnulib-tool.py in output.

2024-04-27 Thread Collin Funk
24 14:03:27 -0700 Subject: [PATCH] gnulib-tool.sh: Match sorting of gnulib-tool.py in output. * gnulib-tool.sh (func_create_megatestdir): Sort the modules so AC_CONFIG_SUBDIRS in configure.ac and SUBDIRS in Makefile.am are also sorted. --- ChangeLog | 7 +++ gnulib-tool.sh | 1 + 2 files ch