X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile;h=cd0e887209a88be9fbdbc39a696c29faf0d5f59a;hb=8cce0bebc102531155bece6f56200cb7cf12d976;hp=6a1922e79407a05857bb3a1d5334e1466570f705;hpb=4acc971dbcafd34fa7f5716513ae4dd47e0ea0eb;p=mate.git

diff --git a/Makefile b/Makefile
index 6a1922e..cd0e887 100644
--- a/Makefile
+++ b/Makefile
@@ -1,54 +1,96 @@
 SHELL := bash
 
 JAVAC := javac
-JAVA_FILES := $(wildcard tests/*.java java/lang/*.java java/io/*.java)
+JAVA_FILES := $(wildcard jmate/lang/*.java jmate/io/*.java 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_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
+BUILD := build
+B_RELEASE := $(BUILD)/release
+B_STATIC := $(BUILD)/static
+B_DEBUG := $(BUILD)/release
+O_STATIC_FILES = $(shell ls $(B_STATIC)/Mate/*.o) $(wildcard $(B_STATIC)/ffi/*.o)
+PACKAGES_ := bytestring harpy hs-java plugins
 PACKAGES := $(addprefix -package ,$(PACKAGES_))
 
-GHC_OPT := -dynamic -Wall -O0 -fno-warn-unused-do-bind
+GHC_OPT := -I. -Wall -O0 -fno-warn-unused-do-bind -rtsopts
 GHC_LD := -optl-Xlinker -optl-x
 
 
 .PHONY: all test clean ghci
 
-all: mate $(CLASS_FILES)
-
-tests: mate $(TEST_CLASS_FILES)
+all: mate
 
 %: %.class mate
-	@./tools/openjdktest.sh $@
+	./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) $(JAVA_FILES) $<; fi
+	@echo "JAVAC $<"
 
 ffi/native.o: ffi/native.c
 	ghc -Wall -O2 -c $< -o $@
 
-mate: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o
-	@mkdir -p build/release
-	ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD) -outputdir build/release
+GHCCALL = ghc --make $(GHC_OPT) Mate.hs ffi/trap.c -o $@ $(GHC_LD) -outputdir
+mate: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o $(CLASS_FILES)
+	@mkdir -p $(B_RELEASE)
+	$(GHCCALL) $(B_RELEASE) -dynamic
+
+mate.static: Mate.hs ffi/trap.c $(HS_FILES) $(HS_BOOT) ffi/native.o $(CLASS_FILES)
+	@mkdir -p $(B_STATIC)
+	$(GHCCALL) $(B_STATIC) -static
 
 %.dbg: %.class mate.dbg
 	./mate.dbg $(basename $<)
 
+%.gdb: %.class mate.dbg
+	gdb -x .gdbcmds -q --args mate.dbg $(basename $<) +RTS -V0 --install-signal-handlers=no
+
+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 -DDEBUG -O0 -c ffi/trap.c -o build/debug/ffi/trap.o
-	ghc --make -DDEBUG $(GHC_OPT) Mate.hs build/debug/ffi/trap.o -o $@ $(GHC_LD) -outputdir build/debug
+	@mkdir -p $(B_DEBUG)/{ffi,Mate,}
+	gcc -Wall $(DEBUGFLAGS) -O0 -c ffi/trap.c -o $(B_DEBUG)/ffi/trap.o
+	ghc --make $(DEBUGFLAGS) $(GHC_OPT) Mate.hs $(B_DEBUG)/ffi/trap.o -o $@ $(GHC_LD) -outputdir $(B_DEBUG)
 
 clean:
-	rm -rf build mate mate.dbg ffi/native.o tests/*.class
+	rm -rf $(BUILD) mate mate.static mate.dbg tags ffi/native.o \
+		tests/*.class Mate/*_stub.* \
+		jmate/lang/*.class jmate/io/*.class java/io/*.class \
+		java/lang/{Integer,Character,String,System}.class
 
-ghci: mate
-	ghci $(PACKAGES) $(O_FILES) Mate.hs $(GHC_LD)
+ghci: mate.static
+	ghci -I. $(PACKAGES) $(O_STATIC_FILES) -outputdir $(B_STATIC) Mate.hs
 
 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
+	@# @-fobject-code: force to generate native code (necessary for ffi stuff)
+	ghc -I. -fforce-recomp -fobject-code $(PACKAGES) Mate.hs $(O_STATIC_FILES) -outputdir $(B_STATIC) -e :ctags
+
+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