+2024-03-17 Collin Funk <collin.funk1@gmail.com>
+
+ gnulib-tool.py: Follow gnulib-tool changes, part 60.
+ Follow gnulib-tool change
+ 2019-11-18 Bruno Haible <bruno@clisp.org>
+ gnulib-tool: Fix build error on macOS with --conditional-dependencies.
+ * pygnulib/GLModuleSystem.py (GLModuleTable.add_dummy): Ignore modules
+ that are conditionally enabled.
+
2024-03-17 Collin Funk <collin.funk1@gmail.com>
gnulib-tool.py: Don't try to remove files that don't exist.
--------------------------------------------------------------------------------
-commit 0d41dbc7c88b10d16751466ec91efa75951426bb
-Author: Bruno Haible <bruno@clisp.org>
-Date: Mon Nov 18 13:32:46 2019 +0100
-
- gnulib-tool: Fix build error on macOS with --conditional-dependencies.
-
- * gnulib-tool (func_modules_add_dummy): Ignore modules that are
- conditionally enabled.
-
---------------------------------------------------------------------------------
-
commit 30459fe101541698ec704acb224946d73676750e
Author: Bruno Haible <bruno@clisp.org>
Date: Thu Jun 8 15:09:31 2017 +0200
Add dummy package to list of modules if dummy package is needed. If not,
return original list of modules.
- GLConfig: auxdir, ac_version.'''
+ GLConfig: auxdir, ac_version, conddeps.'''
auxdir = self.config['auxdir']
ac_version = self.config['ac_version']
+ conddeps = self.config['conddeps']
for module in modules:
if type(module) is not GLModule:
raise TypeError('each module must be a GLModule instance')
have_lib_sources = False
for module in modules:
if not module.isTests():
- snippet = module.getAutomakeSnippet()
- # Extract the value of "lib_SOURCES += ...".
- snippet = constants.remove_backslash_newline(snippet)
- pattern = re.compile('^lib_SOURCES[\t ]*\\+=([^#]*).*$', re.M)
- for matching_rhs in pattern.findall(snippet):
- files = matching_rhs.split(' ')
- for file in files:
- # Ignore .h files since they are not compiled.
- if not file.endswith('.h'):
- have_lib_sources = True
- break
+ if conddeps and self.isConditional(module):
+ # Ignore conditional modules, since they are not guaranteed to
+ # contribute to lib_SOURCES.
+ pass
+ else:
+ snippet = module.getAutomakeSnippet()
+ # Extract the value of "lib_SOURCES += ...".
+ snippet = constants.remove_backslash_newline(snippet)
+ pattern = re.compile('^lib_SOURCES[\t ]*\\+=([^#]*).*$', re.M)
+ for matching_rhs in pattern.findall(snippet):
+ files = matching_rhs.split(' ')
+ for file in files:
+ # Ignore .h files since they are not compiled.
+ if not file.endswith('.h'):
+ have_lib_sources = True
+ break
# Add the dummy module, to make sure the library will be non-empty.
if not have_lib_sources:
dummy = self.modulesystem.find('dummy')