PROGS=*.nit ../examples/*.nit ../examples/leapfrog/leapfrog.nit ../examples/shoot/shoot_logic.nit ../lib/*.nit ../src/nitdoc.nit ../src/nits.nit ../src/nitc.nit ../src/test_parser.nit ../src/nit.nit ../src/nitmetrics.nit ../src/nitg.nit
-all: separate niti nitg nitg-s
+all: separate niti nitg-g nitg-s
-alot: separate global niti nitg nitg-s nitg-s-bm nitg-s-phmod nitg-s-phand nitg-e nitg-e-bm nitg-e-phmod nitg-e-phand icode
+alot: separate global niti nitg-g nitg-s nitg-s-bm nitg-s-phmod nitg-s-phand nitg-e nitg-e-bm nitg-e-phmod nitg-e-phand icode
separate:
./testfull.sh
niti:
./testfull.sh --engine niti
-nitg:
- ./testfull.sh --engine nitg
+nitg-g:
+ ./testfull.sh --engine nitg-g
nitg-s:
./testfull.sh --engine nitg-s
recent=`ls -t ../src/$name ../src/$name_[0-9] ../bin/$name ../c_src/$name 2>/dev/null | head -1`
if [[ "x$recent" == "x" ]]; then
if [ -n "$tap" ]; then
- echo "not ok - find engine $name"
- echo "Bail out! Could not find engine $name, aborting"
+ echo "not ok - find binary for $engine"
+ echo "Bail out! Could not find binary for engine $engine, aborting"
else
- echo "Could not find engine $name, aborting"
+ echo "Could not find binary for engine $engine, aborting"
fi
exit 1
fi
if [ -n "$tap" ]; then
- echo "ok - find engine $name: $recent"
+ echo "ok - find binary for $engine: $recent $OPT"
else
- echo "Using engine $name from: $recent"
+ echo "Find binary for engine $engine: $recent $OPT"
fi
NITC=$recent
}
enginebinname=$engine
case $engine in
nitc) ;;
- nitg) OPT="--global $OPT";;
+ nitg) engine=nitg-s; enginebinname=nitg; OPT="--separate $OPT";;
nitg-s) enginebinname=nitg; OPT="--separate $OPT";;
nitg-e) enginebinname=nitg; OPT="--erasure $OPT";;
+ nitg-g) enginebinname=nitg; OPT="--global $OPT";;
nit) engine=niti ;;
niti) enginebinname=nit ;;
esac
exit
fi
-echo "engine: $engine"
+echo "engine: $engine ($enginebinname $OPT)"
echo "ok: " `echo $ok | wc -w` "/" `echo $ok $nok $nos $todos | wc -w`
if [ -n "$nok" ]; then