X-Git-Url: http://nitlanguage.org

diff --git a/benchmarks/bench_engines.sh b/benchmarks/bench_engines.sh
index 8e9353b..8e7f591 100755
--- a/benchmarks/bench_engines.sh
+++ b/benchmarks/bench_engines.sh
@@ -26,14 +26,6 @@ source ./bench_plot.sh
 # Can be overrided with 'the option -n'
 count=2
 
-### HELPER FUNCTIONS ##
-
-function die()
-{
-	echo >&2 "error: $*"
-	died=1
-}
-
 # HELPER FOR NIT #
 
 # Run standards benchs on a compiler command
@@ -56,6 +48,8 @@ function run_compiler()
 		run_command "$@" ../tests/bench_bintree_gen.nit -o "bintrees.$title.bin"
 		bench_command "bintrees" "bench_bintree_gen 16" "./bintrees.$title.bin" 16
 	else
+		rm -r out 2> /dev/null
+		mkdir out 2> /dev/null
 		run_command "$@" ../src/nitc.nit -o "nitc.$title.bin"
 		bench_command "nitc-g" "nitc --global --no-cc ../src/nitls.nit" "./nitc.$title.bin" -v --global --no-cc ../src/nitls.nit
 		bench_command "nitc-s" "nitc --separate ../src/nitc.nit" "./nitc.$title.bin" -v --no-cc --separate ../src/nitc.nit
@@ -64,9 +58,9 @@ function run_compiler()
 		bench_command "nit-nitcc" "nit nitcc.nit calc.sablecc" "./nit.$title.bin" ../contrib/nitcc/src/nitcc.nit ../contrib/nitcc/examples/calc.sablecc
 		rm calc* 2> /dev/null # remove generated cruft
 		run_command "$@" ../src/nitdoc.nit -o "nitdoc.$title.bin"
-		rm -r out 2> /dev/null
-		mkdir out 2> /dev/null
 		bench_command "nitdoc" "nitdoc ../src/nitls.nit" "./nitdoc.$title.bin" -v ../src/nitls.nit -d out
+		run_command "$@" ../src/nitlight.nit -o "nitlight.$title.bin"
+		bench_command "nitlight" "nitlight ../lib/[a-f]*/" "./nitlight.$title.bin" ../lib/[a-f]*/ -d out
 		run_command "$@" ../examples/shoot/src/shoot_logic.nit -o "shoot.$title.bin"
 		bench_command "shoot" "shoot_logic 15" "./shoot.$title.bin" 15
 		run_command "$@" ../tests/bench_bintree_gen.nit -o "bintrees.$title.bin"
@@ -79,6 +73,9 @@ function run_compiler()
 		bench_command "puzzle" "puzzle 15-hard" "./puzzle.$title.bin" kleg.mondcafjhbi
 		run_command "$@" "markdown/engines/nitmd/nitmd.nit" -o "nitmd.$title.bin"
 		bench_command "nitmd" "markdown" "./nitmd.$title.bin" markdown/benches/out/mixed.md 80
+		run_command "$@" ../contrib/jwrapper/src/jwrapper.nit -o "jwrapper.$title.bin"
+		bench_command "jwrapper" "jwrapper ant.jar" "./jwrapper.$title.bin" /usr/share/java/ant.jar -o out/ant_jar.nit
+		rm -r tmp 2> /dev/null # remove jwrapper output directory
 	fi
 
 	rm -r *.bin out 2> /dev/null
@@ -131,6 +128,7 @@ cp ../bin/nitc .
 if test -z "$fast"; then
 	make -C markdown/benches
 	make -C ../contrib/nitcc
+	make pre-build -C ../contrib/jwrapper
 fi
 
 ## EFFECTIVE BENCHS ##