X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=c3642cf604cae7d328aeb64ab4da3c4b7620e176;hp=25f68025f49bcb41286b3dc3c21dcd108d8e421d;hb=fe1771360b47a8b7202cf0ee296d89ad9b4adf37;hpb=f83221f37bcf9eaf79d87cce9156f73d2d24985b
diff --git a/Makefile b/Makefile
index 25f6802..c3642cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
java = java -Xmx900m
+default: edu.berkeley.sbp.jar
+
tibdoc: edu.berkeley.sbp.jar
$(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
tests/tibdoc.g \
@@ -19,72 +21,40 @@ demo: edu.berkeley.sbp.jar
demo2: edu.berkeley.sbp.jar
$(java) -cp $< edu.berkeley.sbp.misc.Demo2
+ast: edu.berkeley.sbp.jar
+ $(java) -cp $< edu.berkeley.sbp.misc.TestAstGenerator tests/math.g
+
regress:
make boot
rm edu.berkeley.sbp.jar
make test
-profile: edu.berkeley.sbp.jar
- $(java) -agentlib:yjpagent \
- -cp $< edu.berkeley.sbp.misc.RegressionTests \
- -profile \
- tests/meta.g \
- tests/testcase.g \
- tests/regression.tc
-
+#-Dsbp.verbose=true
test: edu.berkeley.sbp.jar
$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
- tests/meta.g \
+ src/edu/berkeley/sbp/meta/meta.g \
tests/testcase.g \
tests/regression.tc
-archscript: edu.berkeley.sbp.jar
- cd tests; \
- $(java) -cp ArchSimA3.jar:../$< ArchScript \
- test.archscript
-
-codebag: edu.berkeley.sbp.jar
- cd tests; \
- $(java) -cp ArchSimA3.jar:../$< CodeBagParser \
- test.fleet
-
-javatest: edu.berkeley.sbp.jar
- $(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
- tests/meta.g \
- tests/testcase.g \
- tests/java.tc
-
-loop: edu.berkeley.sbp.jar
- $(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
- -graph \
- tests/meta.g \
- tests/testcase.g \
- tests/loop.tc
-
-pain: edu.berkeley.sbp.jar
- $(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
- -graph \
- tests/meta.g \
- tests/testcase.g \
- tests/pain.tc
-
-ifthen: edu.berkeley.sbp.jar
- $(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
- tests/meta.g \
+profile: edu.berkeley.sbp.jar
+ $(java) -agentpath:/Applications/YourKit.app/bin/mac/libyjpagent.jnilib -cp $< edu.berkeley.sbp.misc.RegressionTests \
+ -profile \
+ src/edu/berkeley/sbp/meta/meta.g \
tests/testcase.g \
- tests/ifthen.tc
+ tests/regression.tc
boot: edu.berkeley.sbp.jar
cd src; \
$(java) -cp ../$< \
edu.berkeley.sbp.meta.MetaGrammar \
- ../tests/meta.g \
+ ../src/edu/berkeley/sbp/meta/meta.g \
edu.berkeley.sbp.meta.MetaGrammar
edu.berkeley.sbp.jar: $(shell find src -name \*.java)
mkdir -p bin
javac -cp javax.servlet.jar -d bin -sourcepath src $^
- cd bin; jar cf ../$@ .
+ echo 'Main-Class: edu.berkeley.sbp.misc.CommandLine' > bin/manifest
+ cd bin; jar cmf manifest ../$@ .
#-Xlint:unchecked
javadoc:
rm -rf doc/api
@@ -114,79 +84,11 @@ javadoc:
-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
- make javadoc
- darcs dist
- 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