NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

meson: Align handling of build metadata

Browse source 
The build metadata is split off correctly from the version string
obtained with utils/gen-version.sh, but for the meson project version
this step is not carried out. However, since libcamera uses Semantic
Versioning, it should be possible to add build metadata to the meson
project version. Align the handling of the build metadata to resolve
this mismatch.

Signed-off-by: Michael Riesch <michael.riesch@wolfvision.net>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Michael Riesch 2023-03-01 22:18:00 +01:00 • committed by Laurent Pinchart
parent 16546269aa
commit f852b7fbc4
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
meson.build
View file

@ -25,13 +25,14 @@ if libcamera_git_version == ''
endif
libcamera_version = libcamera_git_version.split('+')[0]
project_version = meson.project_version().split('+')[0]
# A shallow clone, or a clone without a reachable tag equivalent to the
# meson.project_version() could leave the project in a mis-described state.
# Produce a warning in this event, and fix to a best effort.
if libcamera_version != meson.project_version()
if libcamera_version != project_version
warning('The sources disagree about the version: '
+ libcamera_version + ' != ' + meson.project_version())
+ libcamera_version + ' != ' + project_version)
summary({'libcamera git version' : libcamera_git_version,
'Source version match' : false,
@ -40,9 +41,9 @@ if libcamera_version != meson.project_version()
# Replace the version components reported by git with the release version,
# but keep all trailing information supplied by git.
libcamera_git_version = (meson.project_version() +
libcamera_git_version = (project_version +
libcamera_git_version.strip(libcamera_version))
libcamera_version = meson.project_version()
libcamera_version = project_version
# Append a marker to show we have modified this version string
libcamera_git_version += '-nvm'