From c2f6dcf420f320924bdf575d0b68c39c5aaeb270 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 4 Sep 2014 19:31:22 +0200 Subject: [PATCH 1/5] trilinos: OpenBLAS and parmetis added to run-time dependencies --- scripts/trilinos.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 89ad59a8f4b9d5b85ad61600abe2dc49978acff1 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 4 Sep 2014 19:32:26 +0200 Subject: [PATCH 2/5] deprecated function em.install_doc() replaced --- scripts/H5hut.build | 7 +------ scripts/SuperLU_DIST.build | 4 +--- scripts/UMFPACK.bash | 4 ---- scripts/mathlib.build | 4 ---- scripts/parmetis.build | 10 +--------- 5 files changed, 3 insertions(+), 26 deletions(-) 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 958f55b..2f3c510 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}" em.set_build_dependencies "${COMPILER}" "${MPI}" "OpenBLAS" +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/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 From 64d780db0eb702fc07561e866c9fc9c67eaafd87 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 4 Sep 2014 19:32:54 +0200 Subject: [PATCH 3/5] bash: module added --- scripts/bash.build | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 scripts/bash.build 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 From 3694758f79acdffa375952c39bd41ff0641ae540 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 4 Sep 2014 19:33:34 +0200 Subject: [PATCH 4/5] versions.conf: dialog version added --- config/versions.conf | 1 + 1 file changed, 1 insertion(+) 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 From 2dd22a771026d070ea8ecee58d3126332ed3e344 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 4 Sep 2014 19:34:34 +0200 Subject: [PATCH 5/5] libem.bash: create DOCDIR in em.install_doc() --- lib/libem.bash | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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}" }