From patchwork Wed Mar 1 21:18:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Riesch X-Patchwork-Id: 18322 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E2DC4BE080 for ; Wed, 1 Mar 2023 21:18:16 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 28F4A6266A; Wed, 1 Mar 2023 22:18:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1677705496; bh=v+5eNk3KwvMHNvYshM9LusGZFn03mJEY1PEe2a6VnQE=; h=To:Date:List-Id:List-Post:From:List-Subscribe:List-Unsubscribe: List-Archive:Reply-To:List-Help:Subject:From; b=sM2wrQOtn2pGu9usgeBSVM8rokBj10ps5DzacRhGP6ysw3GPlaYubynP6KVOG7HG5 Z4uoCH048doDs9fq7PSJCNSvvxEvGi+2PvLtGaS0uqqkhc9rlTwRjJvWnuirJvtnBb B1Dpi4PRhuKCu7sbqxqp4xAoXYJFhGEDC8UbTDZ+li13JAyeaHF5AhHUbewq0ZRgru APvNB+MUGzOlqI96xy+MHKktClfqs1dgba5r29AJolG+ft17zkr/OZ2+Lj/AflJNYQ pfyxdiqPMl6GHoSY5gYmqBkOBDv/6XDRbRgTANeH6bjMLNGjUiS44RaEcVrel9qL82 fOpL2gUkfjVuA== To: libcamera-devel@lists.libcamera.org Date: Wed, 1 Mar 2023 22:18:00 +0100 MIME-Version: 1.0 Message-ID: List-Id: List-Post: X-Patchwork-Original-From: Michael Riesch via libcamera-devel From: Michael Riesch Precedence: list X-Mailman-Version: 2.1.29 X-BeenThere: libcamera-devel@lists.libcamera.org List-Subscribe: , List-Unsubscribe: , List-Archive: Reply-To: Michael Riesch List-Help: Subject: [libcamera-devel] [PATCH v3] meson: Align handling of build metadata Content-Disposition: inline Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" 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 --- Changes in v3: - revert re-ordering of libcamera_version assignment v2 of this series follows a discussion with kbingham in #libcamera Changes in v2: - revise patch message to reflect the current mismatch and the proposed fix better - introduce the 'project_version' variable to avoid three .split() operations meson.build | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 9eee9d39..0f89b45a 100644 --- a/meson.build +++ b/meson.build @@ -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'