[libcamera-devel] [PATCH v3 2/7] controls: Update argument handling for controls generation scripts
Kieran Bingham
kieran.bingham at ideasonboard.com
Tue Nov 28 16:37:21 CET 2023
Quoting Jacopo Mondi via libcamera-devel (2023-11-27 16:47:03)
> Hi Naush
>
> On Fri, Nov 24, 2023 at 12:37:08PM +0000, Naushir Patuck via libcamera-devel wrote:
> > The template file to the gen-controls.py and gen-py-controls.py is now
> > passed in through the '-t' or '--template' command line argument instead
> > of being a positional argument. This will allow multiple input files to
> > be provided to the scripts in a future commit.
> >
> > Signed-off-by: Naushir Patuck <naush at raspberrypi.com>
>
> Reviewed-by: Jacopo Mondi <jacopo.mondi at ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
>
> Thanks
> j
>
> > ---
> > include/libcamera/meson.build | 7 ++++---
> > src/libcamera/meson.build | 7 ++++---
> > src/py/libcamera/gen-py-controls.py | 4 ++--
> > src/py/libcamera/meson.build | 18 ++++++++----------
> > utils/gen-controls.py | 4 ++--
> > 5 files changed, 20 insertions(+), 20 deletions(-)
> >
> > diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
> > index 2c8c0258c95e..5fb772e6dd14 100644
> > --- a/include/libcamera/meson.build
> > +++ b/include/libcamera/meson.build
> > @@ -41,12 +41,13 @@ control_source_files = {
> > control_headers = []
> >
> > foreach header, mode : control_source_files
> > - input_files = files('../../src/libcamera/' + header +'.yaml', header + '.h.in')
> > + input_files = files('../../src/libcamera/' + header +'.yaml')
> > + template_file = files(header + '.h.in')
> > control_headers += custom_target(header + '_h',
> > input : input_files,
> > output : header + '.h',
> > - command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@',
> > - '--mode', mode],
> > + command : [gen_controls, '-o', '@OUTPUT@',
> > + '--mode', mode, '-t', template_file, '@INPUT@'],
> > install : true,
> > install_dir : libcamera_headers_install_dir)
> > endforeach
> > diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> > index e49bf850b355..05ee38daf22b 100644
> > --- a/src/libcamera/meson.build
> > +++ b/src/libcamera/meson.build
> > @@ -128,12 +128,13 @@ endif
> > control_sources = []
> >
> > foreach source, mode : control_source_files
> > - input_files = files(source +'.yaml', source + '.cpp.in')
> > + input_files = files(source +'.yaml')
> > + template_file = files(source + '.cpp.in')
> > control_sources += custom_target(source + '_cpp',
> > input : input_files,
> > output : source + '.cpp',
> > - command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@',
> > - '--mode', mode])
> > + command : [gen_controls, '-o', '@OUTPUT@',
> > + '--mode', mode, '-t', template_file, '@INPUT@'])
> > endforeach
> >
> > libcamera_sources += control_sources
> > diff --git a/src/py/libcamera/gen-py-controls.py b/src/py/libcamera/gen-py-controls.py
> > index dfd7c179a883..cfcfd4d16acf 100755
> > --- a/src/py/libcamera/gen-py-controls.py
> > +++ b/src/py/libcamera/gen-py-controls.py
> > @@ -93,10 +93,10 @@ def main(argv):
> > help='Mode is either "controls" or "properties"')
> > parser.add_argument('--output', '-o', metavar='file', type=str,
> > help='Output file name. Defaults to standard output if not specified.')
> > + parser.add_argument('--template', '-t', type=str, required=True,
> > + help='Template file name.')
> > parser.add_argument('input', type=str,
> > help='Input file name.')
> > - parser.add_argument('template', type=str,
> > - help='Template file name.')
> > args = parser.parse_args(argv[1:])
> >
> > if args.mode not in ['controls', 'properties']:
> > diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build
> > index f58c7198ee9e..1c3ea1843ac0 100644
> > --- a/src/py/libcamera/meson.build
> > +++ b/src/py/libcamera/meson.build
> > @@ -28,29 +28,27 @@ pycamera_sources = files([
> >
> > # Generate controls
> >
> > -gen_py_controls_input_files = files([
> > - '../../libcamera/control_ids.yaml',
> > - 'py_controls_generated.cpp.in',
> > -])
> > +gen_py_controls_input_files = files('../../libcamera/control_ids.yaml')
> > +gen_py_controls_template = files('py_controls_generated.cpp.in')
> >
> > gen_py_controls = files('gen-py-controls.py')
> >
> > pycamera_sources += custom_target('py_gen_controls',
> > input : gen_py_controls_input_files,
> > output : ['py_controls_generated.cpp'],
> > - command : [gen_py_controls, '--mode', 'controls', '-o', '@OUTPUT@', '@INPUT@'])
> > + command : [gen_py_controls, '--mode', 'controls', '-o', '@OUTPUT@',
> > + '-t', gen_py_controls_template, '@INPUT@'])
> >
> > # Generate properties
> >
> > -gen_py_property_enums_input_files = files([
> > - '../../libcamera/property_ids.yaml',
> > - 'py_properties_generated.cpp.in',
> > -])
> > +gen_py_property_enums_input_files = files('../../libcamera/property_ids.yaml')
> > +gen_py_properties_template = files('py_properties_generated.cpp.in')
> >
> > pycamera_sources += custom_target('py_gen_properties',
> > input : gen_py_property_enums_input_files,
> > output : ['py_properties_generated.cpp'],
> > - command : [gen_py_controls, '--mode', 'properties', '-o', '@OUTPUT@', '@INPUT@'])
> > + command : [gen_py_controls, '--mode', 'properties', '-o', '@OUTPUT@',
> > + '-t', gen_py_properties_template, '@INPUT@'])
> >
> > # Generate formats
> >
> > diff --git a/utils/gen-controls.py b/utils/gen-controls.py
> > index 4c8d41eb9997..6680ecf84acb 100755
> > --- a/utils/gen-controls.py
> > +++ b/utils/gen-controls.py
> > @@ -337,10 +337,10 @@ def main(argv):
> > help='Mode of operation')
> > parser.add_argument('--output', '-o', metavar='file', type=str,
> > help='Output file name. Defaults to standard output if not specified.')
> > + parser.add_argument('--template', '-t', dest='template', type=str, required=True,
> > + help='Template file name.')
> > parser.add_argument('input', type=str,
> > help='Input file name.')
> > - parser.add_argument('template', type=str,
> > - help='Template file name.')
> >
> > args = parser.parse_args(argv[1:])
> >
> > --
> > 2.34.1
> >
More information about the libcamera-devel
mailing list