From e1b6ccf69ec42f24d751466cee00b265fe44e899 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Thu, 16 Oct 2025 15:46:44 +0100 Subject: xbmk: sort global variables alphabetically also separate some of the special ones. this makes the variables easier to read/find. Signed-off-by: Leah Rowe --- include/tree.sh | 98 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 48 deletions(-) (limited to 'include/tree.sh') diff --git a/include/tree.sh b/include/tree.sh index 2020c450..450d79cf 100644 --- a/include/tree.sh +++ b/include/tree.sh @@ -7,48 +7,50 @@ # flag e.g. ./mk -b <-- mkflag would be "b" flag="" -xarch="" -srcdir="" -premake="" -gnatdir="" -xlang="" -mode="" -makeargs="" -elfdir="" -cmd="" -project="" -target="" -target_dir="" -targets="" -xgcctree="" -release="" -bootstrapargs="" -mkhelper="" +# macros, overridden depending on the flag +if_dry_build=":" +if_not_dry_build="" + autoconfargs="" -listfile="" autogenargs="" -buildtype="" -rev="" +badhash="" +badtghash="" +bootstrapargs="" build_depend="" -gccdir="" +buildtype="" +cleanargs="" cmakedir="" +cmd="" defconfig="" -postmake="" -mkhelpercfg="" -if_dry_build=":" -if_not_dry_build="" dest_dir="" -mdir="" -cleanargs="" -gccver="" +do_make="" +elfdir="" +forcepull="" +gccdir="" gccfull="" -gnatver="" +gccver="" +gnatdir="" gnatfull="" -do_make="" -badhash="" -badtghash="" +gnatver="" +listfile="" +makeargs="" +mdir="" +mkhelper="" +mkhelpercfg="" +mode="" +postmake="" +premake="" +project="" +release="" +rev="" +srcdir="" +target="" +target_dir="" +targets="" tree="" -forcepull="" +xarch="" +xgcctree="" +xlang="" trees() { @@ -259,23 +261,23 @@ handle_defconfig() configure_project() { - cleanargs="" - build_depend="" + _tcfg="$1/target.cfg" + autoconfargs="" - xgcctree="" - postmake="" - makeargs="" + badhash="" + badtghash="" + bootstrapargs="" + build_depend="" buildtype="" + cleanargs="" + makeargs="" mkhelper="" - bootstrapargs="" + postmake="" premake="" release="" - xlang="" xarch="" - badhash="" - badtghash="" - - _tcfg="$1/target.cfg" + xgcctree="" + xlang="" if [ ! -f "$_tcfg" ]; then buildtype="auto" @@ -526,12 +528,12 @@ check_gnu_path() err "Host '$1' unavailable" "check_gnu_path" "$@" fi - gccver="" - gccfull="" - gnatver="" - gnatfull="" gccdir="" + gccfull="" + gccver="" gnatdir="" + gnatfull="" + gnatver="" if host_gcc_gnat_match "$@"; then return 0 -- cgit v1.2.1