summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2023-11-20 13:54:28 +0000
committerNaushir Patuck <naush@raspberrypi.com>2023-11-29 09:05:38 +0000
commitbba4ec63c4b0699b7f7ffb20e4f37af2b996d355 (patch)
treeafb047373376ea73124b58bb5b8af69a0c293c36 /src
parentbd6658943a97288b5673e65649a3a48dac7c78da (diff)
controls: Update argument handling for controls generation scripts
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@raspberrypi.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/meson.build7
-rwxr-xr-xsrc/py/libcamera/gen-py-controls.py4
-rw-r--r--src/py/libcamera/meson.build18
3 files changed, 14 insertions, 15 deletions
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index e49bf850..05ee38da 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 dfd7c179..cfcfd4d1 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 f58c7198..1c3ea184 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