Skip to content
Snippets Groups Projects
Commit e6cec83f authored by Christoph Grüninger's avatar Christoph Grüninger
Browse files

[dunecontrol][cleanup] Replace tabs by spaces.

parent fd07a5a1
No related branches found
No related tags found
No related merge requests found
......@@ -143,15 +143,15 @@ build_module() {
# build the modules
local path="$(eval "echo \$PATH_${module}")"
eval echo "--- calling $command for \$NAME_${module} ---"
trap onbuildfailure EXIT
trap onbuildfailure EXIT
if ! (
set -e
cd "$path"
export module
export ABS_BUILDDIR=$(abs_builddir $module $BUILDDIR)
export ABS_BUILDDIR=$(abs_builddir $module $BUILDDIR)
eval_control $runcommand "$path/$CONTROL"
); then eval echo "--- Failed to build \$NAME_${module} ---"; exit 1; fi
trap onfailure EXIT
trap onfailure EXIT
eval echo "--- \$NAME_${module} done ---"
done
......@@ -237,12 +237,12 @@ abs_builddir()
local name="$(eval echo \$NAME_$m)"
local path="$(eval echo \$PATH_$m)"
case $BUILDDIR in
/*)
echo $builddir/$name
;;
*)
echo $path/$builddir
;;
/*)
echo $builddir/$name
;;
*)
echo $path/$builddir
;;
esac
}
......@@ -662,7 +662,7 @@ run_default_configure () {
ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $dir"
fi
done
local m_ABS_BUILDDIR=$(abs_builddir $m $BUILDDIR)
local m_ABS_BUILDDIR=$(abs_builddir $m $BUILDDIR)
if test -d "$m_ABS_BUILDDIR"; then
PARAMS="$PARAMS \"--with-$name=$m_ABS_BUILDDIR\""
else
......@@ -672,16 +672,16 @@ run_default_configure () {
fi
if test "x$LOCAL_USE_CMAKE" = "xyes"; then
if test -d "$m_ABS_BUILDDIR"; then
CMAKE_PARAMS="$CMAKE_PARAMS \"-D""$name""_DIR=$m_ABS_BUILDDIR\""
CMAKE_PARAMS="$CMAKE_PARAMS \"-D""$name""_DIR=$m_ABS_BUILDDIR\""
else
TMP_PARAMS="\"-D""$name""_DIR=$path\""
for i in $MULTIARCH_LIBDIR lib lib64 lib32; do
if test -d "$path/$i/cmake/$name"; then
TMP_PARAMS="\"-D""$name""_DIR=$path/$i/cmake/$name\""
break;
fi
done
CMAKE_PARAMS="$CMAKE_PARAMS $TMP_PARAMS"
TMP_PARAMS="\"-D""$name""_DIR=$path\""
for i in $MULTIARCH_LIBDIR lib lib64 lib32; do
if test -d "$path/$i/cmake/$name"; then
TMP_PARAMS="\"-D""$name""_DIR=$path/$i/cmake/$name\""
break;
fi
done
CMAKE_PARAMS="$CMAKE_PARAMS $TMP_PARAMS"
fi
fi
done
......@@ -768,9 +768,9 @@ run_default_make () {
echo make "$PARAMS"
eval $MAKE "$PARAMS"
else
# prepend '--' to separate cmake and make parameters
if ! $(echo "$PARAMS" | grep -q -- '--'); then
PARAMS="-- $PARAMS"
# prepend '--' to separate cmake and make parameters
if ! $(echo "$PARAMS" | grep -q -- '--'); then
PARAMS="-- $PARAMS"
fi
echo $CMAKE --build . "$PARAMS"
eval $CMAKE --build . "$PARAMS"
......@@ -1235,7 +1235,7 @@ EOF
EOF
fi
done
### ANALYSE MODULE
### ANALYSE MODULE
sort_modules $mainmod
### DEPENDENCIES
for mod in $SORTEDMODULES_DEPS; do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment