Merge pull request #53 from plattfot/52/configure_version_at_build_time

Configure version at build time

Author: plattfot

.github/workflows/makefile.yml

@@ -21,3 +21,7 @@ jobs:
       run: mkdir -p build/{usr/bin,usr/lib,etc}
     - name: Build and install
       run: make install PREFIX=build
+    - name: Smoke test baksnapper
+      run: ./build/usr/bin/baksnapper --version
+    - name: Smoke test baksnapperd
+      run: ./build/usr/bin/baksnapperd --version

CHANGELOG.d/20251126T213311--set-version-from-mesonmake__changed.md

@@ -0,0 +1,4 @@
+<!-- SPDX-FileCopyrightText: 2025 Fredrik Salomonsson <plattfot@posteo.net> -->
+<!-- SPDX-License-Identifier: GPL-3.0-or-later -->
+### Changed
+- Set version in scripts using meson/make. [#52](https://github.com/plattfot/baksnapper/issues/52)

Makefile

@@ -30,9 +30,13 @@ $(PREFIX_BIN) $(PREFIX_LIB)/systemd/system $(PREFIX_ETC)/baksnapper/example:
 .PHONY: install bin systemd etc
 install: bin systemd
 
+__root_dir=$(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+__version=$(shell $(__root_dir)build-aux/version)
 bin: | $(PREFIX_BIN)
-	@install  baksnapper.sh $|/baksnapper
-	@install  baksnapperd.sh $|/baksnapperd
+	@sed 's/@VERSION@/${__version}/' baksnapper.sh > $|/baksnapper
+	@chmod 744 $|/baksnapper
+	@sed 's/@VERSION@/${__version}/' baksnapperd.sh > $|/baksnapperd
+	@chmod 744 $|/baksnapperd
 
 systemd: etc | $(PREFIX_LIB)/systemd/system
 	@install --mode=644 systemd/baksnapper@.timer $|/

baksnapper.sh

@@ -127,7 +127,7 @@ Fredrik "PlaTFooT" Salomonsson
 EOF
 
 read -rd '' version <<EOF
-baksnapper (baksnapper) 2.5.0
+baksnapper (baksnapper) @VERSION@
 Copyright (C) 2015-2025  Fredrik Salomonsson
 Copyright (C) 2021       Nathan Dehnel
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.

baksnapperd-denotebak.sh

@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 read -rd '' version <<EOF
-baksnapperd-denotebak (baksnapper) 2.4.0
+baksnapperd-denotebak (baksnapper) @VERSION@
 Copyright (C) 2025  Fredrik Salomonsson
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
 This is free software: you are free to change and redistribute it.

baksnapperd.sh

@@ -9,7 +9,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 read -rd '' version <<EOF
-baksnapperd (baksnapper) 2.4.0
+baksnapperd (baksnapper) @VERSION@
 Copyright (C) 2015-2025  Fredrik Salomonsson
 Copyright (C) 2021-2022  Nathan Dehnel
 Copyright (C) 2023       Juergen Gleiss

build-aux/version

@@ -4,11 +4,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-major=2
-minor=5
-patch=0
-
-version=$major.$minor.$patch
+version=2.5.0
 
 read -rd '' help <<EOF
 Usage: $0 [OPTIONS...]
@@ -43,19 +39,20 @@ do
 key=$1
 case $key in
     -s|--short)
-        version=$major.$minor
+        result=${version%.*}
         shift
         ;;
     -M|--major)
-        version=$major
+        result=${version%%.*}
         shift
         ;;
     -m|--minor)
-        version=$minor
+        short=${version%.*}
+        result=${short#*.}
         shift
         ;;
     -p|--patch)
-        version=$patch
+        result=${version##*.}
         shift
         ;;
     -h|--help)
@@ -69,4 +66,4 @@ case $key in
 esac
 done
 
-echo $version
+echo "${result:-$version}"