gnulib-tool.py: Finish implementing option --macro-prefix.
authorBruno Haible <bruno@clisp.org>
Sat, 6 Aug 2022 00:10:32 +0000 (02:10 +0200)
committerBruno Haible <bruno@clisp.org>
Sat, 6 Aug 2022 00:13:45 +0000 (02:13 +0200)
* gnulib-tool.py (main): Accept option --macro-prefix.

ChangeLog
gnulib-tool.py
gnulib-tool.py.TODO

index d98a5bd69203131d0cb68b110d7ad28bbb58ea65..16d17a6232fd025e636000208d6975057e55d63a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2022-08-05  Bruno Haible  <bruno@clisp.org>
 
+       gnulib-tool.py: Finish implementing option --macro-prefix.
+       * gnulib-tool.py (main): Accept option --macro-prefix.
+
        gnulib-tool.py: Refactor --makefile-name option.
        * gnulib-tool.py (main): Handle option --makefile-name like all other
        string-valued options.
index ba15ba7154377429f86d309d711a0c5b2b1fe73d..030e3caf733ae8bea82d6bd11009b05a1e819f11 100755 (executable)
@@ -374,6 +374,11 @@ def main():
                         dest='makefile_name',
                         default=None,
                         nargs=1)
+    # macro-prefix
+    parser.add_argument('--macro-prefix',
+                        dest='macro_prefix',
+                        default=None,
+                        nargs=1)
     # single-configure
     parser.add_argument('--single-configure',
                         dest='single_configure',
@@ -559,7 +564,8 @@ def main():
                  or cmdargs.excl_privileged_tests != None
                  or cmdargs.excl_unportable_tests != None
                  or cmdargs.avoids != None or cmdargs.lgpl != None
-                 or cmdargs.makefile_name != None))):
+                 or cmdargs.makefile_name != None
+                 or cmdargs.macro_prefix != None))):
         message = '%s: *** ' % constants.APP['name']
         message += 'invalid options for --%s mode\n' % mode
         message += 'Try \'gnulib-tool --help\' for more information.\n'
@@ -636,6 +642,9 @@ def main():
     makefile_name = cmdargs.makefile_name
     if makefile_name != None:
         makefile_name = makefile_name[0]
+    macro_prefix = cmdargs.macro_prefix
+    if macro_prefix != None:
+        macro_prefix = macro_prefix[0]
     avoids = cmdargs.avoids
     if avoids != None:
         avoids = [ module
index 6787e88df25b66745030c2a85aed2ac348e392b7..87438c5a16c2d851c24c8222cd87a581886f5f2a 100644 (file)
@@ -29,7 +29,6 @@ Implement the options:
   --gnu-make
   --tests-makefile-name
   --automake-subdir
-  --macro-prefix
   --po-domain
   --witness-c-macro
   --vc-files