Skip to content

modbuild.in: use global nameref ModuleConfig, cleanup, bug fixes #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gsell merged 1 commit into from
Oct 21, 2026
Merged

modbuild.in: use global nameref ModuleConfig, cleanup, bug fixes #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 68 additions & 60 deletions src/libpbuild.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,115 +27,116 @@ pbcore::err(){
}

pbcore::err_invalid_unpacker(){
pbcore::err ${__PB_EC['CONFIG']} "Unsupported tool for unpacking -- '$1'"
pbcore::err "${__PB_EC['CONFIG']}" "Unsupported tool for unpacking -- '$1'"
}

pbcore::err_autotools_config_nexists(){
pbcore::err ${__PB_EC['CONFIG']} "autotools configuration not available, aborting..."
pbcore::err "${__PB_EC['CONFIG']}" "autotools configuration not available, aborting..."
}

pbcore::err_cmake_config_nexists(){
pbcore::err ${__PB_EC['CONFIG']} "CMake configuration not available, aborting..."
pbcore::err "${__PB_EC['CONFIG']}" "CMake configuration not available, aborting..."
}

pbcore::err_setting_relstage(){
pbcore::err ${__PB_EC['CONFIG']} \
pbcore::err "${__PB_EC['CONFIG']}" \
"release cannot be set to '${1}'" \
"since the dependency '${2}' is '${3}!"
"since the dependency '${2}' is '${3}'!"
}

pbcore::err_func_not_defined(){
pbcore::err ${__PB_EC['CONFIG']} "function '${1}' is not defined!"
pbcore::err "${__PB_EC['CONFIG']}" "function '${1}' is not defined!"
}

pbcore::err_sub_package_name_missing(){
pbcore::err ${__PB_EC['CONFIG']} "Name of sub-package missing in" \
pbcore::err "${__PB_EC['CONFIG']}" "Name of sub-package missing in" \
$'\n'"==="$'\n'"${1}"$'\n'"==="$'\n'
}

pbcore::err_sub_package_version_missing(){
pbcore::err ${__PB_EC['CONFIG']} "Version of sub-package not specified in" \
pbcore::err "${__PB_EC['CONFIG']}" "Version of sub-package not specified in" \
$'\n'"==="$'\n'"${1}"$'\n'"==="$'\n'
}

pbcore::err_invalid_value(){
pbcore::err ${__PB_EC['CONFIG']} "Invalid value '$1' for '$2'!"
pbcore::err "${__PB_EC['CONFIG']}" "Invalid value '$1' for '$2'!"
}
pbcore::err_group_dependency(){
pbcore::err ${__PB_EC['CONFIG']} "Issue with group dependencies:" \
"required environemnt variables for '$1' are not set!"
pbcore::err "${__PB_EC['CONFIG']}" "Issue with group dependencies:" \
"required environment variables for '$1' are not set!"
}

pbcore::err_invalid_group_name(){
pbcore::err ${__PB_EC['CONFIG']} "The group name '$1' is not allowed." \
pbcore::err "${__PB_EC['CONFIG']}" "The group name '$1' is not allowed." \
"Note: hierarchical group names are case-sensitive!"
}
pbcore::err_file_not_found(){
pbcore::err ${__PB_EC['NEXISTS']} "file '${1}' not found!"
pbcore::err "${__PB_EC['NEXISTS']}" "file '${1}' not found!"
}

pbcore::err_binary_nexists(){
pbcore::err ${__PB_EC['NEXISTS']} "binary '${1}' does not exist or is not executable!"
pbcore::err "${__PB_EC['NEXISTS']}" "binary '${1}' does not exist or is not executable!"
}

pbcore::err_modulefile_nexists(){
pbcore::err ${__PB_EC['NEXISTS']} "modulefile '${1}' does not exist!"
pbcore::err "${__PB_EC['NEXISTS']}" "modulefile '${1}' does not exist!"
}

pbcore::err_module_nexists(){
pbcore::err ${__PB_EC['NEXISTS']} "module '${1}' does not exist!"
pbcore::err "${__PB_EC['NEXISTS']}" "module '${1}' does not exist!"
}

pbcore::err_configure_failed(){
pbcore::err ${__PB_EC['CMD']} "configure failed"
pbcore::err "${__PB_EC['CMD']}" "configure failed"
}

pbcore::err_cmake_failed(){
pbcore::err ${__PB_EC['CMD']} "CMake failed"
pbcore::err "${__PB_EC['CMD']}" "CMake failed"
}

pbcore::err_compilation_failed(){
pbcore::err ${__PB_EC['CMD']} "compilation failed"
pbcore::err "${__PB_EC['CMD']}" "compilation failed"
}

pbcore::err_installation_failed(){
pbcore::err ${__PB_EC['CMD']} "installation failed"
pbcore::err "${__PB_EC['CMD']}" "installation failed"
}

pbcore::err_download(){
pbcore::err ${__PB_EC['CMD']} "downloading source file '${1}' failed!"
pbcore::err "${__PB_EC['CMD']}" "downloading source file '${1}' failed!"
}

pbcore::err_unpack(){
pbcore::err ${__PB_EC['CMD']} "unpacking file '${1}' failed!"
pbcore::err "${__PB_EC['CMD']}" "unpacking file '${1}' failed!"
}

pbcore::err_hashsum(){
pbcore::err ${__PB_EC['CMD']} "SHA256 hash mismatch for file '${1}'!"
pbcore::err "${__PB_EC['CMD']}" "SHA256 hash mismatch for file '${1}'!"
}

pbcore::err_patching(){
pbcore::err ${__PB_EC['CMD']} "applying patch '${1}' failed!"
pbcore::err "${__PB_EC['CMD']}" "applying patch '${1}' failed!"
}

pbcore::err_loading_module(){
pbcore::err ${__PB_EC['CMD']} "loading module '${1}' failed!"
pbcore::err "${__PB_EC['CMD']}" "loading module '${1}' failed!"
}

pbcore::err_chdir(){
pbcore::err ${__PB_EC['CMD']} "Changing to directory '${1}' failed!"
pbcore::err "${__PB_EC['CMD']}" "Changing to directory '${1}' failed!"
}

pbcore::err_aborting(){
pbcore::err ${__PB_EC['CMD']} "function '${1}' return with error. Aborting!"
pbcore::err "${__PB_EC['CMD']}" "function '${1}' return with error. Aborting!"
}

pbcore::err_building_subpkg(){
pbcore::err ${__PB_EC['CMD']} "Building sub-package '${1}' failed!"
pbcore::err "${__PB_EC['CMD']}" "Building sub-package '${1}' failed!"
}

# :FIXME: maybe we should output file name, function name and line number
pbcore::err_internal(){
pbcore::err ${__PB_EC['INTERNAL']} "oops: internal error!"
pbcore::err "${__PB_EC['INTERNAL']}" "oops: internal error!"
}

