Re: gnulib-tool.py in gettext

2024-04-12 Thread Bruno Haible
Hi Collin, > This patch fixes the issue for me. Thanks! I confirm, it's fixed for me too. Applied. Bruno

Re: gnulib-tool.py in gettext

2024-04-12 Thread Collin Funk
Hi Bruno, On 4/10/24 4:26 AM, Bruno Haible wrote: > The Python implementation has created a tests/ directory instead of a > gettext-tools/tests/ directory. This patch fixes the issue for me. It looks like the GLConfig had it's destdir set *after* the files were already copied. CollinFrom be1f5c6

Re: gnulib-tool.py in jugtail

2024-04-12 Thread Collin Funk
Hi Bruno, On 4/12/24 3:28 PM, Bruno Haible wrote: > I am applying these two refactorings. Hope it makes this piece of code > easier to understand. Thanks! It looks like you got all the cache tests passing. Nice work. Collin

gnulib-tool.py: Implement --add-import --with-*-tests correctly

2024-04-12 Thread Bruno Haible
This patch fixes those unit tests that check the behaviour of --with-*-tests options w.r.t. gnulib-cache.m4. Now, all unit tests pass again. 2024-04-12 Bruno Haible gnulib-tool.py: Implement --add-import --with-*-tests correctly. * pygnulib/GLConfig.py (GLConfig.update): Use

gnulib-tool.py: Implement --add-import --avoid correctly

2024-04-12 Thread Bruno Haible
This unit test fails: $ ./test-cache-2-11.sh Files ./test-cache-2-11.result/lib/Makefile.gnulib and tmp2051058-result/lib/Makefile.gnulib differ Files ./test-cache-2-11.result/m4/gnulib-cache.m4 and tmp2051058-result/m4/gnulib-cache.m4 differ FAIL: gnulib-tool's result has unexpected difference

Re: gnulib-tool.py in jugtail

2024-04-12 Thread Bruno Haible
Collin Funk wrote: > Then only set it to the cache or > default in GLImport.__init__(). But that section of code is already > sort of difficult to follow... I am applying these two refactorings. Hope it makes this piece of code easier to understand. >From 27c5b31a42ccd5353ccff09d46dbaa0d105f0f0b

Re: [PATCH] gitlog-to-changelog: Make output reproducible.

2024-04-12 Thread Paul Eggert
On 2024-04-12 10:54, Simon Josefsson via Gnulib discussion list wrote: I'll try to come up with a fix. Emacs has had the tradition of using UTC for ChangeLog dates, so please support that as well, as an option. This Emacs tradition dates back to the RCS days, as RCS supports only UTC timestam

gnulib-tool.py: Implement --no-conditional-dependencies correctly

2024-04-12 Thread Bruno Haible
This unit test failure $ ./test-cache-3-27.sh Files ./test-cache-3-27.result/lib/Makefile.gnulib and tmp1986931-result/lib/Makefile.gnulib differ Files ./test-cache-3-27.result/m4/gnulib-cache.m4 and tmp1986931-result/m4/gnulib-cache.m4 differ Files ./test-cache-3-27.result/m4/gnulib-comp.m4 and

gnulib-tool.py: Implement --no-libtool option correctly

2024-04-12 Thread Bruno Haible
The unit test failure $ ./test-cache-2-29.sh Files ./test-cache-2-29.result/lib/Makefile.gnulib and tmp1966494-result/lib/Makefile.gnulib differ Files ./test-cache-2-29.result/m4/gnulib-cache.m4 and tmp1966494-result/m4/gnulib-cache.m4 differ Files ./test-cache-2-29.result/m4/gnulib-comp.m4 and

Re: Problem with DATADIR on Mingw

2024-04-12 Thread Reuben Thomas
On Fri, 12 Apr 2024 at 21:20, Bruno Haible wrote: > Reuben Thomas wrote: > > gcc -DHAVE_CONFIG_H -I. -I.. --include configmake.h --include config.h > Oh dear, the command-line includes were right in front of me, sorry! > > ... enchant.c > > If you #include these two files from the .c file, ra

Re: Problem with DATADIR on Mingw

