X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=25f68025f49bcb41286b3dc3c21dcd108d8e421d;hp=cbc38a9872b2979d796d77ac4a54ab6504da3f62;hb=f83221f37bcf9eaf79d87cce9156f73d2d24985b;hpb=a83123d8bf8b836e6550a60c321e74a2a8d58598
diff --git a/Makefile b/Makefile
index cbc38a9..25f6802 100644
--- a/Makefile
+++ b/Makefile
@@ -83,7 +83,7 @@ boot: edu.berkeley.sbp.jar
edu.berkeley.sbp.jar: $(shell find src -name \*.java)
mkdir -p bin
- javac -cp javax.servlet.jar:tests/ArchSimA3.jar:tests/grappa.jar -d bin -sourcepath src $^
+ javac -cp javax.servlet.jar -d bin -sourcepath src $^
cd bin; jar cf ../$@ .
#-Xlint:unchecked
javadoc:
@@ -122,6 +122,7 @@ javadoc:
clean:
rm -rf doc/api edu.berkeley.sbp.jar bin edu.berkeley.sbp.tar.gz
+ rm -rf Makefile.bak *.hi *.o *.class *.jar Header_*.hs Class_*.hs *_JVM.hs InterfaceMyClass
upload:
make clean
@@ -130,3 +131,62 @@ upload:
echo '' > index.html
rsync -are ssh --progress --verbose --delete ./ argus.cs.berkeley.edu:public_html/sbp/
+
+
+###################################################################
+## Experimental Haskell bindings
+##
+## make runHaskellDemo JAVA_HOME=
+##
+
+prefix := $(shell pwd)/prefix
+jvm-bridge-site := umn.dl.sourceforge.net
+jvm-bridge-url := http://$(jvm-bridge-site)/sourceforge/jvm-bridge/haskell-jvm-bridge-0.3.tar.gz
+link := -L$(prefix)/lib/ \
+ -L$(JAVA_HOME)/jre/lib/i386/ \
+ -L$(JAVA_HOME)/jre/lib/i386/client/ \
+ -lstdc++ -lJVMBridge -lJVMInvocation -lHaskellJVMBridge -ljava -ljvm -lverify
+packages := -package haskell98 -package base -package rts -package concurrent -package lang
+ghc := ghc -fglasgow-exts $(packages) $(link) -i$(prefix)/imports/
+bin := $(prefix)/bin/
+
+.jvm-bridge:
+ mkdir -p $(prefix)/src
+ cd $(prefix)/src; curl $(jvm-bridge-url) | tar -xvzf -
+
+ cd $(prefix)/src/haskell-jvm-bridge-*/Native; ./configure --prefix=$(prefix) --with-jvmdir=$(JAVA_HOME)
+ cd $(prefix)/src/haskell-jvm-bridge-*/Native; make
+ cd $(prefix)/src/haskell-jvm-bridge-*/Native; make install
+
+ cd $(prefix)/src/haskell-jvm-bridge-*/Haskell; ./configure --prefix=$(prefix) --with-jvmdir=$(JAVA_HOME)
+ cd $(prefix)/src/haskell-jvm-bridge-*/Haskell; make
+ cd $(prefix)/src/haskell-jvm-bridge-*/Haskell; make install
+
+ touch $@
+
+runHaskellDemo: .jvm-bridge
+ mkdir -p bin
+ make bin/HaskellDemo
+ LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/usr/lib/:$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/client bin/HaskellDemo
+
+bin/Header_%.o: edu.berkeley.sbp.jar .jvm-bridge
+ cd bin; $(bin)/MakeHeaderModule -module Header_$* -jar ../edu.berkeley.sbp.jar
+ cd bin; $(ghc) -c Header_$*.hs
+
+bin/Class_%.o: bin/Header_%.o
+ cd bin; $(bin)/MakeClassModule -import Header_Java -import Header_$* -cp ../edu.berkeley.sbp.jar `echo $* | sed s/_/./g`
+ cd bin; $(ghc) -c Class_$*.hs
+
+bin/JVM_%.o: bin/Class_%.o
+ cd bin; echo -e $($*_list) | $(bin)/MakeJVMModule JVM_$*
+ cd bin; $(ghc) -c JVM_$*.hs
+
+edu_berkeley_sbp_misc_HaskellHelper_list = "edu.berkeley.sbp.misc.HaskellHelper\njava.lang.String\nedu.berkeley.sbp.Tree\njava.lang.Object"
+
+bin/HaskellDemo: src/HaskellDemo.hs \
+ bin/Class_java_lang_Object.o \
+ bin/Class_java_lang_String.o \
+ bin/Class_edu_berkeley_sbp_Tree.o \
+ bin/JVM_edu_berkeley_sbp_misc_HaskellHelper.o
+ cd bin; $(ghc) -c ../src/HaskellDemo.hs -o HaskellDemo.o
+ cd bin; $(ghc) -o HaskellDemo *.o