#******************************************************************************
Expand Down Expand Up @@ -252,7 +253,7 @@ readonly -f pbuild::use_flag
## first directory will be stripped.
## 7z: 7z doesn't support stripping directories. The corresponding
## argument will be ignored.
## none: none just copyies the source file to the given target directory.
## none: none just copies the source file to the given target directory.
##
## Arguments:
## $1 - the source file
Expand Down Expand Up @@ -360,7 +361,8 @@ pbuild::prep() {

fi
if [[ -n "${ModuleConfig[patch_file:$i]}" ]]; then
local -- patch_file=$(envsubst <<<"${ModuleConfig[patch_file:$i]}")
local -- patch_file=''
patch_file=$(envsubst <<<"${ModuleConfig[patch_file:$i]}")
local -- patch_strip="${ModuleConfig[patch_strip:$i]:-${PATCH_STRIP_DEFAULT}}"
[[ "${patch_strip}" =~ ^[0-9]+$ ]] || \
pbcore::err_invalid_value "${patch_strip}" 'patch_strip'
Expand All @@ -386,9 +388,9 @@ pbuild::prep() {
}

##
## pbuild::prep_pip3 - create a Python virtual environemnt
## pbuild::prep_pip3 - create a Python virtual environment
##
## Create a Python virtual environemnt in the installation directory of
## Create a Python virtual environment in the installation directory of
## the module.
##
## Arguments:
Expand Down Expand Up @@ -450,7 +452,6 @@ pbuild::configure() {
;;
esac
local -a config_args=()
local -a config_args=()
if [[ -n "${ModuleConfig['configure_args']}" ]]; then
readarray -t config_args <<< "${ModuleConfig['configure_args']}"
fi
Expand Down Expand Up @@ -495,23 +496,27 @@ pbuild::compile() {
local -- tmp_v="$V"
local -- restore='no'
local -- tmp_verbose=''
if [[ -v VERBOSE ]]; then
tmp_verbose="${VERBOSE}"
restore='yes'
fi
if (( Options['verbose'] > 0 )); then
declare -g V=1
declare -g VERBOSE=1
if [[ -v VERBOSE ]]; then
tmp_verbose="${VERBOSE}"
restore='yes'
fi
declare -gx V=1
declare -gx VERBOSE=1
else
unset V
fi
# number of parallel make jobs
local -i num_jobs="${Options['num_jobs']}"
make -j${num_jobs} -e || pbcore::err_compilation_failed
declare -gx V="${tmp_v}"
if [[ "${restore}" == 'yes' ]]; then
VERBOSE="${tmp_verbose}"
fi
if (( Options['verbose'] > 0 )); then
if [[ "${restore}" == 'yes' ]]; then
VERBOSE="${tmp_verbose}"
else
unset VERBOSE
fi
fi
}

##
Expand Down Expand Up @@ -699,7 +704,9 @@ pbcore::unpack() {
local -r unpacker="$5"

if ! pbuild::unpack "${fname}" "${target_dir}" "${strip}" "${unpacker}"; then
if [[ -n "${src_dir}" && "${src_dir}" != "${BUILDBLOCK_DIR}" ]]; then
if [[ -n "${src_dir}" \
&& "${src_dir}" != "${BUILDBLOCK_DIR}" \
&& "${src_dir}" != "${BUILDBLOCK_DIR}/files" ]]; then
rm -f "${fname}"
fi
pbcore::err_unpack "${fname}"
Expand Down Expand Up @@ -822,7 +829,7 @@ pbcore::load_overlays(){
[[ -n ${ModuleConfig['use_overlays']} ]] || return 0

local -a use_overlays=()
readarray -t use_overlays <<< "${config['use_overlays']}"
readarray -t use_overlays <<< "${ModuleConfig['use_overlays']}"

pbcore::info "using overlays ${use_overlays[*]}"
eval "$( modulecmd bash use "${use_overlays[@]}" )"
Expand Down Expand Up @@ -862,7 +869,8 @@ pbcore::load_dependencies() {
fi

pbcore::info "Loading module: ${m}"
local output="$(modulecmd bash load "${m}")";
local output=''
output="$(modulecmd bash load "${m}")";
eval "${output}"
pbcore::is_loaded "$m" || pbcore::err_loading_module "${m}"
done
Expand Down Expand Up @@ -943,7 +951,7 @@ pbcore::set_mod_dir_and_prefix() {
esac
mod_dir+="${mod_name}"
ModuleConfig['modulefile_dir']="${mod_dir}"
echo "${prefix}"
PREFIX="${prefix}"
}

##
Expand Down Expand Up @@ -1124,7 +1132,8 @@ pbcore::set_relstages() {
local version="${config_file##*/}"
version="${version/.config-}"
local name="${ModuleConfig['name']}/${version}"
local relstage=$(awk '/relstage:/ {print $2}' "${config_file}")
local relstage=''
relstage=$(awk '/relstage:/ {print $2}' "${config_file}")
case ${relstage} in
unstable )
echo " module-tag u ${name}" \
Expand Down Expand Up @@ -1152,15 +1161,15 @@ pbcore::set_relstages() {
## was specified.
##
## Arguments:
## noone
## none
##
pbcore::cleanup_modulefiles(){
[[ "${Options['is_subpkg']}" == 'yes' ]] && return 0

local -r ol_name="${ModuleConfig['overlay']}"
local -r ol_modulefiles_root="${OverlayInfo[${ol_name}:modulefiles_root]}"
local -r modulefile_dir="${ModuleConfig['modulefile_dir']}"
local -r mod_version="${ModuleConfig['mod_version']}"
local -r mod_version="${ModuleConfig['version']}"

local -- ol=''
for ol in "${Overlays[@]}"; do
Expand Down Expand Up @@ -1299,16 +1308,16 @@ pbcore::remove_file() {
## none
##
pbcore::remove_module() {
local -e modulefile_dir="${ModuleConfig['modulefile_dir']}"
local -r modulefile_dir="${ModuleConfig['modulefile_dir']}"

if [[ -n "${PREFIX}" && -d "${PREFIX}" && "${PREFIX}" != '/' ]]; then
pbcore::info "removing all files in '${PREFIX}' ..."
rm -rf "${PREFIX}"
fi
pbcore::remove_file "${modulefile_dir}/${rm_cfg['version']}"
pbcore::remove_file "${modulefile_dir}/.release-${rm_cfg['version']}"
pbcore::remove_file "${modulefile_dir}/.config-${rm_cfg['version']}"
pbcore::remove_file "${modulefile_dir}/.deps-${rm_cfg['version']}"
pbcore::remove_file "${modulefile_dir}/${ModuleConfig['version']}"
pbcore::remove_file "${modulefile_dir}/.release-${ModuleConfig['version']}"
pbcore::remove_file "${modulefile_dir}/.config-${ModuleConfig['version']}"
pbcore::remove_file "${modulefile_dir}/.deps-${ModuleConfig['version']}"
rmdir -p "${modulefile_dir}" 2>/dev/null || :
}

Expand Down Expand Up @@ -1369,7 +1378,7 @@ pbcore::build_sub_packages(){
* )
cfg::err_invalid_key \
'ModuleConfig' \
"in requested sub-package '${i}" \
"in requested sub-package '${i}'" \
"${key}"
;;
esac
Expand Down Expand Up @@ -1400,9 +1409,8 @@ pbcore::build_sub_packages(){
## TBW
##
pbcore::build(){
declare -ng ModuleConfig="$1"
declare -ng Options="$2"
shift 2
declare -ng Options="$1"
shift 1
local -a with_modules=( "$@" )

ModuleConfig['namevers']="${ModuleConfig['name']}/${ModuleConfig['version']}"
Expand Down Expand Up @@ -1438,7 +1446,7 @@ pbcore::build(){
source "${BUILD_SCRIPT}"

if [[ "${Options['is_subpkg']}" != 'yes' ]]; then
PREFIX=$(pbcore::set_mod_dir_and_prefix)
pbcore::set_mod_dir_and_prefix
else
PREFIX="${Options['prefix']}"
# sub-packages don't have a modulefile!
Expand Down
10 changes: 4 additions & 6 deletions src/libpmodules.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ set -o nounset
shopt -s extglob
shopt -s nullglob

(( BASH_VERSINFO[0] >= 5 && BASH_VERSINFO[1] >= 3 )) || \
{
printf "%s\n" "Bash 5.3+ required" 1>&2
exit 255
}

if (( BASH_VERSINFO[0] < 5 || (BASH_VERSINFO[0] == 5 && BASH_VERSINFO[1] < 3) )); then
echo "Bash 5.3+ is required." 1>&2
exit 255
fi

declare -r __MODULEFILES_DIR__='modulefiles'
declare -g PMODULES_DISTFILESDIR PMODULES_TMPDIR
Expand Down
7 changes: 6 additions & 1 deletion src/libstd.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,7 +813,12 @@ yml::get_keys(){
local -- __gk_str
__gk_str="$(yq -N "${__gk_key}" <<<"${__gk_text}")" || \
yml::die_parsing "${__gk_text}"
if [[ -z "${__gk_str}" || "${__gk_str}" == 'null' || "${__gk_str}" == 'false' ]]; then
if [[ -z "${__gk_str}" \
|| "${__gk_str}" == 'null' \
|| "${__gk_str}" == 'false' \
|| "${__gk_str}" == '{}' \
|| "${__gk_str}" == '[]' \
]]; then
__gk_keys=()
return 0
fi
Expand Down
Loading
Loading