Skip to content

Commit 3b686de

Browse files
committed
melting-pot: handle optional deps + empty dep sets
Optional dependencies now have their scope transformed from "runtime (optional)" to "runtime-optional", to eschew spaces. Empty dep sets no longer emit an "Unmanaged dependency: none" warning.
1 parent 2f1c2e3 commit 3b686de

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

melting-pot.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,7 @@ do
642642
s=${dep##*:}
643643
case "$s" in
644644
test) continue ;; # skip test dependencies
645+
none) continue ;; # empty dependency config
645646
esac
646647
gapv=${dep%:*}
647648
g=${gapv%%:*}
@@ -701,8 +702,8 @@ successLog="$HOME/.cache/scijava/melting-pot/$1.success.log"
701702
mkdir -p "$(dirname "$successLog")"
702703
703704
# Record dependency configuration of successful build.
704-
deps=$(grep "^\[INFO\] " "$buildLog" |
705-
sed -e "s/^.\{10\}//" -e "s/ -- .*//" |
705+
deps=$(grep '^\[INFO\] ' "$buildLog" |
706+
sed -e 's/^.\{10\}//' -e 's/ -- .*//' -e 's/ (\([^)]*\))/-\1/' |
706707
sort | tr '\n' ',')
707708
if [ -z "$(containsLine "$deps" "$successLog")" ]
708709
then

0 commit comments

Comments
 (0)