From e63f105c965989078188a22d737c10bfddd8e264 Mon Sep 17 00:00:00 2001
From: Andrej Rode <mail@andrejro.de>
Date: Wed, 10 Feb 2016 22:48:54 +0100
Subject: gr-utils: modtool: add option --copyright to add function to
automatically fillout name in LICENSE file.
---
gr-utils/python/modtool/modtool_add.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
(limited to 'gr-utils/python/modtool/modtool_add.py')
diff --git a/gr-utils/python/modtool/modtool_add.py b/gr-utils/python/modtool/modtool_add.py
index a4812c8105..f04d9d90d9 100644
--- a/gr-utils/python/modtool/modtool_add.py
+++ b/gr-utils/python/modtool/modtool_add.py
@@ -53,6 +53,8 @@ class ModToolAdd(ModTool):
choices=self._block_types, default=None, help="One of %s." % ', '.join(self._block_types))
ogroup.add_option("--license-file", type="string", default=None,
help="File containing the license header for every source code file.")
+ ogroup.add_option("--copyright", type="string", default=None,
+ help="Name of the copyright holder (you or your company) MUST be a quoted string.")
ogroup.add_option("--argument-list", type="string", default=None,
help="The argument list for the constructor and make functions.")
ogroup.add_option("--add-python-qa", action="store_true", default=None,
@@ -77,7 +79,6 @@ class ModToolAdd(ModTool):
self._info['blocktype'] = raw_input("Enter block type: ")
if self._info['blocktype'] not in self._block_types:
print 'Must be one of ' + str(self._block_types)
-
# Allow user to specify language interactively if not set
self._info['lang'] = options.lang
if self._info['lang'] is None:
@@ -102,8 +103,12 @@ class ModToolAdd(ModTool):
raise ModToolException('Invalid block name.')
print "Block/code identifier: " + self._info['blockname']
self._info['fullblockname'] = self._info['modname'] + '_' + self._info['blockname']
+ self._info['copyrightholder'] = options.copyright
+ if self._info['copyrightholder'] is None:
+ self._info['copyrightholder'] = '<+YOU OR YOUR COMPANY+>'
+ elif self._info['is_component']:
+ print "For GNUradio components the FSF is added as copyright holder"
self._info['license'] = self.setup_choose_license()
-
if options.argument_list is not None:
self._info['arglist'] = options.argument_list
else:
@@ -140,7 +145,7 @@ class ModToolAdd(ModTool):
elif self._info['is_component']:
return Templates['grlicense']
else:
- return Templates['defaultlicense']
+ return get_template('defaultlicense', **self._info)
def _write_tpl(self, tpl, path, fname):
""" Shorthand for writing a substituted template to a file"""
--
cgit v1.2.3
From baab51695118fcdf7201c5f52cd2b12420f7328d Mon Sep 17 00:00:00 2001
From: Andrej Rode <mail@andrejro.de>
Date: Fri, 12 Feb 2016 14:31:25 +0100
Subject: gr_modtool: add test on license_file for option --copyright. fix typo
---
gr-utils/python/modtool/modtool_add.py | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
(limited to 'gr-utils/python/modtool/modtool_add.py')
diff --git a/gr-utils/python/modtool/modtool_add.py b/gr-utils/python/modtool/modtool_add.py
index f04d9d90d9..3627dc6ad1 100644
--- a/gr-utils/python/modtool/modtool_add.py
+++ b/gr-utils/python/modtool/modtool_add.py
@@ -103,11 +103,13 @@ class ModToolAdd(ModTool):
raise ModToolException('Invalid block name.')
print "Block/code identifier: " + self._info['blockname']
self._info['fullblockname'] = self._info['modname'] + '_' + self._info['blockname']
- self._info['copyrightholder'] = options.copyright
- if self._info['copyrightholder'] is None:
- self._info['copyrightholder'] = '<+YOU OR YOUR COMPANY+>'
- elif self._info['is_component']:
- print "For GNUradio components the FSF is added as copyright holder"
+ if not options.license_file:
+ self._info['copyrightholder'] = options.copyright
+ if self._info['copyrightholder'] is None:
+ self._info['copyrightholder'] = '<+YOU OR YOUR COMPANY+>'
+ elif self._info['is_component']:
+ print "For GNU Radio components the FSF is added as copyright holder"
+ self._license_file = options.license_file
self._info['license'] = self.setup_choose_license()
if options.argument_list is not None:
self._info['arglist'] = options.argument_list
@@ -127,7 +129,6 @@ class ModToolAdd(ModTool):
print "Warning: Autotools modules are not supported. ",
print "Files will be created, but Makefiles will not be edited."
self._skip_cmakefiles = True
- self._license_file = options.license_file
def setup_choose_license(self):
""" Select a license by the following rules, in this order:
--
cgit v1.2.3