2024-04-12 Thread Bruno Haible
Reuben Thomas wrote: > gcc -DHAVE_CONFIG_H -I. -I.. --include configmake.h --include config.h > ... enchant.c If you #include these two files from the .c file, rather than from the command line, you will have a location where to put '#undef DATADIR'. Alternatively, you could swap the two --inclu

Re: Problem with DATADIR on Mingw

2024-04-12 Thread Reuben Thomas
On Fri, 12 Apr 2024 at 18:55, Bruno Haible wrote: > Reuben Thomas wrote: > > With up-to-date gnulib (and I can't see any relevant changes for some > > years), I am getting the following error while using the configmake > module > > and building on Mingw 64 x86_64: > > > > In file included from :

Re: [PATCH] gitlog-to-changelog: Make output reproducible.

2024-04-12 Thread Simon Josefsson via Gnulib discussion list
fre 2024-04-12 klockan 18:47 +0200 skrev Bruno Haible: > The ChangeLogs are not random data. They are text files meant to be > read > and interpreted by humans. Shoving a "let's use GMT for everyone" > attitude > here is not the right way to handle the diversity of time zones. > > There was a prob

Re: argp --help formatting bug with non-ASCII characters

2024-04-12 Thread Collin Funk
Hi Bruno, On 4/12/24 10:19 AM, Bruno Haible wrote: > So, my feeling would be that the first thing to do is to create a new > unit test for it: > 1. so that we don't need to build and try GNU tar in order to see > whether there is a regression in the future, > 2. so as to cover the tricky

Re: argp --help formatting bug with non-ASCII characters

2024-04-12 Thread Bruno Haible
Hi Collin, > This patch fixes the two examples that you gave. I think it may be > missing the case where the buffer doesn't end in a partial line > though. There are probably some other cases that are not handled either. The code is ca. 200 lines of considerations of columns and widths here and t

Re: gnulib-tool.sh: Accept conditional dependencies with tests

2024-04-12 Thread Bruno Haible
> gnulib-tool.sh: Accept conditional dependencies with tests. And likewise on the Python side: 2024-04-12 Bruno Haible gnulib-tool.py: Accept conditional dependencies with tests. * pygnulib/GLImport.py (GLImport.__init__): Don't reject the combination of gl_COND

Re: Problem with DATADIR on Mingw

2024-04-12 Thread Bruno Haible
Reuben Thomas wrote: > With up-to-date gnulib (and I can't see any relevant changes for some > years), I am getting the following error while using the configmake module > and building on Mingw 64 x86_64: > > In file included from : > C:/msys64/mingw64/include/objidl.h:10677:3: error: expected ide

Re: [PATCH] gitlog-to-changelog: Make output reproducible.

2024-04-12 Thread Bruno Haible
Hi Simon, > I ran into a reproducability problem in gitlog-to-changelog, and noticed > Guix people had also ran into this and worked around it outside of > gitlog-to-changelog: > > https://issues.guix.gnu.org/70169/#21 > > However I don't think it makes sense for ChangeLog dates to depend on > t

gnulib-tool.py: Fix handling of --with-obsolete

2024-04-12 Thread Bruno Haible
This test failure $ ./test-cache-2-5.sh Files ./test-cache-2-5.result/lib/Makefile.gnulib and tmp1924205-result/lib/Makefile.gnulib differ Only in ./test-cache-2-5.result/m4: ansi-c++.m4 Only in ./test-cache-2-5.result/m4: assert_h.m4 Only in ./test-cache-2-5.result/m4: c-bool.m4 Only in ./test-

Re: argp --help formatting bug with non-ASCII characters

2024-04-12 Thread Collin Funk
Hi Bruno, On 4/11/24 4:23 PM, Bruno Haible wrote: > The bug is apparently that in argp-fmtstream.c, a character such as Ä or É > augments fs->point_col by 2, when it should only augment it by 1. > > In other words, it should use the Gnulib module 'mbswidth'. > > Any volunteers? I am very unfami

Problem with DATADIR on Mingw

2024-04-12 Thread Reuben Thomas
With up-to-date gnulib (and I can't see any relevant changes for some years), I am getting the following error while using the configmake module and building on Mingw 64 x86_64: In file included from : C:/msys64/mingw64/include/objidl.h:10677:3: error: expected identifier or '(' before string cons

[PATCH] gitlog-to-changelog: Make output reproducible.

2024-04-12 Thread Simon Josefsson via Gnulib discussion list
Hi I ran into a reproducability problem in gitlog-to-changelog, and noticed Guix people had also ran into this and worked around it outside of gitlog-to-changelog: https://issues.guix.gnu.org/70169/#21 However I don't think it makes sense for ChangeLog dates to depend on the timezone under any c

Re: gnulib-tool.py in jugtail

2024-04-12 Thread Collin Funk
On 4/12/24 5:08 AM, Bruno Haible wrote: > OK, if you want to rework this part, we need unit tests for it first. > I have now added unit tests for the gnulib-cache.m4 handling; essentially, > one test for each possible option. > > Before dealing with the 'jugtail' package, it would be good to make

gnulib-tool.py: Fix parsing of gl_LGPL in gnulib-cache.m4

2024-04-12 Thread Bruno Haible
This test failure: $ ./test-cache-2-1.sh Files ./test-cache-2-1.result/lib/Makefile.gnulib and tmp1918649-result/lib/Makefile.gnulib differ Files ./test-cache-2-1.result/m4/gnulib-cache.m4 and tmp1918649-result/m4/gnulib-cache.m4 differ FAIL: gnulib-tool's result has unexpected differences. $ di

gnulib-tool.py: Fix parsing of gnulib-cache.m4

2024-04-12 Thread Bruno Haible
I see this test failure: $ ./test-cache-2-19.sh Only in tmp1861851-result/lib: Makefile.am Only in ./test-cache-2-19.result/lib: Makefile.gnulib Files ./test-cache-2-19.result/m4/gnulib-cache.m4 and tmp1861851-result/m4/gnulib-cache.m4 differ Only in tmp1861851-result/tests: Makefile.am Only in .

gnulib-tool.py: Fix misspelled option in output

2024-04-12 Thread Bruno Haible
Here's a fix for this test failure: $ ./test-cache-1-8.sh Files ./test-cache-1-8.result/lib/Makefile.am and tmp1858399-result/lib/Makefile.am differ Files ./test-cache-1-8.result/m4/gnulib-cache.m4 and tmp1858399-result/m4/gnulib-cache.m4 differ FAIL: gnulib-tool's result has unexpected differen

gnulib-tool.py: Persist the --with-longrunning-tests option

2024-04-12 Thread Bruno Haible
This test failure $ ./test-cache-1-7.sh Files ./test-cache-1-7.result/m4/gnulib-cache.m4 and tmp1858286-result/m4/gnulib-cache.m4 differ FAIL: gnulib-tool's result has unexpected differences. $ diff -u ./test-cache-1-7.result/m4/gnulib-cache.m4 tmp1858286-result/m4/gnulib-cache.m4 --- ./test-ca

gnulib-tool.py: Print warnings just like gnulib-tool.sh

2024-04-12 Thread Bruno Haible
This patch fixes a test suite error: ./test-cache-1-31.err tmp3074843-err differ: byte 1, line 1 --- ./test-cache-1-31.err 2024-04-12 00:02:39.013521019 +0200 +++ tmp3074843-err 2024-04-12 14:03:20.355689866 +0200 @@ -1 +1 @@ -gnulib-tool: warning: --po-domain has no effect without a --

gnulib-tool.sh: Accept conditional dependencies with tests

2024-04-12 Thread Bruno Haible
One of the newly added tests fails like this on the shell side: $ GNULIB_TOOL_IMPL=sh ./test-cache-2-26.sh gnulib-tool: option --conditional-dependencies is not supported with --with-tests FAIL: gnulib-tool exited with code 1. $ GNULIB_TOOL_IMPL=py ./test-cache-2-26.sh diff: ./test-cache-2-26.res

Re: gnulib-tool.py in jugtail

2024-04-12 Thread Bruno Haible
Hi Collin, > It looks like the reading of gnulib-cache.m4 will need to be reworked. OK, if you want to rework this part, we need unit tests for it first. I have now added unit tests for the gnulib-cache.m4 handling; essentially, one test for each possible option. Before dealing with the 'jugtail