+2022-08-06 Bruno Haible <bruno@clisp.org>
+
+ gnulib-tool.py: Finish implementing option --witness-c-macro.
+ * gnulib-tool.py (main): Accept option --witness-c-macro.
+ * pygnulib/GLConfig.py (GLConfig.__init__): Remove wrong type check of
+ witness_c_macro argument.
+
2022-08-05 Bruno Haible <bruno@clisp.org>
gnulib-tool.py: Don't initialize local variables too early.
dest='podomain',
default=None,
nargs=1)
+ # witness-c-macro
+ parser.add_argument('--witness-c-macro',
+ dest='witness_c_macro',
+ default=None,
+ nargs=1)
# single-configure
parser.add_argument('--single-configure',
dest='single_configure',
or cmdargs.excl_unportable_tests != None
or cmdargs.avoids != None or cmdargs.lgpl != None
or cmdargs.makefile_name != None
- or cmdargs.macro_prefix != None or cmdargs.podomain != None))):
+ or cmdargs.macro_prefix != None or cmdargs.podomain != None
+ or cmdargs.witness_c_macro != None))):
message = '%s: *** ' % constants.APP['name']
message += 'invalid options for --%s mode\n' % mode
message += 'Try \'gnulib-tool --help\' for more information.\n'
podomain = cmdargs.podomain
if podomain != None:
podomain = podomain[0]
+ witness_c_macro = cmdargs.witness_c_macro
+ if witness_c_macro != None:
+ witness_c_macro = witness_c_macro[0]
avoids = cmdargs.avoids
if avoids != None:
avoids = [ module
single_configure = cmdargs.single_configure
docbase = None
conddeps = None
- witness_c_macro = None
vc_files = None
# Create pygnulib configuration.
# witness_c_macro
self.resetWitnessCMacro()
if witness_c_macro != None:
- if type(witness_c_macro) is bool:
- if not witness_c_macro:
- self.setWitnessCMacro()
- else: # if witness_c_macro
- self.resetWitnessCMacro()
- else: # if type(witness_c_macro) is not bool
- raise TypeError('witness_c_macro must be a bool, not %s'
- % type(witness_c_macro).__name__)
+ self.setWitnessCMacro(witness_c_macro)
# vc_files
self.resetVCFiles()
if vc_files != None: