pmodules/Pmodules
1
0
Fork 0
mirror of https://github.com/Pmodules/Pmodules.git synced 2026-06-28 10:29:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

pick changes from version 1.0

Browse Source
This commit is contained in:
gsell
2023-04-05 16:23:58 +02:00
parent 8deb1e69d8
commit 9558522bba
7 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Pmodules/libmodules.tcl
+1
View File
@@ -192,6 +192,7 @@ proc _pmodules_setenv { PREFIX name version } {
set setenv_dirs [dict create \
"${PREFIX}/include" "${NAME}_INCLUDE_DIR" \
"${PREFIX}/lib" "${NAME}_LIBRARY_DIR" \
"${PREFIX}/lib64" "${NAME}_LIBRARY_DIR" \
]
set prepend_dirs [dict create \
"${PREFIX}/bin" { "PATH" } \
Pmodules/libpbuild.bash
+10 -10
View File
@@ -552,10 +552,7 @@ pbuild::prep() {
break
fi
done
(( ${#SOURCE_URLS[@]} == 0 )) && \
std::die 3 \
"%s " "${module_name}/${module_version}:" \
"Download source not set!"
(( ${#SOURCE_URLS[@]} == 0 )) && return 0
${mkdir} -p "${PMODULES_DISTFILESDIR}"
local i=0
local source_fname
@@ -1183,6 +1180,9 @@ _build_module() {
"${PMODULES_MODULEFILES_DIR}" \
"${names[@]}" \
"${module_name}")
if [[ -L "${modulefile_dir}" ]]; then
modulefile_dir=$(readlink -m "${modulefile_dir}")
fi
modulefile_name="${modulefile_dir}/${module_version}"
PREFIX="${ol_inst_root}/${GROUP}/${module_name}/${module_version}"
@@ -1382,7 +1382,7 @@ _build_module() {
std::info "%s "\
"${module_name}/${module_version}:" \
"removing modulefile from overlay '${ol}' ..."
${rm} "${fname}"
${rm} -f "${fname}"
fi
fname="${dir}/.release-${module_version}"
if [[ -e "${fname}" ]]; then
@@ -1390,7 +1390,7 @@ _build_module() {
"%s " \
"${module_name}/${module_version}:" \
"removing release file from overlay '${ol}' ..."
${rm} "${fname}"
${rm} -f "${fname}"
fi
done
}
@@ -1451,7 +1451,7 @@ _build_module() {
"%s " \
"${module_name}/${module_version}:" \
"Cleaning up '${SRC_DIR}'..."
rm -rf "${SRC_DIR##*/}"
${rm} -rf "${SRC_DIR##*/}"
};
return 0
}
@@ -1553,7 +1553,7 @@ _build_module() {
"%s " \
"${module_name}/${module_version}:" \
"removing modulefile '${modulefile_name}' ..."
[[ "${dry_run}" == 'no' ]] && ${rm} -v "${modulefile_name}"
[[ "${dry_run}" == 'no' ]] && ${rm} -vf "${modulefile_name}"
fi
local release_file="${modulefile_dir}/.release-${module_version}"
if [[ -e "${release_file}" ]]; then
@@ -1561,7 +1561,7 @@ _build_module() {
"%s " \
"${module_name}/${module_version}:" \
"removing release file '${release_file}' ..."
[[ "${dry_run}" == 'no' ]] && rm -v "${release_file}"
[[ "${dry_run}" == 'no' ]] && ${rm} -vf "${release_file}"
fi
${rmdir} -p "${modulefile_dir}" 2>/dev/null || :
}
@@ -1595,7 +1595,7 @@ _build_module() {
# :FIXME: add comments what and why we are doing this.
#
local -r logfile="${BUILDBLOCK_DIR}/pbuild.log"
rm -f "${logfile}"
${rm} -f "${logfile}"
if [[ "${verbose}" == 'yes' ]]; then
exec > >(${tee} -a "${logfile}")
else
Pmodules/modbuild.in
+11
View File
@@ -451,6 +451,17 @@ build_modules_legacy() {
local name="${tokens[0]%/*}"
version="${tokens[0]#*/}"
release="${tokens[1]}"
case ${release} in
unstable|stable|deprecated|remove|removed)
:
;;
* )
std::info "%s " \
"${name}/${version}:" \
"invalid release stage '${release}'!"
std::die 10 "Aborting..."
;;
esac
with_modules=( "${tokens[@]:2}" )
pbuild.build_module_legacy \
"${name}" "${version}" \
build
+1 -1
View File
@@ -5,7 +5,7 @@ declare -rx VERSION='1.1.11'
declare -rx BASH5_VERSION='5.2.15'
declare -rx TCL_VERSION='8.6.13'
declare -rx TCLLIB_VERSION='1.21'
declare -rx MODULES_VERSION='3.2.10.1'
declare -rx MODULES_VERSION='3.2.10.2'
# for macOS only
declare -rx GETOPT_VERSION='1.1.6'
recipes/010-bash
+1 -1
View File
@@ -3,7 +3,7 @@
# https://www.gnu.org/software/bash/
#
P=bash
V=${BASH5_VERSION:-5.1.16}
V=${BASH5_VERSION:-5.2.15}
FNAME="$P-$V.tar.gz"
DOWNLOAD_URL="https://ftp.gnu.org/gnu/$P/${FNAME}"
recipes/020-tcl
+1 -1
View File
@@ -3,7 +3,7 @@
# https://www.tcl.tk
#
P=tcl
V=${TCL_VERSION:-8.6.12}
V=${TCL_VERSION:-8.6.13}
FNAME="$P$V-src.tar.gz"
DOWNLOAD_URL="https://prdownloads.sourceforge.net/tcl/${FNAME}"
recipes/040-modules
+1 -1
View File
@@ -3,7 +3,7 @@
# https://core.tcl-lang.org
#
P=modules
V=${MODULES_VERSION:-3.2.10.1}
V=${MODULES_VERSION:-3.2.10.2}
FNAME="$P-$V.tar.gz"
DOWNLOAD_URL="https://amas.web.psi.ch/Downloads/$P/$P-$V.tar.bz2"