checkpoint
[sbp.git] / Makefile
index 0cf5053..da56cde 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,15 @@
 
-java = java
+java = java -Xmx900m
 
-doc: edu.berkeley.sbp.jar
+tibdoc: edu.berkeley.sbp.jar
        $(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
                tests/tibdoc.g \
-               tests/input.tibdoc
+               tests/bitstream.tib
+
+demo: edu.berkeley.sbp.jar
+       $(java) -cp $< edu.berkeley.sbp.misc.Demo \
+               tests/demo.g \
+               '(11+2*3)-44'
 
 regress:
        make boot
@@ -25,22 +30,52 @@ test: edu.berkeley.sbp.jar
                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 \
+               tests/testcase.g \
+               tests/ifthen.tc
+
 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.MetaGrammar
+               edu.berkeley.sbp.meta.MetaGrammar
 
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)
        mkdir -p bin
-       javac -d bin -sourcepath src $^
+       javac -cp javax.servlet.jar:tests/ArchSimA3.jar:tests/grappa.jar -d bin -sourcepath src $^
        cd bin; jar cf ../$@ .
 
 javadoc:
@@ -57,3 +92,4 @@ upload:
        darcs dist
        echo '<html><head><meta HTTP-EQUIV="Refresh" CONTENT="0;URL=doc/sbp.html"></head></html>' > index.html
        rsync -are ssh --progress --verbose --delete ./ argus.cs.berkeley.edu:public_html/sbp/
+