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

[Bruno Haible]

> This patch patch should apply cleanly for you.

Thanks. Applied.

Bruno

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

[Collin Funk]

Hi Bruno,

On 3/19/24 4:55 PM, Bruno Haible wrote:
> I think this should be 'or', not 'and'? Cf. gnulib-tool.sh line 1667.

Yes...
That is my mistake, sorry. This patch patch should apply cleanly for you.

CollinFrom 2536a3973c33cf0e036c0f956daee8939862b280 Mon Sep 17 00:00:00 2001
From: Collin Funk 
Date: Tue, 19 Mar 2024 12:09:57 -0700
Subject: [PATCH] gnulib-tool.py: Follow gnulib-tool changes, part 68.

Follow gnulib-tool change
2022-07-31  Akim Demaille  
gnulib-tool: add support for --automake-subdir-tests

* pygnulib/main.py (main): Add support for --automake-subdir-tests.
* pygnulib/GLInfo.py (GLInfo.usage): Add --automake-subdir-tests to the
help message.
* pygnulib/GLConfig.py (GLConfig.__init__): Add 'automake_subdir_tests'
to the parameter list. Initialize it.
(GLConfig.default): Default --automake-subdir-tests to False.
(GLConfig.resetAutomakeSubdir): Fix misleading docstring.
(GLConfig.getAutomakeSubdirTests, GLConfig.setAutomakeSubdirTests)
(GLConfig.resetAutomakeSubdirTests): New functions to manipulate and
access whether --automake-subdir-tests is in use.
* pygnulib/GLEmiter.py (GLEmiter.shellvars_init)
(GLEmiter.initmacro_end): Use sourcebase when handling tests and
--automake-subdir-tests is given.
* pygnulib/GLError.py (GLError.__repr__): Update error message to
include --automake-subdir-tests.
* pygnulib/GLImport.py (GLImport.__init__): Check for the
'subdir-objects' Automake option when --automake-subdir-tests is in use.
(GLImport.actioncmd): Add --automake-subdir-tests to the actioncmd
printed in generated files.
---
 ChangeLog| 26 ++
 gnulib-tool.py.TODO  | 18 --
 pygnulib/GLConfig.py | 31 ---
 pygnulib/GLEmiter.py | 16 +++-
 pygnulib/GLError.py  |  5 +++--
 pygnulib/GLImport.py |  9 +
 pygnulib/GLInfo.py   |  2 ++
 pygnulib/main.py | 13 +++--
 8 files changed, 90 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 55b9d95af3..5a48bd1474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2024-03-19  Collin Funk  
+
+	gnulib-tool.py: Follow gnulib-tool changes, part 68.
+	Follow gnulib-tool change
+	2022-07-31  Akim Demaille  
+	gnulib-tool: add support for --automake-subdir-tests
+	* pygnulib/main.py (main): Add support for --automake-subdir-tests.
+	* pygnulib/GLInfo.py (GLInfo.usage): Add --automake-subdir-tests to the
+	help message.
+	* pygnulib/GLConfig.py (GLConfig.__init__): Add 'automake_subdir_tests'
+	to the parameter list. Initialize it.
+	(GLConfig.default): Default --automake-subdir-tests to False.
+	(GLConfig.resetAutomakeSubdir): Fix misleading docstring.
+	(GLConfig.getAutomakeSubdirTests, GLConfig.setAutomakeSubdirTests)
+	(GLConfig.resetAutomakeSubdirTests): New functions to manipulate and
+	access whether --automake-subdir-tests is in use.
+	* pygnulib/GLEmiter.py (GLEmiter.shellvars_init)
+	(GLEmiter.initmacro_end): Use sourcebase when handling tests and
+	--automake-subdir-tests is given.
+	* pygnulib/GLError.py (GLError.__repr__): Update error message to
+	include --automake-subdir-tests.
+	* pygnulib/GLImport.py (GLImport.__init__): Check for the
+	'subdir-objects' Automake option when --automake-subdir-tests is in use.
+	(GLImport.actioncmd): Add --automake-subdir-tests to the actioncmd
+	printed in generated files.
+
 2024-03-19  Collin Funk  
 
 	gnulib-tool.py: Fix incorrect assignment operator.
diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO
index 75a51fc6b8..b3d83eeeb4 100644
--- a/gnulib-tool.py.TODO
+++ b/gnulib-tool.py.TODO
@@ -16,7 +16,6 @@ The following commits to gnulib-tool have not yet been reflected in
 
 
 Implement the options:
-  --automake-subdir-tests
   --help (same output)
 
 Optimize:
@@ -25,23 +24,6 @@ Optimize:
 
 
 
-commit 76c7703cb2e9e0e803d1296618d8ab9e86e13d6c
-Author: Akim Demaille 
-Date:   Mon Jul 4 07:18:07 2022 +0200
-
-gnulib-tool: add support for --automake-subdir-tests
-
-
-
-* gnulib-tool (main): Handle --automake-subdir-tests.
-(func_emit_shellvars_init, func_emit_lib_Makefile_am): Use
-$sourcebase when handling tests and --automake-subdir-tests is
-given.
-(func_append_actionarg): Support --automake-subdir-tests.
-(func_create_testdir): Add missing argument for func_emit_initmacro_end.
-
-
-
 commit 762bd0aa660b0c1c02597e0d2e5c5fbf9bab1b91
 Author: Paul Eggert 
 Date:   Fri Jun 3 17:52:19 2022 -0700
diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py
index ecfbb13353..b95d2dd613 100644
--- a/pygnulib/GLConfig.py
+++ b/pygnulib/GLConfig.py
@@ -58,7 +58,8 @@ class GLConfig(object):
  modules=None, avoids=None, files=None,

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

[Bruno Haible]

Hi Collin,

> Here is two patches. The first adds '--automake-subdir-tests' which is
> used by GNU Bison.

In GLImport.py:

# Determine whether --automake-subdir/--automake-subdir-tests are 
supported.
if self.config['automake_subdir'] and 
self.config['automake_subdir_tests']:

I think this should be 'or', not 'and'? Cf. gnulib-tool.sh line 1667.

The other patch is good; thanks, applied.

Bruno