diff --git a/config/versions.conf b/config/versions.conf index 56dae3e..a220e3c 100644 --- a/config/versions.conf +++ b/config/versions.conf @@ -1,31 +1,29 @@ -AUTOCONF_VERSION=2.69 -AUTOMAKE_VERSION=1.14 -CMAKE_VERSION=2.8.12.2 -EMACS_VERSION=24.3 -FILEBENCH_VERSION=1.4.9.1 -GCC_VERSION=4.7.3 -GCC_VERSION=4.8.2 -GIFLIB_VERSION=5.0.6 -GMP_VERSION=5.1.1 -GNUPLOT_VERSION=4.6.3 -GSL_VERSION=1.15 -H5HUT_SERIAL_VERSION=1.99.13 -H5HUT_VERSION=1.99.13 -H5ROOT_VERSION=1.2.0 -HDF5_SERIAL_VERSION=1.8.12 -HDF5_VERSION=1.8.12 -IPPL_VERSION=1.1.0 -LIBTOOL_VERSION=2.4.2 -LIBUNGIF_VERSION=4.1.4 -LUA_VERSION=5.1.4.5 -M4_VERSION=1.4.17 -MATHLIB_VERSION=1.0.0 -MODULES_VERSION=3.2.10 -MPC_VERSION=1.0.2 -MPFR_VERSION=3.1.2 -OPAL_VERSION=1.2.0 -PARMETIS_VERSION=3.2.0 -ROOT_VERSION=5.34.11 -TIFF_VERSION=4.0.3 -TRILINOS_VERSION=11.4.1 -VTK_VERSION=5.10.1 +autoconf 2.69 +automake 1.14 +cmake 2.8.12.2 +emacs 24.3 +filebench 1.4.9.1 +giflib 5.0.6 +gmp 5.1.1 +gnuplot 4.6.3 +gsl 1.15 +h5hut_serial 1.99.13 +H5hut 1.99.13 +H5root 1.2.0 +hdf5_serial 1.8.12 +hdf5 1.8.12 +ippl 1.1.0 +libtool 2.4.2 +libungif 4.1.4 +lua 5.1.4.5 +m4 1.4.17 +mathlib 1.0.0 +Modules 3.2.10 +mpc 1.0.2 +mpfr 3.1.2 +OPAL 1.2.0 +parmetis 3.2.0 +root 5.34.11 +tiff 4.0.3 +trilinos 11.4.1 +vtk 5.10.1 diff --git a/lib/libem.bash b/lib/libem.bash index c80016a..886588f 100644 --- a/lib/libem.bash +++ b/lib/libem.bash @@ -1,13 +1,14 @@ #!/bin/bash -declare -rx ARGS="$@" - -declare -rx SHLIBDIR=$( cd $(dirname "$BASH_SOURCE") && pwd ) - -declare -r OS=$(uname -s) - PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/X11/bin +declare -rx ARGS="$@" +declare -rx SHLIBDIR=$( cd $(dirname "$BASH_SOURCE") && pwd ) +declare -r OS=$(uname -s) + +# number of parallel make jobs +declare -i JOBS=3 + source "${SHLIBDIR}/lib.bash" function usage() { @@ -48,26 +49,19 @@ ENV=VALUE exit 1 } + +# # the module name might already be set in the build script(!) -if [[ -z $P ]]; then +#if [[ -z $P ]]; then P=$(basename $0) P=${P%.*} -fi +#fi # unset the version of the module _P=$(echo $P | tr [:lower:] [:upper:]) _V=${_P}_VERSION -unset ${_V} - -declare -i JOBS=3 - -#while read _name _version; do -# [[ -z ${_name} ]] && continue -# [[ -z ${_version} ]] && continue -# [[ "${_name:0:1}" == '#' ]] && continue -# _NAME=$(echo ${_name} | tr [:lower:] [:upper:]) -# eval ${_NAME}_VERSION=$_version -#done < "${VERSIONS}" +#unset ${_V} +#fi DEBUG_ON='' FORCE_REBUILD='' @@ -143,6 +137,8 @@ declare -x CONFIG_DIR="${EM_BASEDIR}/config" declare -x SCRIPTDIR="${EM_BASEDIR}/scripts" declare -x EM_TMPDIR="${EM_BASEDIR}/tmp" +declare -x DEFAULT_VERSIONS_FILE="${CONFIG_DIR}/versions.conf" + # these directories are module dependend declare -x EM_SRCDIR='' declare -x EM_BUILDDIR='' @@ -204,7 +200,14 @@ function em.add_to_family() { die 43 "${1}: family does not exist." fi EM_FAMILY=$1 - source "${CONFIG_DIR}/versions.conf" + while read _name _version; do + [[ -z ${_name} ]] && continue + [[ -z ${_version} ]] && continue + [[ "${_name:0:1}" == '#' ]] && continue + _NAME=$(echo ${_name} | tr [:lower:] [:upper:]) + eval ${_NAME}_VERSION=$_version + done < "${DEFAULT_VERSIONS_FILE}" + #source "${CONFIG_DIR}/versions.conf" for f in "${CONFIG_DIR}/families.d/"*.conf; do source "${f}" done