X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=874eaca18993b1870d73c323f9a6f5db2f183b55;hb=eda544585c2304faa82d249c4744fd5cecbf9211;hp=3feab21015ba376830ec178b8a78df0198f1a322;hpb=8633a1ff957ac9ccbafa5e897bc8b9f17eadab02;p=sbp.git

diff --git a/Makefile b/Makefile
index 3feab21..874eaca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,16 @@
 
 java = java
 
-doc: edu.berkeley.sbp.jar
+tibdoc: edu.berkeley.sbp.jar
 	$(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
 		tests/tibdoc.g \
 		tests/input.tibdoc
 
+demo: edu.berkeley.sbp.jar
+	$(java) -cp $< edu.berkeley.sbp.misc.Demo \
+		tests/demo.g \
+		tests/demo.in
+
 regress:
 	make boot
 	rm edu.berkeley.sbp.jar
@@ -25,6 +30,22 @@ 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
+
 boot: edu.berkeley.sbp.jar
 	cd src; \
 	$(java) -cp ../$< \
@@ -34,7 +55,7 @@ boot: edu.berkeley.sbp.jar
 
 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: