From 074dda7b9ecdd2c8505d895211b73f62372b4d9f Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Mon, 26 Jan 2015 18:58:54 +0100 Subject: [PATCH] changes to support easy bootstraping; re-orginazation of build scripts --- scripts/Compiler/H5root.build | 2 +- scripts/Compiler/OpenBLAS.build | 2 +- scripts/Compiler/OpenBLAS_OMP.build | 2 +- scripts/Compiler/SuperLU.build | 2 +- scripts/Compiler/UMFPACK.build | 2 +- scripts/HDF5/H5hut.build | 2 +- scripts/HDF5/netcdf.build | 2 +- scripts/HDF5_serial/H5hut_serial.build | 2 +- scripts/Libraries/giflib.build | 2 +- scripts/Libraries/gmp.build | 2 +- scripts/Libraries/libungif.build | 2 +- scripts/Libraries/mpc.build | 2 +- scripts/Libraries/mpfr.build | 2 +- scripts/Libraries/tiff.build | 2 +- scripts/Programming/Python.build | 2 +- scripts/Programming/Tcl.build | 2 +- scripts/Programming/autoconf.build | 2 +- scripts/Programming/automake.build | 2 +- scripts/Programming/cmake.build | 2 +- scripts/Programming/gcc.build | 2 +- scripts/Programming/gtest.build | 2 +- scripts/Programming/libtool.build | 2 +- scripts/Programming/lua.build | 2 +- scripts/Programming/m4.build | 2 +- scripts/Programming/psi-python27.build | 2 +- scripts/System/bash.build | 2 +- scripts/Tools/Modules.build | 2 +- scripts/Tools/dialog.build | 2 +- scripts/Tools/emacs.build | 2 +- scripts/Tools/global.build | 2 +- scripts/Tools/gnuplot.build | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/scripts/Compiler/H5root.build b/scripts/Compiler/H5root.build index 8843e87..46fe671 100755 --- a/scripts/Compiler/H5root.build +++ b/scripts/Compiler/H5root.build @@ -1,6 +1,6 @@ #!/bin/bash -source $(dirname $0)/../lib/libem.bash +source $(dirname $0)/../../lib/libem.bash function em.pre_configure() { ./autogen.sh diff --git a/scripts/Compiler/OpenBLAS.build b/scripts/Compiler/OpenBLAS.build index dadd1f4..2c980fb 100755 --- a/scripts/Compiler/OpenBLAS.build +++ b/scripts/Compiler/OpenBLAS.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { cat < "${MODULE_SRCDIR}/make.inc" diff --git a/scripts/Compiler/OpenBLAS_OMP.build b/scripts/Compiler/OpenBLAS_OMP.build index 0355b30..ee48ee0 100755 --- a/scripts/Compiler/OpenBLAS_OMP.build +++ b/scripts/Compiler/OpenBLAS_OMP.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { cat < "${MODULE_SRCDIR}/make.inc" diff --git a/scripts/Compiler/SuperLU.build b/scripts/Compiler/SuperLU.build index a4c416a..ea85951 100755 --- a/scripts/Compiler/SuperLU.build +++ b/scripts/Compiler/SuperLU.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { cat < "${MODULE_SRCDIR}/make.inc" diff --git a/scripts/Compiler/UMFPACK.build b/scripts/Compiler/UMFPACK.build index 0e2098b..7ee5afc 100755 --- a/scripts/Compiler/UMFPACK.build +++ b/scripts/Compiler/UMFPACK.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { cat < "${MODULE_SRCDIR}/SuiteSparse_config/SuiteSparse_config.mk" diff --git a/scripts/HDF5/H5hut.build b/scripts/HDF5/H5hut.build index 9783215..20c78d3 100755 --- a/scripts/HDF5/H5hut.build +++ b/scripts/HDF5/H5hut.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.pre_configure() { ./autogen.sh diff --git a/scripts/HDF5/netcdf.build b/scripts/HDF5/netcdf.build index e4d2fce..62485ba 100755 --- a/scripts/HDF5/netcdf.build +++ b/scripts/HDF5/netcdf.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.pre_configure() { : diff --git a/scripts/HDF5_serial/H5hut_serial.build b/scripts/HDF5_serial/H5hut_serial.build index 72cb8d7..9a4370b 100755 --- a/scripts/HDF5_serial/H5hut_serial.build +++ b/scripts/HDF5_serial/H5hut_serial.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { (cd "${MODULE_SRCDIR}" && ./autogen.sh) diff --git a/scripts/Libraries/giflib.build b/scripts/Libraries/giflib.build index 8060ae0..6f800ef 100755 --- a/scripts/Libraries/giflib.build +++ b/scripts/Libraries/giflib.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Libraries/gmp.build b/scripts/Libraries/gmp.build index 53830dc..4f9bf17 100755 --- a/scripts/Libraries/gmp.build +++ b/scripts/Libraries/gmp.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Libraries/libungif.build b/scripts/Libraries/libungif.build index 8060ae0..6f800ef 100755 --- a/scripts/Libraries/libungif.build +++ b/scripts/Libraries/libungif.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Libraries/mpc.build b/scripts/Libraries/mpc.build index 6b5479a..7db4393 100755 --- a/scripts/Libraries/mpc.build +++ b/scripts/Libraries/mpc.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Libraries/mpfr.build b/scripts/Libraries/mpfr.build index f087dce..d4c1ab0 100755 --- a/scripts/Libraries/mpfr.build +++ b/scripts/Libraries/mpfr.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Libraries/tiff.build b/scripts/Libraries/tiff.build index 8060ae0..6f800ef 100755 --- a/scripts/Libraries/tiff.build +++ b/scripts/Libraries/tiff.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Programming/Python.build b/scripts/Programming/Python.build index 6269f12..fed0766 100755 --- a/scripts/Programming/Python.build +++ b/scripts/Programming/Python.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Programming/Tcl.build b/scripts/Programming/Tcl.build index ef59b83..0adbeab 100755 --- a/scripts/Programming/Tcl.build +++ b/scripts/Programming/Tcl.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { case ${OS} in diff --git a/scripts/Programming/autoconf.build b/scripts/Programming/autoconf.build index 1e787fb..431b95a 100755 --- a/scripts/Programming/autoconf.build +++ b/scripts/Programming/autoconf.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Programming/automake.build b/scripts/Programming/automake.build index 1dfa5a4..7c6bebc 100755 --- a/scripts/Programming/automake.build +++ b/scripts/Programming/automake.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Programming/cmake.build b/scripts/Programming/cmake.build index 5dc8f67..137f989 100755 --- a/scripts/Programming/cmake.build +++ b/scripts/Programming/cmake.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}/bootstrap" --prefix="${PREFIX}" diff --git a/scripts/Programming/gcc.build b/scripts/Programming/gcc.build index 0496100..7ae5406 100755 --- a/scripts/Programming/gcc.build +++ b/scripts/Programming/gcc.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Programming/gtest.build b/scripts/Programming/gtest.build index cfabab8..65d3110 100755 --- a/scripts/Programming/gtest.build +++ b/scripts/Programming/gtest.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" em.add_to_family 'Programming' em.set_runtime_dependencies "" diff --git a/scripts/Programming/libtool.build b/scripts/Programming/libtool.build index dd388f9..8df068a 100755 --- a/scripts/Programming/libtool.build +++ b/scripts/Programming/libtool.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Programming/lua.build b/scripts/Programming/lua.build index d282527..f02bdfc 100755 --- a/scripts/Programming/lua.build +++ b/scripts/Programming/lua.build @@ -3,7 +3,7 @@ # Lua cannot be build in a seperate directory! # -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { cd "${MODULE_SRCDIR}" diff --git a/scripts/Programming/m4.build b/scripts/Programming/m4.build index 178b82e..cfc5cc0 100755 --- a/scripts/Programming/m4.build +++ b/scripts/Programming/m4.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Programming/psi-python27.build b/scripts/Programming/psi-python27.build index 54350f9..08f970e 100755 --- a/scripts/Programming/psi-python27.build +++ b/scripts/Programming/psi-python27.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { : diff --git a/scripts/System/bash.build b/scripts/System/bash.build index 2867315..122c5f9 100755 --- a/scripts/System/bash.build +++ b/scripts/System/bash.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Tools/Modules.build b/scripts/Tools/Modules.build index c20212a..171be58 100755 --- a/scripts/Tools/Modules.build +++ b/scripts/Tools/Modules.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" TCL_VERSION='8.6.3' TCL_DIR="${PSI_PREFIX}/Programming/Tcl/${TCL_VERSION}" diff --git a/scripts/Tools/dialog.build b/scripts/Tools/dialog.build index c614f09..b5d7a1d 100755 --- a/scripts/Tools/dialog.build +++ b/scripts/Tools/dialog.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Tools/emacs.build b/scripts/Tools/emacs.build index 087edd5..c436bd2 100755 --- a/scripts/Tools/emacs.build +++ b/scripts/Tools/emacs.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" module use 'Libraries' diff --git a/scripts/Tools/global.build b/scripts/Tools/global.build index fffff75..6a0b3a1 100755 --- a/scripts/Tools/global.build +++ b/scripts/Tools/global.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \ diff --git a/scripts/Tools/gnuplot.build b/scripts/Tools/gnuplot.build index e263f3d..034a143 100755 --- a/scripts/Tools/gnuplot.build +++ b/scripts/Tools/gnuplot.build @@ -1,6 +1,6 @@ #!/bin/bash -source "$(dirname $0)/../lib/libem.bash" +source "$(dirname $0)/../../lib/libem.bash" function em.configure() { "${MODULE_SRCDIR}"/configure \