From patchwork Fri Sep 30 23:28:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 17477 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 A52B6C327E for ; Fri, 30 Sep 2022 23:28:38 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id ADB3062851; Sat, 1 Oct 2022 01:28:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664580516; bh=/gNIajDTrXpROnh2FoBJEljECA37fxNXoV50+qPg76k=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=AGliE5oh+gEtaJHUN9fPG+i85RH8Pw2Bwk4Iy21BqT/1ZIWSTU89hRTrV0satiL4O 3uQHgzY2PuyOujoPJpOTm5fv+kM4c8NiKs+ornIJdsM/KzuRZMbb+KYS5cn0nQ/iDp j/vYf28X39YP+E9C7Np04N4VJN2b1Yl4PtfTuTI2pzHfmMdZo9rjJO7a25t5tDDvKR EC/xTH8Xwq2Xgr9YTOnjno5Mgz/Sn4gehI71ypl2DypHJPq6IdRnzmxmOHS2tK25fs lXlpaf2WuPkeeBvI6EPLyAdwep+4KSIM1xDXNN8YIjKbA8Ga5sm90SC5UrP2jWCItJ TX+LPtfpZL8tw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2E76561F75 for ; Sat, 1 Oct 2022 01:28:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Dx3+D4Z5"; dkim-atps=neutral Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 931DC8EB; Sat, 1 Oct 2022 01:28:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1664580514; bh=/gNIajDTrXpROnh2FoBJEljECA37fxNXoV50+qPg76k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dx3+D4Z5s2mYO/ORIS4tCPRo8gQB1iIcGd0QkAjOEoobPDp5vv/NlCXJJgLgNgrtd aZSf1VX9dP8yr46NfJwTiarIVBjcKGOarmq6XcwpDYCs6EMKs3EGgHkEXdV4NQdHZ3 sSUlp8xOqUWeMy5Cf7YQ4T4mOvNjhwn6QjO8MBu8= To: libcamera devel Date: Sat, 1 Oct 2022 00:28:22 +0100 Message-Id: <20220930232826.82753-2-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220930232826.82753-1-kieran.bingham@ideasonboard.com> References: <20220930232826.82753-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 1/5] meson: Fix typo X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The comment for supporting the custom script on 'make dist' contains a typo. Fix it. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 72919102ad55..2c6173b4f97e 100644 --- a/meson.build +++ b/meson.build @@ -26,7 +26,7 @@ endif libcamera_version = libcamera_git_version.split('+')[0] -# This script gererates the .tarball-version file on a 'meson dist' command. +# This script generates the .tarball-version file on a 'meson dist' command. meson.add_dist_script('utils/run-dist.sh') # Configure the build environment. From patchwork Fri Sep 30 23:28:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 17478 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 B4586BD16B for ; Fri, 30 Sep 2022 23:28:39 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 57D2362855; Sat, 1 Oct 2022 01:28:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664580517; bh=dTWMzveiXxXcBtahVhGqUKVibadgQsVcDDKnP4WUY1w=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=2wwir/bH7l5wSLx3kqbSyo5HvmCrobAiS3i063pT0+ZAUhkp6iwFVKxctqLKSJx8T 1WKZndVS9g1IxHPusAPyEtqIvyxCH2oddRo3feKwNf8a2Rsh9rP4gXY8chqWTmLJNu AlXFcioHY8LvIMtzzvQVzPGSBaFMO1YjcdlUNx9LZqTKFc765zp4OVX/SsrWg7LKDR heXkY2z6gHkZMV63c9u5yt3WfJASExSiFrQI4CMeoYuDSyZouizCRppEb3dMIFppQ0 3kImPl1cmHVoyVJCWzkpA8H7OSGMRRAYdo/u/7PtYZmkg4MhMXW4yVA/xODY0IfV4D t8MLRTaG1zIZw== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7BFA862854 for ; Sat, 1 Oct 2022 01:28:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="hugm8HJz"; dkim-atps=neutral Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E7E6AD97; Sat, 1 Oct 2022 01:28:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1664580515; bh=dTWMzveiXxXcBtahVhGqUKVibadgQsVcDDKnP4WUY1w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hugm8HJzdVW7IwpQPDVBlhgbUKtb9DMYuw09F5gRsgXqnlMwfjccV2b9RzhGvdt+H QwVIlIMiMQNO5q8YYtnt2mtnglCenmo8cDppaE54X9hW0GLjWQGgUZd4J8wnmKw8Tx MPwnuJEAZfDqYK0nlZmW4L67HVhS1OdqgPm1QQXo= To: libcamera devel Date: Sat, 1 Oct 2022 00:28:23 +0100 Message-Id: <20220930232826.82753-3-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220930232826.82753-1-kieran.bingham@ideasonboard.com> References: <20220930232826.82753-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 2/5] meson: Shared Object version handling X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The libcamera project is not yet ready to declare ABI nor API stability, but it will benefit the community to be able to provide more regular release cycles to determine 'versioned' points of history. Ideally, these releases will be made at any ABI breakage, but can be made at arbitary time based points along the way. To support releases which may not be ABI stable, declare the soversion of both the libcamera and libcamera-base library to be dependant upon both the major and minor component of the project version. As part of this, introduce a new 'Versions' summary section to highlight the different version components that may become apparent within any given build. Reviewed-by: Jacopo Mondi Signed-off-by: Kieran Bingham --- Documentation/Doxyfile.in | 4 +++- meson.build | 15 +++++++++++++++ src/libcamera/base/meson.build | 1 + src/libcamera/meson.build | 1 + 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in index 88dfcddaebf6..761807005294 100644 --- a/Documentation/Doxyfile.in +++ b/Documentation/Doxyfile.in @@ -46,7 +46,9 @@ EXCLUDE = @TOP_SRCDIR@/include/libcamera/base/span.h \ @TOP_BUILDDIR@/include/libcamera/internal/tracepoints.h \ @TOP_BUILDDIR@/src/libcamera/proxy/ -EXCLUDE_PATTERNS = @TOP_BUILDDIR@/include/libcamera/ipa/*_serializer.h \ +EXCLUDE_PATTERNS = @TOP_BUILDDIR@/src/libcamera/libcamera.so* \ + @TOP_BUILDDIR@/src/libcamera/base/libcamera-base.so* \ + @TOP_BUILDDIR@/include/libcamera/ipa/*_serializer.h \ @TOP_BUILDDIR@/include/libcamera/ipa/*_proxy.h \ @TOP_BUILDDIR@/include/libcamera/ipa/ipu3_*.h \ @TOP_BUILDDIR@/include/libcamera/ipa/raspberrypi_*.h \ diff --git a/meson.build b/meson.build index 2c6173b4f97e..2a7b90133bbd 100644 --- a/meson.build +++ b/meson.build @@ -26,6 +26,21 @@ endif libcamera_version = libcamera_git_version.split('+')[0] +# Enforce Major and Minor as part of the soversion. Until we make a first major +# release and remain on version 0.x, each release may denote ABI instabilty. +# We can continue to consider that a patch level increment should be +# compatible. +project_version = meson.project_version().split('.') +libcamera_soversion = project_version[0] + '.' + project_version[1] + +summary({ + 'Project': meson.project_version(), + 'Sources': libcamera_git_version, + 'libcamera': libcamera_version, + 'soname': libcamera_soversion, + }, + section : 'Versions') + # This script generates the .tarball-version file on a 'meson dist' command. meson.add_dist_script('utils/run-dist.sh') diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build index 3b9d74efe935..65933905a5df 100644 --- a/src/libcamera/base/meson.build +++ b/src/libcamera/base/meson.build @@ -51,6 +51,7 @@ libcamera_base_args = [ '-DLIBCAMERA_BASE_PRIVATE' ] libcamera_base_lib = shared_library('libcamera-base', [libcamera_base_sources, libcamera_base_headers], version : libcamera_version, + soversion : libcamera_soversion, name_prefix : '', install : true, cpp_args : libcamera_base_args, diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 63b47b177fd2..f905c15ece85 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -160,6 +160,7 @@ libcamera_deps = [ libcamera = shared_library('libcamera', libcamera_sources, version : libcamera_version, + soversion : libcamera_soversion, name_prefix : '', install : true, include_directories : includes, From patchwork Fri Sep 30 23:28:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 17479 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 6320EC327E for ; Fri, 30 Sep 2022 23:28:40 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A689262864; Sat, 1 Oct 2022 01:28:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664580517; bh=55jiiPSdKhgdvCpap48x9H6192vCuUf+C1+oNkpU3Us=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=C+BcBYb7oHyme/qOtsUQ8+BL9eSKCG0sJsBqYNQyACSzxOjQDTBulnFPEeg94wSgv yJrKvR/VPyTv4LDfCDvjPpbDCXE67p17wXkEG01Z1WQog6jwU3XkfElrhMzhrUV0Kq E6CdkgqDdDsYHtzL0mzgsemAgfMtteu3IfD8vGw3os7wn/7eILuZVogOvCStho73cW rVEaqMDIp2p1by5KIKTR1PuKoQ/GEZS7RmyHxKzQ1sNgRHfLMn1U78Fw3/lWq/985S 6iqyGNhN/u2OSQZqzSTNW/AyUaqIWGbiYYrhJ898wFIpNl/6nDy+lvsh/X+2VJhHot hbuvaTWYW3OcQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CBF2062856 for ; Sat, 1 Oct 2022 01:28:35 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="GeBsnY54"; dkim-atps=neutral Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4F95AE89; Sat, 1 Oct 2022 01:28:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1664580515; bh=55jiiPSdKhgdvCpap48x9H6192vCuUf+C1+oNkpU3Us=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GeBsnY54C8+g5XKuFZtrUvQui1M1Vs5aISzGeXXVR9OraHGQXbfHswb9DQvbZ7pAL /WGv1l8EsLwkm9Jn7zdS+/Z2IZrqeHtWl9nvUDxPhUVUjjGZB80cIfvlcjmSMZqiaN FYb/8cyKnXm+MyhgCCtpNLTJr1i76ZIGYXx7eiaM= To: libcamera devel Date: Sat, 1 Oct 2022 00:28:24 +0100 Message-Id: <20220930232826.82753-4-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220930232826.82753-1-kieran.bingham@ideasonboard.com> References: <20220930232826.82753-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 3/5] utils: semver: Add version helper X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Provide the semver utility from [0] to make use of it with our versioning and release scripts. [0] https://github.com/fsaintjacques/semver-tool/commit/cac039e8b73bc6fdf2f328437ed40f52abf0d05a Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham Reviewed-by: Jacopo Mondi --- utils/semver | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 419 insertions(+) create mode 100755 utils/semver diff --git a/utils/semver b/utils/semver new file mode 100755 index 000000000000..5b25f40ba48c --- /dev/null +++ b/utils/semver @@ -0,0 +1,419 @@ +#!/usr/bin/env bash + +set -o errexit -o nounset -o pipefail + +NAT='0|[1-9][0-9]*' +ALPHANUM='[0-9]*[A-Za-z-][0-9A-Za-z-]*' +IDENT="$NAT|$ALPHANUM" +FIELD='[0-9A-Za-z-]+' + +SEMVER_REGEX="\ +^[vV]?\ +($NAT)\\.($NAT)\\.($NAT)\ +(\\-(${IDENT})(\\.(${IDENT}))*)?\ +(\\+${FIELD}(\\.${FIELD})*)?$" + +PROG=semver +PROG_VERSION="3.3.0" + +USAGE="\ +Usage: + $PROG bump (major|minor|patch|release|prerel []|build ) + $PROG compare + $PROG diff + $PROG get (major|minor|patch|release|prerel|build) + $PROG validate + $PROG --help + $PROG --version + +Arguments: + A version must match the following regular expression: + \"${SEMVER_REGEX}\" + In English: + -- The version must match X.Y.Z[-PRERELEASE][+BUILD] + where X, Y and Z are non-negative integers. + -- PRERELEASE is a dot separated sequence of non-negative integers and/or + identifiers composed of alphanumeric characters and hyphens (with + at least one non-digit). Numeric identifiers must not have leading + zeros. A hyphen (\"-\") introduces this optional part. + -- BUILD is a dot separated sequence of identifiers composed of alphanumeric + characters and hyphens. A plus (\"+\") introduces this optional part. + + See definition. + + A string as defined by PRERELEASE above. Or, it can be a PRERELEASE + prototype string (or empty) followed by a dot. + + A string as defined by BUILD above. + +Options: + -v, --version Print the version of this tool. + -h, --help Print this help message. + +Commands: + bump Bump by one of major, minor, patch; zeroing or removing + subsequent parts. \"bump prerel\" sets the PRERELEASE part and + removes any BUILD part. A trailing dot in the argument + introduces an incrementing numeric field which is added or + bumped. If no argument is provided, an incrementing numeric + field is introduced/bumped. \"bump build\" sets the BUILD part. + \"bump release\" removes any PRERELEASE or BUILD parts. + The bumped version is written to stdout. + + compare Compare with , output to stdout the + following values: -1 if is newer, 0 if equal, 1 if + older. The BUILD part is not used in comparisons. + + diff Compare with , output to stdout the + difference between two versions by the release type (MAJOR, MINOR, + PATCH, PRERELEASE, BUILD). + + get Extract given part of , where part is one of major, minor, + patch, prerel, build, or release. + + validate Validate if follows the SEMVER pattern (see + definition). Print 'valid' to stdout if the version is valid, otherwise + print 'invalid'. + +See also: + https://semver.org -- Semantic Versioning 2.0.0" + +function error { + echo -e "$1" >&2 + exit 1 +} + +function usage_help { + error "$USAGE" +} + +function usage_version { + echo -e "${PROG}: $PROG_VERSION" + exit 0 +} + +function validate_version { + local version=$1 + if [[ "$version" =~ $SEMVER_REGEX ]]; then + # if a second argument is passed, store the result in var named by $2 + if [ "$#" -eq "2" ]; then + local major=${BASH_REMATCH[1]} + local minor=${BASH_REMATCH[2]} + local patch=${BASH_REMATCH[3]} + local prere=${BASH_REMATCH[4]} + local build=${BASH_REMATCH[8]} + eval "$2=(\"$major\" \"$minor\" \"$patch\" \"$prere\" \"$build\")" + else + echo "$version" + fi + else + error "version $version does not match the semver scheme 'X.Y.Z(-PRERELEASE)(+BUILD)'. See help for more information." + fi +} + +function is_nat { + [[ "$1" =~ ^($NAT)$ ]] +} + +function is_null { + [ -z "$1" ] +} + +function order_nat { + [ "$1" -lt "$2" ] && { echo -1 ; return ; } + [ "$1" -gt "$2" ] && { echo 1 ; return ; } + echo 0 +} + +function order_string { + [[ $1 < $2 ]] && { echo -1 ; return ; } + [[ $1 > $2 ]] && { echo 1 ; return ; } + echo 0 +} + +# given two (named) arrays containing NAT and/or ALPHANUM fields, compare them +# one by one according to semver 2.0.0 spec. Return -1, 0, 1 if left array ($1) +# is less-than, equal, or greater-than the right array ($2). The longer array +# is considered greater-than the shorter if the shorter is a prefix of the longer. +# +function compare_fields { + local l="$1[@]" + local r="$2[@]" + local leftfield=( "${!l}" ) + local rightfield=( "${!r}" ) + local left + local right + + local i=$(( -1 )) + local order=$(( 0 )) + + while true + do + [ $order -ne 0 ] && { echo $order ; return ; } + + : $(( i++ )) + left="${leftfield[$i]}" + right="${rightfield[$i]}" + + is_null "$left" && is_null "$right" && { echo 0 ; return ; } + is_null "$left" && { echo -1 ; return ; } + is_null "$right" && { echo 1 ; return ; } + + is_nat "$left" && is_nat "$right" && { order=$(order_nat "$left" "$right") ; continue ; } + is_nat "$left" && { echo -1 ; return ; } + is_nat "$right" && { echo 1 ; return ; } + { order=$(order_string "$left" "$right") ; continue ; } + done +} + +# shellcheck disable=SC2206 # checked by "validate"; ok to expand prerel id's into array +function compare_version { + local order + validate_version "$1" V + validate_version "$2" V_ + + # compare major, minor, patch + + local left=( "${V[0]}" "${V[1]}" "${V[2]}" ) + local right=( "${V_[0]}" "${V_[1]}" "${V_[2]}" ) + + order=$(compare_fields left right) + [ "$order" -ne 0 ] && { echo "$order" ; return ; } + + # compare pre-release ids when M.m.p are equal + + local prerel="${V[3]:1}" + local prerel_="${V_[3]:1}" + local left=( ${prerel//./ } ) + local right=( ${prerel_//./ } ) + + # if left and right have no pre-release part, then left equals right + # if only one of left/right has pre-release part, that one is less than simple M.m.p + + [ -z "$prerel" ] && [ -z "$prerel_" ] && { echo 0 ; return ; } + [ -z "$prerel" ] && { echo 1 ; return ; } + [ -z "$prerel_" ] && { echo -1 ; return ; } + + # otherwise, compare the pre-release id's + + compare_fields left right +} + +# render_prerel -- return a prerel field with a trailing numeric string +# usage: render_prerel numeric [prefix-string] +# +function render_prerel { + if [ -z "$2" ] + then + echo "${1}" + else + echo "${2}${1}" + fi +} + +# extract_prerel -- extract prefix and trailing numeric portions of a pre-release part +# usage: extract_prerel prerel prerel_parts +# The prefix and trailing numeric parts are returned in "prerel_parts". +# +PREFIX_ALPHANUM='[.0-9A-Za-z-]*[.A-Za-z-]' +DIGITS='[0-9][0-9]*' +EXTRACT_REGEX="^(${PREFIX_ALPHANUM})*(${DIGITS})$" + +function extract_prerel { + local prefix; local numeric; + + if [[ "$1" =~ $EXTRACT_REGEX ]] + then # found prefix and trailing numeric parts + prefix="${BASH_REMATCH[1]}" + numeric="${BASH_REMATCH[2]}" + else # no numeric part + prefix="${1}" + numeric= + fi + + eval "$2=(\"$prefix\" \"$numeric\")" +} + +# bump_prerel -- return the new pre-release part based on previous pre-release part +# and prototype for bump +# usage: bump_prerel proto previous +# +function bump_prerel { + local proto; local prev_prefix; local prev_numeric; + + # case one: no trailing dot in prototype => simply replace previous with proto + if [[ ! ( "$1" =~ \.$ ) ]] + then + echo "$1" + return + fi + + proto="${1%.}" # discard trailing dot marker from prototype + + extract_prerel "${2#-}" prerel_parts # extract parts of previous pre-release +# shellcheck disable=SC2154 + prev_prefix="${prerel_parts[0]}" + prev_numeric="${prerel_parts[1]}" + + # case two: bump or append numeric to previous pre-release part + if [ "$proto" == "+" ] # dummy "+" indicates no prototype argument provided + then + if [ -n "$prev_numeric" ] + then + : $(( ++prev_numeric )) # previous pre-release is already numbered, bump it + render_prerel "$prev_numeric" "$prev_prefix" + else + render_prerel 1 "$prev_prefix" # append starting number + fi + return + fi + + # case three: set, bump, or append using prototype prefix + if [ "$prev_prefix" != "$proto" ] + then + render_prerel 1 "$proto" # proto not same pre-release; set and start at '1' + elif [ -n "$prev_numeric" ] + then + : $(( ++prev_numeric )) # pre-release is numbered; bump it + render_prerel "$prev_numeric" "$prev_prefix" + else + render_prerel 1 "$prev_prefix" # start pre-release at number '1' + fi +} + +function command_bump { + local new; local version; local sub_version; local command; + + case $# in + 2) case $1 in + major|minor|patch|prerel|release) command=$1; sub_version="+."; version=$2;; + *) usage_help;; + esac ;; + 3) case $1 in + prerel|build) command=$1; sub_version=$2 version=$3 ;; + *) usage_help;; + esac ;; + *) usage_help;; + esac + + validate_version "$version" parts + # shellcheck disable=SC2154 + local major="${parts[0]}" + local minor="${parts[1]}" + local patch="${parts[2]}" + local prere="${parts[3]}" + local build="${parts[4]}" + + case "$command" in + major) new="$((major + 1)).0.0";; + minor) new="${major}.$((minor + 1)).0";; + patch) new="${major}.${minor}.$((patch + 1))";; + release) new="${major}.${minor}.${patch}";; + prerel) new=$(validate_version "${major}.${minor}.${patch}-$(bump_prerel "$sub_version" "$prere")");; + build) new=$(validate_version "${major}.${minor}.${patch}${prere}+${sub_version}");; + *) usage_help ;; + esac + + echo "$new" + exit 0 +} + +function command_compare { + local v; local v_; + + case $# in + 2) v=$(validate_version "$1"); v_=$(validate_version "$2") ;; + *) usage_help ;; + esac + + set +u # need unset array element to evaluate to null + compare_version "$v" "$v_" + exit 0 +} + +function command_diff { + validate_version "$1" v1_parts + # shellcheck disable=SC2154 + local v1_major="${v1_parts[0]}" + local v1_minor="${v1_parts[1]}" + local v1_patch="${v1_parts[2]}" + local v1_prere="${v1_parts[3]}" + local v1_build="${v1_parts[4]}" + + validate_version "$2" v2_parts + # shellcheck disable=SC2154 + local v2_major="${v2_parts[0]}" + local v2_minor="${v2_parts[1]}" + local v2_patch="${v2_parts[2]}" + local v2_prere="${v2_parts[3]}" + local v2_build="${v2_parts[4]}" + + if [ "${v1_major}" != "${v2_major}" ]; then + echo "major" + elif [ "${v1_minor}" != "${v2_minor}" ]; then + echo "minor" + elif [ "${v1_patch}" != "${v2_patch}" ]; then + echo "patch" + elif [ "${v1_prere}" != "${v2_prere}" ]; then + echo "prerelease" + elif [ "${v1_build}" != "${v2_build}" ]; then + echo "build" + fi +} + +# shellcheck disable=SC2034 +function command_get { + local part version + + if [[ "$#" -ne "2" ]] || [[ -z "$1" ]] || [[ -z "$2" ]]; then + usage_help + exit 0 + fi + + part="$1" + version="$2" + + validate_version "$version" parts + local major="${parts[0]}" + local minor="${parts[1]}" + local patch="${parts[2]}" + local prerel="${parts[3]:1}" + local build="${parts[4]:1}" + local release="${major}.${minor}.${patch}" + + case "$part" in + major|minor|patch|release|prerel|build) echo "${!part}" ;; + *) usage_help ;; + esac + + exit 0 +} + +function command_validate { + if [[ "$#" -ne "1" ]]; then + usage_help + fi + + if [[ "$1" =~ $SEMVER_REGEX ]]; then + echo "valid" + else + echo "invalid" + fi + + exit 0 +} + +case $# in + 0) echo "Unknown command: $*"; usage_help;; +esac + +case $1 in + --help|-h) echo -e "$USAGE"; exit 0;; + --version|-v) usage_version ;; + bump) shift; command_bump "$@";; + get) shift; command_get "$@";; + compare) shift; command_compare "$@";; + diff) shift; command_diff "$@";; + validate) shift; command_validate "$@";; + *) echo "Unknown arguments: $*"; usage_help;; +esac From patchwork Fri Sep 30 23:28:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 17480 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 89CC1C327F for ; Fri, 30 Sep 2022 23:28:40 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 07DF762866; Sat, 1 Oct 2022 01:28:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664580519; bh=PuN9rlgrcfTyXtsjXTygTaekiAWQVl5FCxfMIkr3pDI=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=TL9PjWtQfGbFSOb/Wa+Dvo2kYYflM2XzArtRjfgicWL8uqWG34723jmGh5fyv/2Cu klfLBTk3lEKTsy986ebFd6BKf4MC2M/960fygppVZdpxCQRccUyeg0ntoe2cD4JRg+ 99ue1nffMls6aqQB98pmyip3X5/6+EDPsIizg+XXgky89+I9dcXO1Ldp3S67Nnt+H6 yhR+iqpGh7ksFC7I/L7ZI6YiU4yn+oaiunWDSz+x1tNgvduo0Ol/dooI46WkpGfw1U 2D3XWnmJmHAL2q4wU7LREWoNcJE7eygYkRHs758gqdeMUEvxnEQOgYmRL+/1cBgl99 Y8vxBzcXKEQbg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2B38062854 for ; Sat, 1 Oct 2022 01:28:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="iKy3VfyB"; dkim-atps=neutral Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B33DE1057; Sat, 1 Oct 2022 01:28:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1664580515; bh=PuN9rlgrcfTyXtsjXTygTaekiAWQVl5FCxfMIkr3pDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iKy3VfyBflDE0bLLKlU3hn3U2XlmBlhetgI82MVwafBXhCj7xRVOCxs8pf8BYhH0P sZcuywgHxlPAR53Yq9PFcW5tvR3p8pWEa/w+UmQFC70wVru33vltxEg/jsvhvq2RS2 A/lS3sBkd25lHL+S+zLqHVxGNPmp/J9mrgoLZFk0= To: libcamera devel Date: Sat, 1 Oct 2022 00:28:25 +0100 Message-Id: <20220930232826.82753-5-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220930232826.82753-1-kieran.bingham@ideasonboard.com> References: <20220930232826.82753-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 4/5] utils: semver: Document licence and source X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Add the SPDX header, and a reference to the upstream source for this helper script. Signed-off-by: Kieran Bingham Reviewed-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- This is kept separate to highlight this is a modification from the original. utils/semver | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/semver b/utils/semver index 5b25f40ba48c..e9d092d94446 100755 --- a/utils/semver +++ b/utils/semver @@ -1,5 +1,8 @@ #!/usr/bin/env bash +# SPDX-License-Identifier: Apache-2.0 +# https://github.com/fsaintjacques/semver-tool + set -o errexit -o nounset -o pipefail NAT='0|[1-9][0-9]*' From patchwork Fri Sep 30 23:28:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 17481 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 B4130C3280 for ; Fri, 30 Sep 2022 23:28:40 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7E3A76286A; Sat, 1 Oct 2022 01:28:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1664580519; bh=FEgtk/B2rLPZcZ3AJ+/Rz7Qo232MLJGHEyQxaasyDR8=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Y52xQ1jVUxTHOF2J7Du3zvoUJgRXJjgWVfNUbyXhM2Y3Q187Luastlj7YED2ghClj PoQmftjex4ya+fxL5/lV0e+F88shderQ8huI9mujBebSFU1+pEJNeNZODyWqFz72K3 HGtOIIu9qA3qBLjmIxqKhPiAV0e1oJdNgLIk7rlJq7v8TYPYLt+iKlw7bjRlhkjw3p ZbBAbBt7yYEcJUnIPfAOAnsy4jKXNEgmM6W7bdYjhxhQyOdm5qtWZH3/BWqbHLEqzv AWSwP6wZju0l2pWWv9mL8bPnmtmfcfdJQB7iWM82PuhI5yW5VUtBt7LvwXeFUN3d0N gEYn6fJO0wKOg== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7E6976285B for ; Sat, 1 Oct 2022 01:28:36 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="cxd+4axO"; dkim-atps=neutral Received: from Monstersaurus.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 14C0710BB; Sat, 1 Oct 2022 01:28:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1664580516; bh=FEgtk/B2rLPZcZ3AJ+/Rz7Qo232MLJGHEyQxaasyDR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cxd+4axOCRLFS3NuAxQkKX4+yzTBTHchq8jh3nSjImI2ZnLUnoz037Ky5+v9qAfEE oFuSAPmTk+up210oFIXeaKatHjIsArrlOW3BXQjBNZWxbAp+Y4RARGpkiQptyRxibh UYqUaMqOOICxER5JF0ESBA/9eltcF1HsW7hQ9iF4= To: libcamera devel Date: Sat, 1 Oct 2022 00:28:26 +0100 Message-Id: <20220930232826.82753-6-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220930232826.82753-1-kieran.bingham@ideasonboard.com> References: <20220930232826.82753-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 5/5] utils: Provide a release script X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Kieran Bingham via libcamera-devel From: Kieran Bingham Reply-To: Kieran Bingham Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Support making releases of libcamera by introducing a helper script which will facilitate the increment of any release version, along with generating an associated tag. Reviewed-by: Jacopo Mondi Signed-off-by: Kieran Bingham --- This can later be extended to support or enforce adding an overview changelog to the commit, and annotated tag. utils/release.sh | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100755 utils/release.sh diff --git a/utils/release.sh b/utils/release.sh new file mode 100755 index 000000000000..13df8457eaa2 --- /dev/null +++ b/utils/release.sh @@ -0,0 +1,45 @@ +#!/bin/sh + +# SPDX-License-Identifier: GPL-2.0-or-later +# Prepare a project release + +# Abort if we are not within the project root or the tree is not clean. +if [ ! -e utils/gen-version.sh ] || [ ! -e .git ]; then + echo "This release script must be run from the root of libcamera git clone." + exit 1 +fi + +if ! git diff-index --quiet HEAD; then + echo "Tree must be clean to release." + exit 1 +fi + +# Identify current version components +version=$(./utils/gen-version.sh) + +# Decide if we are here to bump major, minor, or patch release. +case $1 in + major|minor|patch) + bump=$1; + ;; + *) + echo "You must specify the version bump level: (major, minor, patch)" + exit 1 + ;; +esac + +new_version=$(./utils/semver bump "$bump" "$version") + +echo "Bumping $bump" +echo " Existing version is: $version" +echo " New version is : $new_version" + +# Patch in the version to our meson.build +sed -i -E "s/ version : '.*',/ version : '$new_version',/" meson.build + +# Commit the update +git add meson.build +git commit meson.build -sm "libcamera v$new_version" + +# Create a tag +git tag "v$new_version" -asm "libcamera v$new_version"