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>
9020vga
Leah Rowe 2023-12-23 08:43:42 +00:00
parent aa525142aa
commit 9d5d98ebae
5 changed files with 9 additions and 3 deletions

2
build
View File

@ -45,7 +45,7 @@ main()
initialise_command $@ && shift 1
check_git
check_project "fail"
check_project
git_init
execute_command $@

View File

@ -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()

View File

@ -28,6 +28,8 @@ eval "$(setvars "" ${v} boards _displaymode _payload _keyboard all targets)"
main()
{
check_project
while [ $# -gt 0 ]; do
case ${1} in
help)

View File

@ -21,6 +21,8 @@ main()
esac
done
check_project
vdir="${vdir}/${version}"
relname="${projectname}-${version}"
src_dirname="${relname}_src"

View File

@ -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 $@