Merge branch 'master' of gitorious.psi.ch:scicomp/psi-modules-buildenvironment

config/Compiler.conf

@@ -0,0 +1 @@
+gcc-4.7.3

config/Compiler.d/Compiler.conf

@@ -0,0 +1 @@
+../Compiler.conf

config/HDF5.conf

@@ -0,0 +1 @@
+hdf5-1.8.12

config/HDF5.d/Compiler.conf

@@ -0,0 +1 @@
+../Compiler.conf

config/HDF5.d/HDF5.conf

@@ -0,0 +1 @@
+../HDF5.conf

config/HDF5.d/MPI.conf

@@ -0,0 +1 @@
+../MPI.conf

config/MPI.conf

@@ -0,0 +1 @@
+openmpi-1.6.5

config/MPI.d/Compiler.conf

@@ -0,0 +1 @@
+../Compiler.conf

config/MPI.d/HDF5.conf

@@ -0,0 +1 @@
+../HDF5.conf

config/MPI.d/MPI.conf

@@ -0,0 +1 @@
+../MPI.conf

config/Tools.d/Compiler.conf

@@ -0,0 +1 @@
+../Compiler.conf

config/hdf5.d/hdf5.conf

@@ -1 +0,0 @@
-../hdf5-1.8.12

config/hdf5.d/mpi.conf

@@ -1 +0,0 @@
-../openmpi-1.6.5

config/hdf5_serial.d/compiler.conf

@@ -1 +0,0 @@
-../gcc-4.7.3

config/modules

@@ -1,17 +0,0 @@
-if [[ -z $EM_PREFIX ]]; then
-	EM_PREFIX_AFS='/afs/psi.ch/sys/@sys'
-	EM_PREFIX_LOCAL='/opt/em'
-
-	if [[ -d ${EM_PREFIX_LOCAL} ]]; then
-	        declare -x EM_PREFIX=${EM_PREFIX_LOCAL}
-	elif [[ -d ${EM_PREFIX_AFS} ]]; then
-        	declare -x EM_PREFIX=${EM_PREFIX_AFS}
-	else
-        	echo "Oops: cannot initialize Modules!"
-        	return 1
-	fi
-fi
-
-declare	-x	MODULES_VERSION='3.2.10'
-
-

config/mpi.d/compiler.conf

@@ -1 +0,0 @@
-../gcc-4.7.3

config/mpi.d/hdf5.conf

@@ -1 +0,0 @@
-../hdf5-1.8.12

config/mpi.d/mpi.conf

@@ -1 +0,0 @@
-../openmpi-1.6.5

lib/libem.bash

@@ -59,8 +59,6 @@ _P=$(echo $P | tr [:lower:] [:upper:])
 _V=${_P}_VERSION
 unset ${_V}
 
-declare -rx CORE_VERSIONS_DIR="${SHLIBDIR}/../config/core.d"
-
 declare -i  JOBS=3
 
 #while read _name _version; do
@@ -282,22 +280,24 @@ function _set_env() {
 
 	# build module name
 	case ${EM_FAMILY} in
-	    core )
+	    Tools )
 		EM_MODULENAME="${P}/${V}"
 		;;
-	    compiler )
+	    Programming )
+		EM_MODULENAME="${P}/${V}"
+		;;
+	    Compiler )
 		EM_MODULENAME="${COMPILER}/${COMPILER_VERSION}/${P}/${V}"
 		;;
-	    mpi )
+	    MPI )
 		EM_MODULENAME="${COMPILER}/${COMPILER_VERSION}/${MPI}/${MPI_VERSION}/${P}/${V}"
 		;;
-	    hdf5 )
+	    HDF5 )
 		EM_MODULENAME="${COMPILER}/${COMPILER_VERSION}/${MPI}/${MPI_VERSION}/${HDF5}/${HDF5_VERSION}/${P}/${V}"
 		;;
