Commit a04664c6 authored by gsell's avatar gsell

libem.bash: prefix EM_ changed to MODULE_ for all variables related to the...

libem.bash: prefix EM_ changed to MODULE_ for all variables related to the build system, the prefix EM_ is reserved for the environment modules itself
parent 91602645
This diff is collapsed.
......@@ -6,7 +6,7 @@ function em.configure() {
CC=$MPICC CXX=$MPICXX cmake \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_BUILD_TYPE=RELEASE \
"${EM_SRCDIR}"
"${MODULE_SRCDIR}"
}
em.add_to_family 'MPI'
......
......@@ -13,8 +13,8 @@ function em.configure() {
F90=$MPIF90
FC=$MPIFC
FORTRAN=$MPIFORTRAN
#( cd "${EM_SRCDIR}" && ./autogen.sh )
"${EM_SRCDIR}"/configure \
#( cd "${MODULE_SRCDIR}" && ./autogen.sh )
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--enable-parallel \
--enable-debug \
......
......@@ -3,8 +3,8 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
(cd "${EM_SRCDIR}" && ./autogen.sh)
"${EM_SRCDIR}"/configure \
(cd "${MODULE_SRCDIR}" && ./autogen.sh)
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--enable-debug \
--enable-vtkconverter \
......
......@@ -7,7 +7,7 @@ function em.pre_configure() {
}
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--enable-h5hut \
--enable-hdf5 \
......
......@@ -3,15 +3,15 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
cd "${EM_SRCDIR}"
"${EM_SRCDIR}"/configure \
cd "${MODULE_SRCDIR}"
"${MODULE_SRCDIR}"/configure \
--prefix="${EM_PREFIX}/core" \
--with-module-root-path="${MODULEPATH_ROOT}" \
|| exit 1
}
function em.build() {
cd "${EM_SRCDIR}"
cd "${MODULE_SRCDIR}"
make -j ${JOBS}
}
......
......@@ -5,8 +5,8 @@ source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
CPPFLAGS="-DUSE_INTERP_ERRORLINE" "${EM_SRCDIR}"/configure \
--prefix="${EM_BINDIR}/${EM_FAMILY}" \
CPPFLAGS="-DUSE_INTERP_ERRORLINE" "${MODULE_SRCDIR}"/configure \
--prefix="${EM_BINDIR}/${MODULE_FAMILY}" \
--with-module-path="${MODULEPATH_ROOT}" \
|| exit 1
}
......
......@@ -3,11 +3,11 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
CC=$MPICC CXX=$MPICXX cmake \
CC="$MPICC -fopenmp" CXX="$MPICXX -fopenmp" cmake \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_BUILD_TYPE=RELEASE \
-DENABLE_SAAMG_SOLVER=TRUE \
"${EM_SRCDIR}"
"${MODULE_SRCDIR}"
}
em.add_to_family 'Tools'
......
......@@ -3,14 +3,14 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
cat <<EOF > "${EM_SRCDIR}/make.inc"
cat <<EOF > "${MODULE_SRCDIR}/make.inc"
SHELL = /bin/sh
PLAT =
DRVOPTS = \$(OPTS)
LOADER = \$(FORTRAN) -pthread
ARCHFLAGS= -ru
EOF
cat <<EOF > "${EM_SRCDIR}/Makefile.rule"
cat <<EOF > "${MODULE_SRCDIR}/Makefile.rule"
VERSION = 0.2.9
TARGET = CORE2
CC = gcc
......@@ -26,7 +26,7 @@ EOF
}
function em.build() {
cd "${EM_SRCDIR}"
cd "${MODULE_SRCDIR}"
make
}
......
......@@ -3,14 +3,14 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
cat <<EOF > "${EM_SRCDIR}/make.inc"
cat <<EOF > "${MODULE_SRCDIR}/make.inc"
SHELL = /bin/sh
PLAT =
DRVOPTS = \$(OPTS)
LOADER = \$(FORTRAN) -pthread
ARCHFLAGS= -ru
EOF
cat <<EOF > "${EM_SRCDIR}/Makefile.rule"
cat <<EOF > "${MODULE_SRCDIR}/Makefile.rule"
VERSION = 0.2.9
TARGET = CORE2
CC = gcc
......@@ -26,7 +26,7 @@ EOF
}
function em.build() {
cd "${EM_SRCDIR}"
cd "${MODULE_SRCDIR}"
make
}
......
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
......
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
cat <<EOF > "${EM_SRCDIR}/make.inc"
cat <<EOF > "${MODULE_SRCDIR}/make.inc"
PLAT =
SuperLUroot = \${PREFIX}
SUPERLULIB = \$(SuperLUroot)/lib/libsuperlu.a
......@@ -29,7 +29,7 @@ EOF
}
function em.build() {
cd "${EM_SRCDIR}"
cd "${MODULE_SRCDIR}"
mkdir -p "${PREFIX}/lib"
make
}
......@@ -37,7 +37,7 @@ function em.build() {
function em.install() {
make install
mkdir -p "${PREFIX}/include"
install -m 0444 "${EM_SRCDIR}"/SRC/*.h "${PREFIX}/include"
install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include"
}
em.add_to_family 'Compiler'
......
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
cat <<EOF > "${EM_SRCDIR}/make.inc"
cat <<EOF > "${MODULE_SRCDIR}/make.inc"
PLAT =
DSuperLUroot = \${PREFIX}
DSUPERLULIB = \$(DSuperLUroot)/lib/libsuperlu_dist.a
......@@ -28,7 +28,7 @@ EOF
}
function em.build() {
cd "${EM_SRCDIR}"
cd "${MODULE_SRCDIR}"
mkdir -p "${PREFIX}/lib"
make
}
......@@ -36,7 +36,7 @@ function em.build() {
function em.install() {
make install
mkdir -p "${PREFIX}/include"
install -m 0444 "${EM_SRCDIR}"/SRC/*.h "${PREFIX}/include"
install -m 0444 "${MODULE_SRCDIR}"/SRC/*.h "${PREFIX}/include"
}
function em.install_doc() {
......
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
cat <<EOF > "${EM_SRCDIR}/SuiteSparse_config/SuiteSparse_config.mk"
cat <<EOF > "${MODULE_SRCDIR}/SuiteSparse_config/SuiteSparse_config.mk"
CF = \$(CFLAGS) \$(CPPFLAGS) \$(TARGET_ARCH) -O3 -fexceptions -fPIC -DNTIMER
RANLIB = ranlib
ARCHIVE = \$(AR) \$(ARFLAGS)
......@@ -27,7 +27,7 @@ EOF
}
function em.build() {
cd "${EM_SRCDIR}/UMFPACK"
cd "${MODULE_SRCDIR}/UMFPACK"
make TARGET=CORE2 BINARY=64 USE_THREAD=0 NO_SHARED=1
}
......
......@@ -2,7 +2,7 @@
source "$(dirname $0)/../lib/lib.bash"
[[ -z $EM_ETCDIR ]] && die 1 "Module environment not loaded"
[[ -z ${EM_ETCDIR} ]] && die 1 "Module environment not loaded"
while read family rest; do
$(dirname $0)/family.build ${family} "$@"
......
......@@ -3,27 +3,29 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
function em.install_doc() {
install -m 0444 \
AUTHORS \
COPYING \
COPYING.EXCEPTION \
COPYINGv3 \
NEWS \
README \
THANKS \
"${DOCDIR}"
}
# use system gcc to compile
declare -rx CC=gcc
em.add_to_family 'Programming'
em.set_docfiles \
AUTHORS \
COPYING \
COPYING.EXCEPTION \
COPYINGv3 \
NEWS \
README \
THANKS
em.set_build_dependencies "m4"
em.make_all
# Local Variables:
# mode: sh
# sh-basic-offset: 8
# tab-width: 8
# End:
......@@ -3,27 +3,29 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
function em.install_doc() {
install -m 0444 \
AUTHORS \
COPYING \
ChangeLog \
HACKING \
NEWS \
README \
THANKS \
"${DOCDIR}"
}
# use system gcc to compile
declare -rx CC=gcc
em.add_to_family 'Programming'
em.set_docfiles \
AUTHORS \
COPYING \
ChangeLog \
HACKING \
NEWS \
README \
THANKS
em.set_build_dependencies 'm4' 'autoconf'
em.make_all
# Local Variables:
# mode: sh
# sh-basic-offset: 8
# tab-width: 8
# End:
......@@ -6,8 +6,8 @@ source "$(dirname $0)/../lib/libem.bash"
TOOLSET=gcc
function em.configure() {
cd "${EM_SRCDIR}"
"${EM_SRCDIR}"/bootstrap.sh \
cd "${MODULE_SRCDIR}"
"${MODULE_SRCDIR}"/bootstrap.sh \
--prefix="${PREFIX}" \
--with-toolset=${TOOLSET} \
--with-libraries=all \
......@@ -16,10 +16,10 @@ function em.configure() {
}
function em.build() {
cd "${EM_SRCDIR}"
cd "${MODULE_SRCDIR}"
./b2 \
--build-type=minimal \
--build-dir="${EM_BUILDDIR}" \
--build-dir="${MODULE_BUILDDIR}" \
--layout=system \
--without-mpi \
variant=release \
......@@ -29,10 +29,10 @@ function em.build() {
}
function em.install() {
cd "${EM_SRCDIR}"
cd "${MODULE_SRCDIR}"
./b2 \
--build-type=minimal \
--build-dir="${EM_BUILDDIR}" \
--build-dir="${MODULE_BUILDDIR}" \
--layout=system \
--without-mpi \
variant=release \
......
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}/bootstrap" --prefix="${PREFIX}"
"${MODULE_SRCDIR}/bootstrap" --prefix="${PREFIX}"
}
em.add_to_family 'Programming'
......
......@@ -14,7 +14,7 @@ Darwin )
COMPILER_VERSION=''
function em.post_install() {
mkdir -p "${PREFIX}"
cp -rv "${EM_BUILDDIR}"/nextstep/Emacs.app "${PREFIX}"
cp -rv "${MODULE_BUILDDIR}"/nextstep/Emacs.app "${PREFIX}"
}
;;
*)
......@@ -22,7 +22,7 @@ Darwin )
esac
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
${configure_args} \
|| exit 1
......
......@@ -3,21 +3,11 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
#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}"
......
......@@ -7,27 +7,17 @@ function em.configure() {
}
function em.build() {
cd "${EM_SRCDIR}"
cd "${MODULE_SRCDIR}"
make -j ${JOBS}
}
function em.install() {
cd "${EM_SRCDIR}"
cd "${MODULE_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}"
......
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--enable-languages=c,c++,objc,obj-c++,lto,fortran \
--with-gmp="${GMP_PREFIX}" \
......
......@@ -3,25 +3,11 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
#function em.install_doc() {
# install -m 0444 \
# AUTHORS \
# BUGS \
# COPYING \
# ChangeLog \
# INSTALL \
# NEWS \
# README \
# THANKS \
# TODO \
# "${DOCDIR}"
#}
em.add_to_family 'Libraries'
em.set_build_dependencies "${COMPILER}"
em.make_all
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--disable-shared \
|| exit 1
......
......@@ -3,23 +3,20 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--with-gif=no \
--with-tiff=no \
|| exit 1
}
function em.install_doc() {
install -m 0444 \
Copyright \
ChangeLog \
NEWS \
README \
README.1ST \
"${DOCDIR}"
}
em.add_to_family 'Tools'
em.set_docfiles 'Copyright' 'ChangeLog' 'NEWS' 'README' 'README.1ST'
em.set_build_dependencies "${COMPILER}"
em.make_all
# Local Variables:
# mode: sh
# sh-basic-offset: 8
# tab-width: 8
# End:
......@@ -3,25 +3,27 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
function em.install_doc() {
install -m 0444 \
AUTHORS \
BUGS \
COPYING \
ChangeLog \
INSTALL \
NEWS \
README \
THANKS \
TODO \
"${DOCDIR}"
}
em.add_to_family 'Compiler'
em.set_docfiles \
'AUTHORS' \
'BUGS' \
'COPYING' \
'ChangeLog' \
'INSTALL' \
'NEWS' \
'README' \
'THANKS' \
'TODO'
em.set_build_dependencies "${COMPILER}"
em.make_all
# Local Variables:
# mode: sh
# sh-basic-offset: 8
# tab-width: 8
# End:
......@@ -10,7 +10,7 @@ function em.configure() {
FC=$MPIFC
FORTRAN=$MPIFORTRAN
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--enable-shared \
--enable-parallel \
......
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--enable-shared \
--enable-cxx \
......
......@@ -14,7 +14,7 @@ function em.configure() {
cmake \
-DCMAKE_BUILD_TYPE=RELEASE \
-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
"${EM_SRCDIR}" \
"${MODULE_SRCDIR}" \
|| exit 1
}
......
......@@ -3,25 +3,16 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
function em.install_doc() {
install -m 0444 \
AUTHORS \
COPYING \
NEWS \
README \
THANKS \
"${DOCDIR}"
}
# use system gcc to compile
declare -rx CC=gcc
em.add_to_family 'Programming'
em.set_build_dependencies "autoconf" "automake"
em.set_docfiles 'AUTHORS' 'COPYING' 'NEWS' 'README' 'THANKS'
em.set_build_dependencies 'autoconf' 'automake'
em.make_all
......@@ -3,25 +3,11 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
#function em.install_doc() {
# install -m 0444 \
# AUTHORS \
# BUGS \
# COPYING \
# ChangeLog \
# INSTALL \
# NEWS \
# README \
# THANKS \
# TODO \
# "${DOCDIR}"
#}
em.add_to_family 'Libraries'
em.set_build_dependencies "${COMPILER}"
em.make_all
......@@ -6,14 +6,14 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
cd "${EM_SRCDIR}"
"${EM_SRCDIR}"/configure \
cd "${MODULE_SRCDIR}"
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
function em.build() {
cd "${EM_SRCDIR}"
cd "${MODULE_SRCDIR}"
make -j ${JOBS}
}
......
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
......
......@@ -7,7 +7,7 @@ function em.configure() {
}
function em.build() {
cd "${EM_SRCDIR}"
cd "${MODULE_SRCDIR}"
install -m 0755 -d "${PREFIX}/include"
......
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--with-gmp=$GMP_PREFIX \
--with-mpfr=$MPFR_PREFIX \
......
......@@ -3,7 +3,7 @@
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
"${EM_SRCDIR}"/configure \
"${MODULE_SRCDIR}"/configure \