diff --git a/config/versions.conf b/config/versions.conf index 19365ab..9205394 100644 --- a/config/versions.conf +++ b/config/versions.conf @@ -3,6 +3,7 @@ automake 1.14 boost 1.55.0 BoxLib 2014-02-28 cmake 2.8.12.2 +dialog 1.2.1 emacs 24.3 filebench 1.4.9.1 giflib 5.0.6 diff --git a/lib/libem.bash b/lib/libem.bash index d7c72e6..ce5dcb4 100644 --- a/lib/libem.bash +++ b/lib/libem.bash @@ -425,7 +425,6 @@ function _prep() { (cd "${BUILD_TMPDIR}/src" && tar ${_UNTAR_FLAGS} "${TARBALL}") fi - install -m 0755 -d "${DOCDIR}" # create build directory mkdir -p "${MODULE_BUILDDIR}" @@ -454,7 +453,7 @@ function em.post_install() { function em.install_doc() { info "Installing documentation to ${DOCDIR}" - mkdir -p "${DOCDIR}" + install -m 0755 -d "${DOCDIR}" install -m0444 "${MODULE_DOCFILES[@]/#/${MODULE_SRCDIR}/}" "${BUILDSCRIPT}" "${DOCDIR}" } diff --git a/scripts/H5hut.build b/scripts/H5hut.build index 37870e3..9783215 100755 --- a/scripts/H5hut.build +++ b/scripts/H5hut.build @@ -34,15 +34,10 @@ function em.install() { make -C tools install } -function em.install_doc() { - install -m 0444 \ - AUTHORS \ - COPYING \ - "${DOCDIR}" -} em.add_to_family 'HDF5' em.set_runtime_dependencies "${COMPILER}" "${MPI}" 'hdf5' em.set_build_dependencies "autoconf" "automake" "libtool" "${COMPILER}" "${MPI}" "vtk" "hdf5" +em.set_docfiles 'AUTHORS' 'COPYING' em.make_all diff --git a/scripts/SuperLU_DIST.build b/scripts/SuperLU_DIST.build index 648f851..f53948e 100755 --- a/scripts/SuperLU_DIST.build +++ b/scripts/SuperLU_DIST.build @@ -39,11 +39,9 @@ function em.install() { install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include" } -function em.install_doc() { - install -m 0444 README "${DOCDIR}" -} em.add_to_family 'MPI' em.set_runtime_dependencies "${COMPILER}" "${MPI} 'OpenBLAS' 'parmetis'" em.set_build_dependencies "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis' +em.set_docfiles 'README' em.make_all diff --git a/scripts/UMFPACK.bash b/scripts/UMFPACK.bash index 7fc5232..0e2098b 100755 --- a/scripts/UMFPACK.bash +++ b/scripts/UMFPACK.bash @@ -37,10 +37,6 @@ function em.install() { make PREFIX="${PREFIX}" install } -function em.install_doc() { - : -} - em.add_to_family 'Compiler' em.set_runtime_dependencies "${COMPILER}" 'OpenBLAS' em.set_build_dependencies "${COMPILER}" 'OpenBLAS' diff --git a/scripts/bash.build b/scripts/bash.build new file mode 100755 index 0000000..2867315 --- /dev/null +++ b/scripts/bash.build @@ -0,0 +1,13 @@ +#!/bin/bash + +source "$(dirname $0)/../lib/libem.bash" + +function em.configure() { + "${MODULE_SRCDIR}"/configure \ + --prefix="${PREFIX}" \ + || exit 1 +} + +em.add_to_family 'System' +em.set_build_dependencies "${COMPILER}" +em.make_all diff --git a/scripts/mathlib.build b/scripts/mathlib.build index 16de08d..58e4052 100755 --- a/scripts/mathlib.build +++ b/scripts/mathlib.build @@ -43,10 +43,6 @@ function em.install() { : } -function em.install_doc() { - : -} - em.add_to_family 'Compiler' em.set_runtime_dependencies "${COMPILER}" em.set_build_dependencies "${COMPILER}" diff --git a/scripts/parmetis.build b/scripts/parmetis.build index 6ea62e3..1f1ec61 100755 --- a/scripts/parmetis.build +++ b/scripts/parmetis.build @@ -43,19 +43,11 @@ function em.install() { : } -function em.install_doc() { - install -m 0444 \ - CHANGES \ - INSTALL \ - LICENSE.txt \ - README \ - VERSION \ - "${DOCDIR}" -} em.add_to_family 'MPI' em.set_runtime_dependencies "${COMPILER}" "${MPI}" em.set_build_dependencies "${COMPILER}" "${MPI}" +em.set_docfiles 'CHANGES' 'INSTALL' 'LICENSE.txt' 'README' 'VERSION' em.make_all em.cleanup_src diff --git a/scripts/trilinos.build b/scripts/trilinos.build index 83b431a..2764c87 100755 --- a/scripts/trilinos.build +++ b/scripts/trilinos.build @@ -71,7 +71,7 @@ function em.configure() { } em.add_to_family 'MPI' -em.set_runtime_dependencies "${COMPILER}" "${MPI}" +em.set_runtime_dependencies "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis' em.set_build_dependencies 'cmake' "${COMPILER}" "${MPI}" 'OpenBLAS' 'parmetis' em.set_docfiles Copyright.txt LICENSE README RELEASE_NOTES em.make_all