Skip to content
Snippets Groups Projects
Commit 4944c4c7 authored by Christian Engwer's avatar Christian Engwer
Browse files

[dunecontrol]

sorting modules:
distinguish between the MAIN pass and DEPS/SUGS

[[Imported from SVN: r6847]]
parent de37e3d5
No related branches found
No related tags found
No related merge requests found
...@@ -239,7 +239,7 @@ sort_modules() { ...@@ -239,7 +239,7 @@ sort_modules() {
for m in "$@"; do for m in "$@"; do
# did we find a module file for this module? # did we find a module file for this module?
if test "x$(eval echo \$HAVE_$m)" != "x"; then if test "x$(eval echo \$HAVE_$m)" != "x"; then
_sort_module $m DEPS _sort_module $m MAIN
else else
echo "ERROR: could not find module $(eval echo \$NAME_$m)" >&2 echo "ERROR: could not find module $(eval echo \$NAME_$m)" >&2
exit 1 exit 1
...@@ -251,6 +251,7 @@ sort_modules() { ...@@ -251,6 +251,7 @@ sort_modules() {
for m in $MODULES; do for m in $MODULES; do
export SORT_DEPS_DONE_$m="" export SORT_DEPS_DONE_$m=""
export SORT_SUGS_DONE_$m="" export SORT_SUGS_DONE_$m=""
export SORT_MAIN_DONE_$m=""
done done
} }
...@@ -350,7 +351,7 @@ _sort_module() { ...@@ -350,7 +351,7 @@ _sort_module() {
# insert this module into the list # insert this module into the list
export SORTEDMODULES_$mode="$(eval echo \$SORTEDMODULES_$mode) $module" export SORTEDMODULES_$mode="$(eval echo \$SORTEDMODULES_$mode) $module"
export SORT_${mode}_DONE_$module=yes export SORT_${mode}_DONE_$module=yes
if test $mode = DEPS; then if test $mode = DEPS -o $mode = MAIN; then
# it is sufficient to check that the module hasn't been handled yet, # it is sufficient to check that the module hasn't been handled yet,
# as dependencies are handled before suggestions # as dependencies are handled before suggestions
export SORTEDMODULES="$SORTEDMODULES $module" export SORTEDMODULES="$SORTEDMODULES $module"
......
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