X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=2ee8bb8499464c931d3623d151ddd8dfb48a9825;hp=181de0b30e614ed778d1dd8368781802e18a61fb;hb=d6c55258bdfa1d46c471773c7f6095a6d1b7c46c;hpb=1a318fea23d4802f8413bff48fe9d26809fb61f9
diff --git a/Makefile b/Makefile
index 181de0b..2ee8bb8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,23 @@
-java = java
+java = java -Xmx900m
tibdoc: edu.berkeley.sbp.jar
$(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
tests/tibdoc.g \
- tests/tib.in
+ tests/bitstream.tib
+
+java15: edu.berkeley.sbp.jar
+ $(java) -cp $< edu.berkeley.sbp.misc.Java15 \
+ tests/java15.g \
+ tests/java15.test
demo: edu.berkeley.sbp.jar
$(java) -cp $< edu.berkeley.sbp.misc.Demo \
- tests/meta.g \
- tests/meta.g
+ tests/demo.g \
+ '(11+2*3)-44'
+
+demo2: edu.berkeley.sbp.jar
+ $(java) -cp $< edu.berkeley.sbp.misc.Demo2
regress:
make boot
@@ -69,22 +77,52 @@ ifthen: edu.berkeley.sbp.jar
boot: edu.berkeley.sbp.jar
cd src; \
$(java) -cp ../$< \
- edu.berkeley.sbp.misc.MetaGrammar \
+ edu.berkeley.sbp.meta.MetaGrammar \
../tests/meta.g \
- edu.berkeley.sbp.misc.MetaGrammarTree
+ edu.berkeley.sbp.meta.MetaGrammar
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:
rm -rf doc/api
mkdir -p doc/api
- javadoc -sourcepath src -public -d doc/api `find src -name \*.java`
+ javadoc \
+ -linksource \
+ -windowtitle "SBP: the Scannerless Boolean Parser" \
+ -sourcepath src \
+ -header "SBP
v1.0" \
+ -public \
+ -notree \
+ -noindex \
+ -nonavbar \
+ -stylesheetfile doc/javadoc.css \
+ -noqualifier all \
+ -d doc/api \
+ edu.berkeley.sbp
+ javadoc \
+ -linksource \
+ -windowtitle "SBP: the Scannerless Boolean Parser" \
+ -sourcepath src \
+ -header "SBP
v1.0" \
+ -public \
+ -notree \
+ -noindex \
+ -nonavbar \
+ -noqualifier all \
+ -d doc/api \
+ edu.berkeley.sbp.meta \
+ edu.berkeley.sbp.bind \
+ edu.berkeley.sbp.chr \
+ edu.berkeley.sbp.misc \
+ edu.berkeley.sbp.tib \
+ edu.berkeley.sbp.util
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
@@ -93,3 +131,96 @@ upload:
echo '' > index.html
rsync -are ssh --progress --verbose --delete ./ argus.cs.berkeley.edu:public_html/sbp/
+
+
+###################################################################
+## Experimental Haskell bindings
+##
+## make runHaskellDemo JAVA_HOME=
+##
+
+ghc_version = $(shell ghc --version | sed 's_.*version \([0-9]*\.[0-9]*\).*_\1_')
+
+ifeq ($(ghc_version),6.5)
+patchghc = patch -p0 < $(shell pwd)/misc/ghc-6.5-patch &&
+else
+patchghc =
+endif
+
+ifeq ($(shell uname),Darwin)
+with_jvmdir = --with-jvmdir=/System/Library/Frameworks/JavaVM.framework/
+jvmlink = -framework JavaVM -optl -fexceptions
+patchmac = patch -p0 < $(shell pwd)/misc/intel-mac-patch &&
+linkopts =
+else
+with_jvmdir = --with-jvmdir=$(JAVA_HOME)
+jvmlink = -ljava -ljvm -lverify
+patchmac =
+linkopts = -optl "-Wl,-rpath,$(JAVA_HOME)/jre/lib/i386/" -optl "-Wl,-rpath,$(JAVA_HOME)/jre/lib/i386/client/"
+endif
+
+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
+
+# The double -lHaskellJVMBridge is due to a circular link dep; the linux linker gets upset
+link = -L$(prefix)/lib/ \
+ -L$(JAVA_HOME)/jre/lib/i386/ \
+ -L$(JAVA_HOME)/jre/lib/i386/client/ \
+ -lstdc++ -lHaskellJVMBridge -lJVMBridge -lJVMInvocation -lHaskellJVMBridge $(jvmlink)
+packages = -package haskell98 -package base -package rts
+ghc = ghc -fglasgow-exts $(packages) -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-*; \
+ 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: 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: bin/Class_%.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/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 $(link) -o HaskellDemo.o
+ cd bin; for A in *.hs; do $(ghc) -c $$A $(link); done
+ cd bin; $(ghc) $(linkopts) $(link) -o HaskellDemo *.o