From 9d5d98ebaeb6555ed7d50cb566e297ee75ee3c83 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 23 Dec 2023 08:43:42 +0000
Subject: set version/projectname properly

lbmk used to set version/versiondate directly in
err.sh, but now it's handled there by a function,
which is called by the main script.

script/update/release hadn't yet been adapted. the
only change necessary is to call check_project()

script/update/trees also makes use of it

script/build/roms is using "projectname"

Signed-off-by: Leah Rowe <leah@libreboot.org>
---
 build                 | 2 +-
 include/err.sh        | 2 ++
 script/build/roms     | 2 ++
 script/update/release | 2 ++
 script/update/trees   | 4 ++--
 5 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/build b/build
index 551e9031..e06c1cea 100755
--- a/build
+++ b/build
@@ -45,7 +45,7 @@ main()
 	initialise_command $@ && shift 1
 
 	check_git
-	check_project "fail"
+	check_project
 	git_init
 
 	execute_command $@
diff --git a/include/err.sh b/include/err.sh
index 3699d6ce..6a8afd41 100755
--- a/include/err.sh
+++ b/include/err.sh
@@ -59,6 +59,8 @@ check_project()
 	    x_ printf "%s\n" "${version}" > version
 	xx_ printf "%s\n" "${versiondate}" > versiondate || \
 	    x_ printf "%s\n" "${versiondate}" > versiondate
+
+	export LOCALVERSION="-${projectname}-${version%%-*}"
 }
 
 setvars()
diff --git a/script/build/roms b/script/build/roms
index f72b66b6..066c5b2e 100755
--- a/script/build/roms
+++ b/script/build/roms
@@ -28,6 +28,8 @@ eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets)"
 
 main()
 {
+	check_project
+
 	while [ $# -gt 0 ]; do
 		case ${1} in
 		help)
diff --git a/script/update/release b/script/update/release
index 76de4ede..c242c9ce 100755
--- a/script/update/release
+++ b/script/update/release
@@ -21,6 +21,8 @@ main()
 		esac
 	done
 
+	check_project
+
 	vdir="${vdir}/${version}"
 	relname="${projectname}-${version}"
 	src_dirname="${relname}_src"
diff --git a/script/update/trees b/script/update/trees
index 47b50dd6..08a86f61 100755
--- a/script/update/trees
+++ b/script/update/trees
@@ -10,8 +10,6 @@ set -u -e
 . "include/option.sh"
 . "include/git.sh"
 
-export LOCALVERSION="-${projectname}-${version%%-*}"
-
 eval "$(setvars "" arch cfgsdir codedir config config_name crossgcc_ada mode \
     elfdir listfile project target target_dir targets tree _f target1)"
 
@@ -36,6 +34,8 @@ main()
 	[ -z "${_f}" ] && err "missing flag (-m/-u/-b/-c/-x/-f/-s/-l/-n)"
 	[ -z "${project}" ] && err "project name not specified"
 
+	check_project
+
 	_cmd="build_projects"
 	[ -f "config/${project}/build.list" ] && _cmd="build_targets"
 	$_cmd $@
-- 
cgit v1.2.1