-	    hdf5_serial )
+	    HDF5_serial )
 		EM_MODULENAME="${COMPILER}/${COMPILER_VERSION}/hdf5/${HDF5_SERIAL_VERSION}/${P}/${V}"
 		;;
-
 	esac
 
 	# set PREFIX of module

scripts/H5hut.build

@@ -31,7 +31,7 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family 'hdf5'
+em.add_to_family 'HDF5'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5'
 em.set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "${MPI}" "vtk" "hdf5"
 em.make_all

scripts/H5hut_serial.build

@@ -23,7 +23,7 @@ function em.install() {
 	make -C tools install
 }
 
-em.add_to_family 'hdf5_serial'
+em.add_to_family 'HDF5_serial'
 em.set_runtime_dependencies "${COMPILER}" 'hdf5_serial'
 em.set_build_dependencies   "autoconf" "automake" "libtool" "${COMPILER}" "vtk" "hdf5_serial"
 em.make_all

scripts/Lmod.build

@@ -19,7 +19,7 @@ function em.build() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Tools'
 em.set_build_dependencies "lua"
 em.make_all
 em.cleanup_src

scripts/Modules.build

@@ -3,9 +3,10 @@
 source "$(dirname $0)/../config/environment.bash"
 source "$(dirname $0)/../lib/libem.bash"
 
+
 function em.configure() {
 	"${EM_SRCDIR}"/configure \
-		--prefix="${EM_BINDIR}/core" \
+		--prefix="${EM_BINDIR}/${EM_FAMILY}" \
 		--with-module-path="${MODULEPATH_ROOT}" \
 		|| exit 1
 }
@@ -17,5 +18,5 @@ module() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Tools'
 em.make_all

scripts/OPAL.build

@@ -10,8 +10,8 @@ function em.configure() {
 		"${EM_SRCDIR}"
 }
 
-em.add_to_family 'core'
-em.load_family 'hdf5'
+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

scripts/autoconf.build

@@ -23,7 +23,7 @@ function em.install_doc() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.set_build_dependencies "m4"
 em.make_all
 

scripts/automake.build

@@ -23,7 +23,7 @@ function em.install_doc() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
-em.set_build_dependencies "m4" "autoconf"
+em.add_to_family 'Programming'
+em.set_build_dependencies 'm4' 'autoconf'
 em.make_all
 

scripts/cmake.build

@@ -6,7 +6,7 @@ function em.configure() {
 	"${EM_SRCDIR}/bootstrap" --prefix="${PREFIX}"
 }
 
-em.add_to_family 'core'
+em.add_to_family 'Programming'
 em.set_build_dependencies "${COMPILER}"
 em.make_all
 

scripts/emacs.build

@@ -28,7 +28,7 @@ function em.configure() {
 		|| exit 1
 }
 
-em.add_to_family "core"
+em.add_to_family 'Tools'
 em.set_build_dependencies ${build_dependencies}
 em.make_all
 

scripts/gcc.build

@@ -26,7 +26,7 @@ function em.install_doc() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.set_build_dependencies "gmp" "mpfr" "mpc"
 em.make_all
 

scripts/gmp.build

@@ -13,6 +13,6 @@ function em.configure() {
 declare -rx CC=gcc
 declare -rx CPP=/usr/bin/cpp
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.make_all
 

scripts/gnuplot.build

@@ -20,6 +20,6 @@ function em.install_doc() {
  		"${DOCDIR}"
 }
 
-em.add_to_family "core"
+em.add_to_family 'Tools'
 em.set_build_dependencies "${COMPILER}"
 em.make_all

scripts/gsl.build

@@ -22,6 +22,6 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_build_dependencies "${COMPILER}"
 em.make_all

scripts/hdf5.build

@@ -22,7 +22,7 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "mpi"
+em.add_to_family 'MPI'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}"
 em.set_build_dependencies "${COMPILER}" "${MPI}"
 em.make_all

scripts/hdf5_serial.build

