summaryrefslogtreecommitdiff
path: root/gnulib-tool.py
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2022-08-06 23:01:36 +0200
committerBruno Haible <bruno@clisp.org>2022-08-06 23:01:36 +0200
commit9812027a9afa87b12eb3b7e3c28600e6eff7ca98 (patch)
tree07de1ae335d1d14ae8607d28a0d31ba036793cb5 /gnulib-tool.py
parent860df12df83dd27ae2b83e0ed6b485c4ffbb640e (diff)
downloadgnulib-9812027a9afa87b12eb3b7e3c28600e6eff7ca98.tar.gz
gnulib-tool.py: Finish implementing options --vc-files, --no-vc-files.
* gnulib-tool.py (main): Accept options --vc-files, --no-vc-files. * pygnulib/GLImport.py (GLImport.__init__): Correct parsing of gl_VC_FILES directive. (GLImport.gnulib_cache): Don't treat the value False like None. (GLImport.execute): Skip the .gitignore file manipulations if vc_files is False.
Diffstat (limited to 'gnulib-tool.py')
-rwxr-xr-xgnulib-tool.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/gnulib-tool.py b/gnulib-tool.py
index 0bf72bf3a0..bb763a2245 100755
--- a/gnulib-tool.py
+++ b/gnulib-tool.py
@@ -363,6 +363,15 @@ def main():
dest='witness_c_macro',
default=None,
nargs=1)
+ # vc-files
+ parser.add_argument('--vc-files',
+ dest='vc_files',
+ default=None,
+ action='store_true')
+ parser.add_argument('--no-vc-files',
+ dest='vc_files',
+ default=None,
+ action='store_false')
# single-configure
parser.add_argument('--single-configure',
dest='single_configure',
@@ -553,7 +562,7 @@ def main():
or cmdargs.avoids != None or cmdargs.lgpl != None
or cmdargs.makefile_name != None
or cmdargs.macro_prefix != None or cmdargs.podomain != None
- or cmdargs.witness_c_macro != None))):
+ or cmdargs.witness_c_macro != None or cmdargs.vc_files != None))):
message = '%s: *** ' % constants.APP['name']
message += 'invalid options for --%s mode\n' % mode
message += 'Try \'gnulib-tool --help\' for more information.\n'
@@ -649,6 +658,7 @@ def main():
witness_c_macro = cmdargs.witness_c_macro
if witness_c_macro != None:
witness_c_macro = witness_c_macro[0]
+ vc_files = cmdargs.vc_files
avoids = cmdargs.avoids
if avoids != None:
avoids = [ module
@@ -659,7 +669,6 @@ def main():
single_configure = cmdargs.single_configure
docbase = None
conddeps = None
- vc_files = None
# Create pygnulib configuration.
config = classes.GLConfig(