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