major reorganization; updates to versions; fixes

This commit is contained in:
2015-02-27 16:40:22 +01:00
parent 67e3d5c7c1
commit 51792a80f2
61 changed files with 172 additions and 352 deletions

View File

@@ -1 +0,0 @@
../System/bash.build

13
scripts/Bootstrap/bash.build Executable file
View File

@@ -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

View File

@@ -1 +0,0 @@
../Tools/dialog.build

13
scripts/Bootstrap/dialog.build Executable file
View File

@@ -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 'Tools'
em.set_build_dependencies "${COMPILER}"
em.make_all

View File

@@ -1 +0,0 @@
../System/getopt.build

42
scripts/Bootstrap/getopt.build Executable file
View File

@@ -0,0 +1,42 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
function em.configure() {
:
}
function em.build() {
case ${OS} in
Linux )
declare -x LDFLAGS="-lintl -liconv"
;;
Darwin )
declare -x LDFLAGS="-lintl -liconv -framework CoreFoundation"
;;
esac
cd "${MODULE_SRCDIR}"
make -e
}
function em.install() {
cd "${MODULE_SRCDIR}"
declare -x DESTDIR="${PREFIX}"
declare -x prefix=''
make -e install
}
function em.cleanup_build() {
cd "${MODULE_SRCDIR}"
make -e realclean
}
em.add_to_family 'Tools'
em.make_all
# Local Variables:
# mode: sh
# sh-basic-offset: 8
# tab-width: 8
# End:

View File

@@ -1 +0,0 @@
../Tools/gettext.build

24
scripts/Bootstrap/gettext.build Executable file
View File

@@ -0,0 +1,24 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--disable-java \
--disable-threads \
--disable-shared \
--enable-relocatable \
--disable-openmp \
--disable-acl \
--disable-curses \
--with-included-gettext \
--without-libiconv-prefix \
--without-libintl-prefix \
--with-included-libxml \
|| exit 1
}
em.add_to_family 'Tools'
em.set_build_dependencies "${COMPILER}"
em.make_all

View File

