From f870d4ad67a356824e9939448a43eeeafa4479c0 Mon Sep 17 00:00:00 2001 From: malc Date: Sun, 8 Apr 2018 14:37:26 +0300 Subject: [PATCH] Saner --- build.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 7fcc642..aa90b6f 100755 --- a/build.sh +++ b/build.sh @@ -31,7 +31,7 @@ srcd=$PWD isfresh() { test -e "$1" && test -r "$1.past" && { . "$1.past" - eval "test K=$2" + eval 'test $k=$2' } } @@ -48,7 +48,7 @@ bocaml1() { cmd="ocamlc $incs -c -o $o $s" keycmd="stat -c %Y $o $s" grep -q "$o" $outd/ordered || echo "$o" >>$outd/ordered - isfresh "$o" "'$cmd$(eval $keymd)'" || { + isfresh "$o" '$cmd$keymd' || { printf "%*.s%s -> %s\n" $n '' "${s#$srcd/}" "$o" eval "$cmd" echo "k='$cmd$(eval $keycmd)'" >$o.past @@ -78,7 +78,7 @@ bocamlc() { muinc="-I $mudir/include -I $mudir/thirdparty/freetype/include" cmd="ocamlc -ccopt \"-O2 $muinc -o $o\" $s" keycmd="stat -c %Y $o $s 2>/dev/null" - isfresh "$o" "'$cmd$(eval $keycmd)'" || { + isfresh "$o" '$cmd$keycmd' || { printf "%s -> %s\n" "${s#$srcd/}" "$o" eval "$cmd" echo "k='$cmd$(eval $keycmd)'" >$o.past @@ -108,7 +108,7 @@ EOF ver=$(cd $srcd && git describe --tags || echo unknown) cmd="mkhelp >$outd/help.ml" keycmd="stat -c %Y $srcd/KEYS" -isfresh "$outd/help.ml" "'$cmd$(eval $keycmd)$ver'" || { +isfresh "$outd/help.ml" '$cmd$keycmd$ver' || { eval $cmd echo "k='$cmd$(eval $keycmd)$ver'" >$outd/help.ml.past } @@ -129,7 +129,8 @@ done ord=$(echo $(eval grep -v \.cmi $outd/ordered)) cmd="ocamlc -custom $libs -o $outd/llpp $ord" cmd="$cmd $globjs $outd/link.o -cclib \"$clibs\"" -isfresh "$outd/llpp" "'$cmd$(eval $keycmd)'" && echo fresh || { +isfresh "$outd/llpp" '$cmd$keycmd' && echo fresh || { + echo linking $outd/llpp eval $cmd echo "k='$cmd$(eval $keycmd)'" >$outd/llpp.past } -- 2.11.4.GIT