Message ID | 20200307211326.26994-2-laurent.pinchart@ideasonboard.com |
---|---|
State | Superseded |
Headers | show |
Series |
|
Related | show |
Hi Laurent, On 07/03/2020 21:13, Laurent Pinchart wrote: > The gen-header.sh script that generates libcamera.h takes all .h files > in the include/libcamera/ directory, and manually adds the generated > control_ids.h and version.h. This is fragile, as shown by the failure to > add property_ids.h to the list in commit f870591a9bf5 ("libcamera: > properties: Add location property"). > > To avoid future omissions, take all the .h.in files into account to > generate libcamera.h. This also fixes the missing property_ids.h. > Good idea. > Fixes: f870591a9bf5 ("libcamera: properties: Add location property") > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> And it passes shellcheck too. But it seems I need to add a shellcheck checker to checkstyle.py :-) -- Kieran > --- > include/libcamera/gen-header.sh | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/include/libcamera/gen-header.sh b/include/libcamera/gen-header.sh > index 7f7816c9f879..fcb9c5e16d07 100755 > --- a/include/libcamera/gen-header.sh > +++ b/include/libcamera/gen-header.sh > @@ -16,10 +16,11 @@ cat <<EOF > "$dst_file" > > EOF > > -headers=$(for header in "$src_dir"/*.h ; do > +headers=$(for header in "$src_dir"/*.h "$src_dir"/*.h.in ; do Will the following shorthand work? for header in "$src_dir"/*.{h,h.in} ; Ah - nope that's a bashism. Never mind. > header=$(basename "$header") > + header="${header%.in}" > echo "$header" > -done ; echo "control_ids.h" ; echo "version.h" | sort) > +done | sort) > > for header in $headers ; do > echo "#include <libcamera/$header>" >> "$dst_file" >
diff --git a/include/libcamera/gen-header.sh b/include/libcamera/gen-header.sh index 7f7816c9f879..fcb9c5e16d07 100755 --- a/include/libcamera/gen-header.sh +++ b/include/libcamera/gen-header.sh @@ -16,10 +16,11 @@ cat <<EOF > "$dst_file" EOF -headers=$(for header in "$src_dir"/*.h ; do +headers=$(for header in "$src_dir"/*.h "$src_dir"/*.h.in ; do header=$(basename "$header") + header="${header%.in}" echo "$header" -done ; echo "control_ids.h" ; echo "version.h" | sort) +done | sort) for header in $headers ; do echo "#include <libcamera/$header>" >> "$dst_file"
The gen-header.sh script that generates libcamera.h takes all .h files in the include/libcamera/ directory, and manually adds the generated control_ids.h and version.h. This is fragile, as shown by the failure to add property_ids.h to the list in commit f870591a9bf5 ("libcamera: properties: Add location property"). To avoid future omissions, take all the .h.in files into account to generate libcamera.h. This also fixes the missing property_ids.h. Fixes: f870591a9bf5 ("libcamera: properties: Add location property") Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> --- include/libcamera/gen-header.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)