@@ -12,7 +12,7 @@ function em.configure() {
 		|| exit 1
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_build_dependencies "${COMPILER}"
 em.make_all
 

scripts/ippl.build

@@ -18,9 +18,9 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "mpi"
+em.add_to_family 'MPI'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies "cmake" "${COMPILER}" "${MPI}"
+em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}"
 em.make_all
 
 

scripts/libtool.build

@@ -21,7 +21,7 @@ function em.install_doc() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.set_build_dependencies "autoconf" "automake"
 em.make_all
 

scripts/lua.build

@@ -18,7 +18,7 @@ function em.build() {
 	make -j ${JOBS}
 }
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.set_build_dependencies "${COMPILER}"
 em.make_all
 em.cleanup_src

scripts/m4.build

@@ -11,5 +11,5 @@ function em.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
+em.add_to_family 'Programming'
 em.make_all

scripts/mathlib.build

@@ -47,7 +47,7 @@ function em.install_doc() {
 	:
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_runtime_dependencies "${COMPILER}"
 em.set_build_dependencies "${COMPILER}"
 em.make_all

scripts/mpc.build

@@ -14,7 +14,7 @@ function em.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
-em.set_build_dependencies "gmp" "mpfr"
+em.add_to_family 'Programming'
+em.set_build_dependencies 'gmp' 'mpfr'
 em.make_all
 

scripts/mpfr.build

@@ -13,6 +13,6 @@ function em.configure() {
 # use system gcc to compile
 declare -rx CC=gcc
 
-em.add_to_family "core"
-em.set_build_dependencies "gmp"
+em.add_to_family 'Programming'
+em.set_build_dependencies 'gmp'
 em.make_all

scripts/openmpi.build

@@ -23,7 +23,7 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_runtime_dependencies "${COMPILER}"
 em.set_build_dependencies "${COMPILER}"
 em.make_all

scripts/parmetis.build

@@ -48,7 +48,7 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "mpi"
+em.add_to_family 'MPI'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}"
 em.set_build_dependencies "${COMPILER}" "${MPI}"
 em.make_all

scripts/root.build

@@ -61,7 +61,7 @@ function em.install() {
 	mv "${PREFIX}/README"  "${DOCDIR}"
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_runtime_dependencies "${COMPILER}"
 em.set_build_dependencies "${COMPILER}"
 em.make_all

scripts/toolchain.build

@@ -1,12 +0,0 @@
-#!/bin/bash
-declare -r SCRIPTS_DIR=$(dirname $0)
-
-bash "${SCRIPTS_DIR}/m4.build" "$@"		|| exit 1
-bash "${SCRIPTS_DIR}/autoconf.build" "$@"	|| exit 1
-bash "${SCRIPTS_DIR}/automake.build" "$@"	|| exit 2
-bash "${SCRIPTS_DIR}/libtool.build" "$@"	|| exit 3
-bash "${SCRIPTS_DIR}/gmp.build" "$@"		|| exit 4
-bash "${SCRIPTS_DIR}/mpfr.build" "$@"		|| exit 5
-bash "${SCRIPTS_DIR}/mpc.build" "$@"		|| exit 6
-bash "${SCRIPTS_DIR}/gcc.build" "$@"		|| exit 7
-

scripts/trilinos.build

@@ -71,8 +71,8 @@ function em.install_doc() {
 		"${DOCDIR}"
 }
 
-em.add_to_family "mpi"
+em.add_to_family 'MPI'
 em.set_runtime_dependencies "${COMPILER}" "${MPI}"
-em.set_build_dependencies "cmake" "${COMPILER}" "${MPI}" "mathlib" "parmetis"
+em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'mathlib' 'parmetis'
 em.make_all
 

scripts/vtk.build

@@ -26,8 +26,8 @@ function em.configure() {
 		"${EM_SRCDIR}"
 }
 
-em.add_to_family "compiler"
+em.add_to_family 'Compiler'
 em.set_runtime_dependencies "${COMPILER}"
-em.set_build_dependencies "cmake" "${COMPILER}"
+em.set_build_dependencies 'cmake' "${COMPILER}"
 em.make_all