X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile;h=41d3ee547766e9857e2ab4b01edd63a120bdbb9d;hb=d3f63d65d80aaab4ad8eac43ee1caea7dea09fbd;hp=74652f5cac55276a79e7beb7db0c38dedd20af14;hpb=e7e935029c53fe5a46b6153e4fca74d4994459ff;p=mate.git

diff --git a/Makefile b/Makefile
index 74652f5..41d3ee5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,58 +1,66 @@
 SHELL := bash
 
 JAVAC := javac
-JAVA_FILES := $(wildcard tests/*.java)
+JAVA_FILES := $(wildcard java/lang/*.java java/io/*.java)
 CLASS_FILES := $(JAVA_FILES:.java=.class)
+TEST_JAVA_FILES := $(wildcard tests/*.java)
+TEST_CLASS_FILES := $(TEST_JAVA_FILES:.java=.test)
 HS_FILES := $(wildcard Mate/*.hs)
+HS_BOOT := $(wildcard Mate/*.hs-boot)
 O_FILES = $(shell ls Mate/*.o) $(wildcard ffi/*.o)
 PACKAGES_ := bytestring harpy hs-java
 PACKAGES := $(addprefix -package ,$(PACKAGES_))
 
-GHC_OPT := -dynamic -Wall -O0 -fno-warn-unused-do-bind
+GHC_OPT := -I. -dynamic -Wall -O0 -fno-warn-unused-do-bind
 GHC_LD := -optl-Xlinker -optl-x
 
 
 .PHONY: all test clean ghci
 
-all: mate $(CLASS_FILES)
-
-test: mate $(CLASS_FILES)
-	./$< tests/Fib | grep mainresult
-	@printf "should be:  0x%08x\n" 0x2ac2
-	./$< tests/Fac | grep mainresult
-	@printf "should be:  0x%08x\n" 0x63e1a
-	./$< tests/ArgumentPassing1 | grep mainresult
-	@printf "should be:  0x%08x 0x%08x\n" 0x92 $$(((0 - 0x1337) & 0xffffffff))
-	./$< tests/DifferentClass1 | grep mainresult
-	@printf "should be:  0x%08x 0x%08x\n" 8 13
-	./$< tests/Native1 | egrep -i -e '^printsomething: '
-	@printf "should be:  woot 0x%08x 0x%08x woot 0x%08x\n" 0x1337 0x1338 0x15a5
-	./$< tests/Static1 | grep mainresult
-	@printf "should be:  0x%08x\n" 0x33
-	./$< tests/Static2 | grep mainresult
-	@printf "should be:  0x%08x\n" 0x55
-	./$< tests/Static3 | grep mainresult
-	@printf "should be:  0x%08x\n" 0x6dd
-	./$< tests/Static4 | grep mainresult
-	@printf "should be:  0x%08x 0x%08x\n" 0x33 0x77
-	./$< tests/Static5 | grep mainresult
-	@printf "should be:  0x%08x 0x%08x\n" 0x33 0x33
-	./$< tests/CallConv1 | grep mainresult
-	@printf "should be:  0x%08x\n" 0x1337
-	./$< tests/CallConv2 | grep mainresult
-	@printf "should be:  0x%08x\n" 0x1337
+all: mate
 
+%: %.class mate
+	./mate $(basename $<)
+
+
+tests: mate $(TEST_JAVA_FILES:.java=.class) $(TEST_CLASS_FILES)
+
+CALLF = $(basename $@).call
+testcase = ./tools/openjdktest.sh "$(1) $(basename $@)"
+%.test: %.class mate
+	@if [ -f $(CALLF) ]; \
+		then $(call testcase,`cat $(CALLF)`); \
+		else $(call testcase, ); fi
+
+COMPILEF = $(basename $@).compile
 %.class: %.java
-	$(JAVAC) $<
+	@if [ -f $(COMPILEF) ]; \
+		then $(SHELL) $(COMPILEF); \
+		else $(JAVAC) $<; fi
+	@echo "JAVAC $<"
 
 ffi/native.o: ffi/native.c
 	ghc -Wall -O2 -c $< -o $@
 
-mate: Mate.hs ffi/trap.c $(HS_FILES) ffi/native.o
-	ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD)
+mate: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o $(CLASS_FILES)
+	@mkdir -p build/release
+	ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD) -outputdir build/release
+
+%.dbg: %.class mate.dbg
+	./mate.dbg $(basename $<)
+
+ifeq (${DBGFLAGS},)
+DEBUGFLAGS = -DDBG_JIT -DDBG_MP
+else
+DEBUGFLAGS = ${DBGFLAGS}
+endif
+mate.dbg: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
+	@mkdir -p build/debug/{ffi,Mate,}
+	gcc -Wall $(DEBUGFLAGS) -O0 -c ffi/trap.c -o build/debug/ffi/trap.o
+	ghc --make $(DEBUGFLAGS) $(GHC_OPT) Mate.hs build/debug/ffi/trap.o -o $@ $(GHC_LD) -outputdir build/debug
 
 clean:
-	rm -f {Mate/,}*.hi {Mate/,ffi/,}*.o mate tests/*.class
+	rm -rf build mate mate.dbg ffi/native.o tests/*.class Mate/*_stub.*
 
 ghci: mate
 	ghci $(PACKAGES) $(O_FILES) Mate.hs $(GHC_LD)
@@ -61,3 +69,12 @@ tags: mate
 	@# @-fforce-recomp, see
 	@# http://stackoverflow.com/questions/7137414/how-do-i-force-interpretation-in-hint
 	ghc -fforce-recomp -e :ctags $(PACKAGES) $(HS_FILES) $(O_FILES) Mate.hs
+
+hlint:
+	@# hlint isn't able to evaluate CPP comments correctly *sigh*
+	@cp debug.h debug_tmp.h
+	@# so we remove them "by hand", for hlint
+	@gcc -E -x c -fpreprocessed -dD -E debug_tmp.h | grep -v 'debug_tmp.h' > debug.h
+	@# ignore error code from hlint
+	-hlint Mate.hs Mate/
+	@mv debug_tmp.h debug.h