>From 10aa0eb755d137e3af13c779da2127a3d0af1c6b Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 3 Aug 2022 14:43:40 +0200 Subject: [PATCH 05/12] gnulib-tool.py: Follow gnulib-tool changes, part 21. Follow gnulib-tool change 2016-10-16 Bruno Haible gnulib-tool: Make --create-testdir on all modules work again. * pygnulib/GLTestDir.py (GLTestDir.execute): Don't include the non-recursive-gnulib-prefix-hack module. --- ChangeLog | 7 +++++++ gnulib-tool.py.TODO | 11 ----------- pygnulib/GLTestDir.py | 7 +++++-- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b47dc08af..e2f3e0f127 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2022-08-03 Bruno Haible + gnulib-tool.py: Follow gnulib-tool changes, part 21. + Follow gnulib-tool change + 2016-10-16 Bruno Haible + gnulib-tool: Make --create-testdir on all modules work again. + * pygnulib/GLTestDir.py (GLTestDir.execute): Don't include the + non-recursive-gnulib-prefix-hack module. + gnulib-tool.py: Follow gnulib-tool changes, part 20. Follow gnulib-tool changes 2016-01-15 Paul Eggert diff --git a/gnulib-tool.py.TODO b/gnulib-tool.py.TODO index bfb613fb70..b71b7200ab 100644 --- a/gnulib-tool.py.TODO +++ b/gnulib-tool.py.TODO @@ -1067,17 +1067,6 @@ Date: Sat Oct 15 15:51:20 2016 +0200 -------------------------------------------------------------------------------- -commit 932a1ae7ba56a9a3da52287ac028017323269d44 -Author: Bruno Haible -Date: Sun Oct 16 14:11:18 2016 +0200 - - gnulib-tool: Make --create-testdir on all modules work again. - - * gnulib-tool (func_create_testdir): Don't include the - non-recursive-gnulib-prefix-hack module. - --------------------------------------------------------------------------------- - commit 9bdf6c8a0cdeb13c12e4b65dee9538c5468dbe1d Author: Bruno Haible Date: Sun Aug 19 14:06:50 2012 +0200 diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py index 9065e462fa..f0a1a43883 100644 --- a/pygnulib/GLTestDir.py +++ b/pygnulib/GLTestDir.py @@ -168,11 +168,14 @@ class GLTestDir(object): base_modules = [self.modulesystem.find(m) for m in base_modules] # All modules together. # Except config-h, which breaks all modules which use HAVE_CONFIG_H. + # Except non-recursive-gnulib-prefix-hack, which represents a + # nonstandard way of using Automake. # Except ftruncate, mountlist, which abort the configuration on mingw. # Except lib-ignore, which leads to link errors when Sun C++ is used. base_modules = sorted(set(base_modules)) - base_modules = [module for module in base_modules if str(module) not in - ['config-h', 'ftruncate', 'mountlist', 'lib-ignore']] + base_modules = [module + for module in base_modules + if str(module) not in ['config-h', 'non-recursive-gnulib-prefix-hack', 'ftruncate', 'mountlist', 'lib-ignore']] # When computing transitive closures, don't consider $module to depend on # $module-tests. Need this because tests are implicitly GPL and may depend -- 2.34.1