+2024-03-18 Collin Funk <collin.funk1@gmail.com>
+
+ gnulib-tool.py: Follow gnulib-tool changes, part 64.
+ Follow gnulib-tool change
+ 2021-12-25 Bruno Haible <bruno@clisp.org>
+ gnulib-tool: Respect applicability 'all' without --single-configure.
+ * pygnulib/GLModuleSystem.py (GLModule.isTests): Treat modules with
+ applicability 'all' like 'tests' modules, not like 'main' modules.
+ (GLModule.isNonTests): Treat all modules not ending in '-tests' as
+ non-test modules.
+ (GLModule.getApplicability): Don't use GLModule.isTests(). Because it
+ depends on the result of this function, using it would cause a
+ RecursionError exception.
+ (GLModule.getDependencies): Respect the difference between
+ module.isTests(), module.isNonTests(), and
+ module.getName().endswith('-tests').
+ (GLModule.getAutomakeSnippet_Unconditional, GLModule.getLicense)
+ (GLModuleTable.add_dummy): Likewise.
+ * pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am): Likewise.
+
2024-03-17 Bruno Haible <bruno@clisp.org>
gnulib-tool.py: Handle empty lists of lines consistently.
--------------------------------------------------------------------------------
-commit 83948c64d10c77fb964e6523a9524729d6a66f32
-Author: Bruno Haible <bruno@clisp.org>
-Date: Sat Dec 25 12:19:13 2021 +0100
-
- gnulib-tool: Respect applicability 'all' without --single-configure.
-
- * gnulib-tool (func_verify_tests_module): Treat modules with
- applicability 'all' like 'tests' modules, not like 'main' modules.
-
---------------------------------------------------------------------------------
-
commit 4bdc327dbda59dcdbfa0f983a4f35c4a4ec3578c
Author: Bruno Haible <bruno@clisp.org>
Date: Sun Dec 19 12:49:16 2021 +0100
# Compute allsnippets variable.
allsnippets = ''
for module in modules:
- if not module.isTests():
+ if module.isNonTests():
# Get conditional snippet, edit it and save to amsnippet1.
amsnippet1 = module.getAutomakeSnippet_Conditional()
amsnippet1 = amsnippet1.replace('lib_LIBRARIES', 'lib%_LIBRARIES')
# the link dependencies of all modules.
links = [ module.getLink()
for module in modules
- if not module.isTests() ]
+ if module.isNonTests() ]
lines = [ line
for link in links
for line in link.split('\n')
'''GLModule.isTests() -> bool
Check whether module is a -tests version of module.'''
- result = self.getName().endswith('-tests')
+ result = self.getApplicability() != 'main'
return result
def isNonTests(self):
'''GLModule.isTests() -> bool
Check whether module is not a -tests version of module.'''
- result = not self.isTests()
+ result = not self.getName().endswith('-tests')
return result
def getTestsName(self):
result = result.strip()
if not result:
# The default is 'main' or 'tests', depending on the module's name.
- if self.isTests():
+ if self.getName().endswith('-tests'):
result = 'tests'
else:
result = 'main'
if 'dependencies' not in self.cache:
result = ''
# ${module}-tests implicitly depends on ${module}, if that module exists.
- if self.isTests():
+ if self.getName().endswith('-tests'):
main_module = subend('-tests', '', self.getName())
if self.modulesystem.exists(main_module):
result += '%s\n' % main_module
ac_version = self.config['ac_version']
result = ''
if 'makefile-unconditional' not in self.cache:
- if self.isTests():
+ if self.getName().endswith('-tests'):
files = self.getFiles()
extra_files = filter_filelist(constants.NL, files,
'tests/', '', 'tests/', '').split(constants.NL)
if 'license' not in self.cache:
license = self.getLicense_Raw().strip()
# Warn if the License field is missing.
- if not self.isTests():
+ if not self.getName().endswith('-tests'):
if not license:
if self.config['errors']:
raise GLError(18, str(self))
# Determine whether any module provides a lib_SOURCES augmentation.
have_lib_sources = False
for module in modules:
- if not module.isTests():
+ if module.isNonTests():
if conddeps and self.isConditional(module):
# Ignore conditional modules, since they are not guaranteed to
# contribute to lib_SOURCES.