X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=bff58007b580b96179ae5eb03222a607d719517a;hp=cbc38a9872b2979d796d77ac4a54ab6504da3f62;hb=390b254a3d680502e11c8f1d9f17d5606f62c82c;hpb=a83123d8bf8b836e6550a60c321e74a2a8d58598
diff --git a/Makefile b/Makefile
index cbc38a9..bff5800 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,70 @@ upload:
echo '' > index.html
rsync -are ssh --progress --verbose --delete ./ argus.cs.berkeley.edu:public_html/sbp/
+
+
+###################################################################
+## Experimental Haskell bindings
+##
+## make runHaskellDemo JAVA_HOME=
+##
+
+include Makefile.haskell
+
+.jvm-bridge:
+ mkdir -p $(prefix)/src
+
+ cd $(prefix)/src; \
+ curl $(jvm-bridge-url) | tar -xvzf -
+
+ cd $(prefix)/src/haskell-jvm-bridge-*; \
+ patch -p0 < $(shell pwd)/misc/broken-cygwin-detection-patch && \
+ $(patchmac) \
+ $(patchghc) \
+ (cd Native; autoreconf; true) && \
+ (cd Haskell; autoreconf; true)
+
+ cd $(prefix)/src/haskell-jvm-bridge-*/Native; \
+ ./configure --prefix=$(prefix) $(with_jvmdir) && \
+ make && \
+ make install
+
+ cd $(prefix)/src/haskell-jvm-bridge-*/Haskell; \
+ ./configure --prefix=$(prefix) $(with_jvmdir) && \
+ make && \
+ make install
+
+ touch $@
+
+runHaskellDemo: .jvm-bridge
+ mkdir -p bin
+ make bin/HaskellDemo
+ 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 $(link)
+
+bin/Class_%.o:
+ make 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 $(link)
+
+bin/JVM_%.o:
+ make bin/Class_$*.o
+ make bin/Header_$*.o
+ cd bin; echo -e $($*_list) | $(bin)/MakeJVMModule JVM_$*
+ cd bin; $(ghc) -c JVM_$*.hs $(link)
+
+edu_berkeley_sbp_misc_HaskellHelper_list = "edu.berkeley.sbp.misc.HaskellHelper\njava.lang.String\nedu.berkeley.sbp.Tree\njava.lang.Object"
+
+bin/HaskellDemo: src/SBP.hs \
+ 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/SBP.hs $(link) -o SBP.o
+ cd bin; $(ghc) -i../src/ -c ../src/HaskellDemo.hs $(link) -o HaskellDemo.o
+ cd bin; for A in *.hs; do $(ghc) -c $$A $(link); done
+ cd bin; $(ghc) $(linkopts) $(link) -o HaskellDemo *.o