@@ -667,6 +667,13 @@ subcommand_avail() {
done
}
get_families () {
{
cd "${modulepath_root}"
echo *
}
}
#
# $1: family name (not path!)
compute_family_depth () {
@@ -690,18 +697,12 @@ subcommand_use() {
echo -e "\t${f}" 1>&2
done
echo -e "\nFamilies you may use in addition:" 1>&2
local available_families=':'
{
cd "${PSI_PREFIX}/${PSI_MODULES_ROOT}"
for f in *; do
local tmp=$(find $f -d -type f -o -type l | head -1)
local -a tmp2=( ${tmp//\// } )
local -i depth=${#tmp2[@]}-3
if ! is_used_family $f && (( depth == 0 )); then
echo -e "\t${f}" 1>&2
fi
done
}
for family in $(get_families); do
local -i depth=$( compute_family_depth "${family}")
if ! is_used_family $f && (( depth == 0 )); then
echo -e "\t${f}" 1>&2
fi
done
echo -e "\nUsed releases:" 1>&2
for r in ${used_releases//:/ }; do
@@ -831,14 +832,8 @@ subcommand_search() {
local -r tmpfile=$( mktemp /tmp/$(basename $0).XXXXXX ) || exit 1
local family
# loop over all families
push -n .
cd "${PSI_PREFIX}/${PSI_MODULES_ROOT}"
for family in *; do
local tmp=$( find "${family}" -d -type f -o -type l 2>&1 | head -1 )
local -a tmp2=( ${tmp//\// } )
echo ${tmp2[0]}
local -i depth=${tmp2[@]}
let depth-=3
for family in $(get_families); do
local -i depth=$( compute_family_depth ${family} )
# get all potential directories of family $f with module-files
local mpaths=( $(find \
"${modulepath_root}/${family}" \
@@ -870,7 +865,6 @@ subcommand_search() {
done
done
done
popd
sort -k 1,1 -k 4,4 -k 5,5 "${tmpfile}" | awk "${with_modules}" 1>&2
rm -f "${tmpfile}"

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source $(dirname $0)/../../lib/libem.bash
source $(dirname $0)/../../../lib/libem.bash
function em.pre_configure() {
./autogen.sh

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
cat <<EOF > "${MODULE_SRCDIR}/make.inc"

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
cat <<EOF > "${MODULE_SRCDIR}/make.inc"

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
cat <<EOF > "${MODULE_SRCDIR}/make.inc"

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
cat <<EOF > "${MODULE_SRCDIR}/SuiteSparse_config/SuiteSparse_config.mk"

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
# :TODO: detect compiler
TOOLSET=gcc

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
case ${OS} in
Darwin )

View File

@@ -6,7 +6,7 @@
# and remove these strings.
#
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
case ${OS} in
Darwin )

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.pre_configure() {
./autogen.sh

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.pre_configure() {
:

View File

@@ -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)

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
CC=$MPICC CXX=$MPICXX cmake \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
module use unstable

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
cat <<EOF > "${MODULE_SRCDIR}/make.inc"

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
CC=$MPICC

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
CC=$MPICC

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
module use unstable

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
CC=$MPICC

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
declare -rx AR=ar

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
case ${OS} in

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -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}"

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -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 ""

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,25 +0,0 @@
#!/bin/bash
#
# Lua cannot be build in a seperate directory!
#
source "$(dirname $0)/../../lib/libem.bash"
function em.configure() {
cd "${MODULE_SRCDIR}"
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
function em.build() {
cd "${MODULE_SRCDIR}"
make -j ${JOBS}
}
em.supported_os ''
em.add_to_family 'Programming'
em.set_build_dependencies "${COMPILER}"
em.make_all
em.cleanup_src

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
:

View File

@@ -1,13 +0,0 @@
#!/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

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
:

View File

@@ -1,42 +0,0 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
function em.configure() {
:
}
function em.build() {
case ${OS} in
Linux )
declare -x LDFLAGS="-lintl -liconv"
;;
Darwin )
declare -x LDFLAGS="-lintl -liconv -framework CoreFoundation"
;;
esac
cd "${MODULE_SRCDIR}"
make -e
}
function em.install() {
cd "${MODULE_SRCDIR}"
declare -x DESTDIR="${PREFIX}"
declare -x prefix=''
make -e install
}
function em.cleanup_build() {
cd "${MODULE_SRCDIR}"
make -e realclean
}
em.add_to_family 'Tools'
em.make_all
# Local Variables:
# mode: sh
# sh-basic-offset: 8
# tab-width: 8
# End:

View File

@@ -1,50 +0,0 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
function em.configure() {
:
}
function em.build() {
cd "${MODULE_SRCDIR}"
install -m 0755 -d "${PREFIX}/include"
install -m 0755 -d "${PREFIX}/lib"
install -m 0755 -d "${DOCDIR}/lapack"
(
cp make.inc.blas BLAS/make.inc
cd BLAS
make -e -j3 || exit 1
install -m 0644 libblas.a "${PREFIX}/lib" || exit 1
) || exit 1
(
cp make.inc.cblas CBLAS/Makefile.in
cd CBLAS
make -e || exit 1
install -m 0644 include/* "${PREFIX}/include" || exit 1
install -m 0644 lib/* "${PREFIX}/lib" || exit 1
) || exit 1
(
cp make.inc.lapack lapack/make.inc
cd lapack
make -e -j3 || exit 1
make -e -j3 lapackelib || exit 1
install -m 0644 lapacke/include/* "${PREFIX}/include" || exit 1
install -m 0644 lib*.a "${PREFIX}/lib" || exit 1
install -m 0444 README LICENSE "${DOCDIR}/lapack"
) || exit 1
}
function em.install() {
:
}
em.add_to_family 'Compiler'
em.set_runtime_dependencies "${COMPILER}"
em.set_build_dependencies "${COMPILER}"
em.make_all
em.cleanup_src

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
cd "${MODULE_SRCDIR}"

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,37 +0,0 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
TCL_VERSION='8.6.3'
TCL_DIR="${PSI_PREFIX}/Programming/Tcl/${TCL_VERSION}"
PATH="${TCL_DIR}/bin:${PATH}"
case ${OS} in
Linux )
declare -x LIBS="-lz -lpthread"
;;
Darwin )
declare -x LIBS="-lz -framework CoreFoundation"
;;
esac
function em.configure() {
CPPFLAGS="-DUSE_INTERP_ERRORLINE" "${MODULE_SRCDIR}"/configure \
--prefix="${PSI_PREFIX}/${MODULE_FAMILY}" \
--with-module-path="${PSI_PREFIX}/${PSI_MODULES_ROOT}" \
--with-tcl="${TCL_DIR}/lib" \
--without-x \
|| exit 1
}
# fake module command
module() {
:
}
# use system gcc to compile
declare -rx CC=gcc
em.add_to_family 'Tools'
em.set_build_dependencies "Tcl/${TCL_VERSION}"
em.make_all

View File

@@ -1,13 +0,0 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
|| exit 1
}
em.add_to_family 'Tools'
em.set_build_dependencies "${COMPILER}"
em.make_all

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
module use 'Libraries'

View File

@@ -1,24 +0,0 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \
--prefix="${PREFIX}" \
--disable-java \
--disable-threads \
--disable-shared \
--enable-relocatable \
--disable-openmp \
--disable-acl \
--disable-curses \
--with-included-gettext \
--without-libiconv-prefix \
--without-libintl-prefix \
--with-included-libxml \
|| exit 1
}
em.add_to_family 'Tools'
em.set_build_dependencies "${COMPILER}"
em.make_all

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,6 +1,6 @@
#!/bin/bash
source "$(dirname $0)/../../lib/libem.bash"
source "$(dirname $0)/../../../lib/libem.bash"
function em.configure() {
"${MODULE_SRCDIR}"/configure \

View File

@@ -1,54 +0,0 @@
#!/bin/bash
source "$(dirname $0)/../lib/lib.bash"
change_release() {
local m=$1
local with_modules=()
shift
shift
shift
while (( $# > 0 )); do
with_modules+=( "--with=$1" )
shift
done
"$(dirname $0)/${m%/*}.build" "${m#*/}" "${with_modules[@]}" "--release=${release}"
}
declare usecmd="${PSI_PREFIX}/${PSI_CONFIG_DIR}/init/extensions/use.bash"
declare searchcmd="${PSI_PREFIX}/${PSI_CONFIG_DIR}/init/extensions/search.bash"
# :FIXME: this does not work ...
#eval "${usecmd} deprecated"
#eval "${usecmd} unstable"
release=''
with_modules=()
modules=()
while (( $# > 0 )); do
case $1 in
--release=* )
release=${1/--release=}
;;
--with=*/* )
with_modules+=( ${1} )
;;
-* )
die 1 "$1: illegal argument"
;;
*/* )
modules+=( $1 )
;;
* )
die 1 "$1: illegal argument"
;;
esac
shift
done
#[[ -z ${from_release} ]] && die 1 "--from-release missing"
[[ -z ${release} ]] && die 1 "--release missing"
while read -a tokens ; do
echo "${tokens[@]}"
change_release "${tokens[@]}"
done < <("${searchcmd}" "${modules[@]}" --no-header -a "${with_modules[@]}" 2>&1)

View File

@@ -1,12 +0,0 @@
#!/bin/bash
source "$(dirname $0)/../lib/lib.bash"
family=$1
shift
modules=$(egrep -l "[:space:]*[\"\']$family[\"\']" "$(dirname $0)"/*.build || :)
for m in ${modules}; do
"$m" "$@"
done