diff options
| author | Bruno Haible <bruno@clisp.org> | 2022-08-03 16:49:15 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2022-08-03 16:50:03 +0200 |
| commit | e2d15e5c893e42b32a840a6641d5fa8cef7b4f7c (patch) | |
| tree | 1c11d2131d4dec895679058fd729ec8d6f8856e3 /gnulib-tool.py | |
| parent | 65301e0739f8c86cf96403d6426551df3c3f3ac3 (diff) | |
| download | gnulib-e2d15e5c893e42b32a840a6641d5fa8cef7b4f7c.tar.gz | |
gnulib-tool.py: Follow gnulib-tool changes, part 23.
Follow gnulib-tool changes
2016-11-11 Bruno Haible <bruno@clisp.org>
gnulib-tool: Support for the dual "LGPLv3+ or GPLv2" license.
2016-12-02 Nikos Mavrogiannopoulos <nmav@gnutls.org>
gnulib-tool (func_import): Adhere to the license guideline ...
2016-12-02 Daiki Ueno <ueno@gnu.org>
gnulib-tool (func_import): Relax the regex ...
* gnulib-tool.py: For --lgpl, accept value 3orGPLv2.
* pygnulib/GLInfo.py (GLInfo.usage): Update.
* pygnulib/GLConfig.py (GLConfig.setLGPL): Update argument check.
* pygnulib/GLImport.py (GLImport.__init__, GLImport.gnulib_cache):
Update gl_LGPL handling.
(GLImport.prepare): Update license compatibility checks and license
header rewriting.
* pygnulib/GLTestDir.py (GLTestDir.execute): Update license
compatibility checks. Handle also the licenses GPLv3+, GPL, LGPLv3+.
Diffstat (limited to 'gnulib-tool.py')
| -rwxr-xr-x | gnulib-tool.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gnulib-tool.py b/gnulib-tool.py index 0e5914a402..0864d0d8c2 100755 --- a/gnulib-tool.py +++ b/gnulib-tool.py @@ -24,7 +24,7 @@ # - Line length is not limited to 79 characters. # - Line breaking before or after binary operators? Better before, like in GNU. # You can use this command to check the style: -# $ pycodestyle --max-line-length=136 --ignore=E265,W503,E241,E711,E712,E201,E202 gnulib-tool.py pygnulib/*.py +# $ pycodestyle --max-line-length=136 --ignore=E265,W503,E241,E711,E712,E201,E202,E221 gnulib-tool.py pygnulib/*.py #=============================================================================== @@ -330,8 +330,9 @@ def main(): # lgpl parser.add_argument('--lgpl', dest='lgpl', - default=False, - type=int, + default=None, + action='append', + choices=['2', '3orGPLv2', '3'], nargs='?') # makefile parser.add_argument("--makefile-name", @@ -545,10 +546,12 @@ def main(): elif index == 6: testflags += [constants.TESTS['all-tests']] lgpl = cmdargs.lgpl + if lgpl != None: + lgpl = lgpl[-1] + if lgpl == None: + lgpl = True libtool = cmdargs.libtool makefile = cmdargs.makefile - if lgpl == None: - lgpl = True avoids = cmdargs.avoids if avoids != None: avoids = [ module |