Commit 90c5d695 authored by gsell's avatar gsell
Browse files

simplified family configuration

parent 0ab9b601
......@@ -195,28 +195,22 @@ function _load_build_dependencies() {
done
}
function em.load_family() {
function em.add_to_family() {
if [[ -z ${1} ]]; then
printf "${FUNCNAME}: Missing family argument"
exit 42
die 42 "${FUNCNAME}: Missing family argument."
fi
if [[ ! -d ${EM_ETCDIR}/${1} ]]; then
printf "${FUNCNAME}: ${1}: family does not exist."
exit 42
dir 43 "${1}: family does not exist."
fi
for f in "${CONFIG_DIR}/${1}.d/"*.conf; do
EM_FAMILY=$1
source "${CONFIG_DIR}/versions.conf"
for f in "${CONFIG_DIR}/families.d/"*.conf; do
source "${f}"
done
eval ${ENVIRONMENT_ARGS}
}
function em.add_to_family() {
EM_FAMILY=$1
source "${CONFIG_DIR}/versions.conf"
em.load_family "$1"
}
function em.set_runtime_dependencies() {
EM_DEPENDENCIES=("$@")
}
......
......@@ -16,7 +16,6 @@ function em.configure() {
}
em.add_to_family 'Tools'
em.load_family 'Programming'
em.set_runtime_dependencies "${COMPILER}" 'root'
em.set_build_dependencies 'autoconf' 'automake' 'libtool' "${COMPILER}" 'hdf5_serial' 'H5hut_serial' 'root'
em.make_all
......
......@@ -11,7 +11,6 @@ function em.configure() {
}
em.add_to_family 'Tools'
em.load_family 'HDF5'
em.set_runtime_dependencies "${COMPILER}" "${MPI}"
em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'hdf5' 'H5hut' 'trilinos' 'ippl' 'gsl'
em.make_all
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment