diff --git a/config/families.d/.gitignore b/config/families.d/.gitignore new file mode 100644 index 0000000..fee9217 --- /dev/null +++ b/config/families.d/.gitignore @@ -0,0 +1 @@ +*.conf diff --git a/config/families.d/Compiler.conf b/config/families.d/Compiler.conf deleted file mode 120000 index 4d33b43..0000000 --- a/config/families.d/Compiler.conf +++ /dev/null @@ -1 +0,0 @@ -gcc-4.7.3 \ No newline at end of file diff --git a/config/families.d/HDF5.conf b/config/families.d/HDF5.conf deleted file mode 120000 index b568be6..0000000 --- a/config/families.d/HDF5.conf +++ /dev/null @@ -1 +0,0 @@ -hdf5-1.8.12 \ No newline at end of file diff --git a/config/families.d/HDF5_serial.conf b/config/families.d/HDF5_serial.conf deleted file mode 120000 index e4f6ceb..0000000 --- a/config/families.d/HDF5_serial.conf +++ /dev/null @@ -1 +0,0 @@ -hdf5_serial-1.8.12 \ No newline at end of file diff --git a/config/families.d/MPI.conf b/config/families.d/MPI.conf deleted file mode 120000 index c840704..0000000 --- a/config/families.d/MPI.conf +++ /dev/null @@ -1 +0,0 @@ -openmpi-1.6.5 \ No newline at end of file diff --git a/config/versions.conf b/config/versions.conf index 738d1bd..ab628fa 100644 --- a/config/versions.conf +++ b/config/versions.conf @@ -7,6 +7,7 @@ giflib 5.0.6 gmp 5.1.1 gnuplot 4.6.3 gsl 1.15 +fsstress 1.0.0 h5hut_serial 1.99.13 H5hut 1.99.13 H5root 1.2.0 diff --git a/lib/libem.bash b/lib/libem.bash index 883ed50..fe2ed5d 100644 --- a/lib/libem.bash +++ b/lib/libem.bash @@ -375,8 +375,8 @@ function _set_link() { local x IFS='/' x=(${_path}) - local -r _target="../"$(eval printf "../%.s" {1..${#x[@]}})${EM_ETCDIR##*/}/"${EM_FAMILY}/${P}" - ln -fs "${_target}" "${EM_MODULENAME##*/}" + local -r _target="../"$(eval printf "../%.s" {1..${#x[@]}})${EM_ETCDIR##*/}/"${EM_FAMILY}/${P}/modulefile" + ln -fhs "${_target}" "${EM_MODULENAME##*/}" ) } diff --git a/scripts/fsstress.build b/scripts/fsstress.build new file mode 100755 index 0000000..c4445a5 --- /dev/null +++ b/scripts/fsstress.build @@ -0,0 +1,34 @@ +#!/bin/bash + +source "$(dirname $0)/../lib/libem.bash" + +function em.configure() { + : +} + +function em.build() { + cd "${EM_SRCDIR}" + + make -j ${JOBS} +} + +function em.install() { + cd "${EM_SRCDIR}" + mkdir -p ${PREFIX}/bin + install -m 0755 fsstress "${PREFIX}/bin" +} + +#function em.install_doc() { +# install -m 0444 \ +# Copyright \ +# ChangeLog \ +# NEWS \ +# README \ +# README.1ST \ +# "${DOCDIR}" +#} + +#em.supported_os 'Linux' +em.add_to_family 'System' +em.set_build_dependencies "${COMPILER}" +em.make_all