X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=2f10cae952df16d1b45c4a1d4e9b3cca99ce51b0;hp=33deb5048a37b6cd7cf3740a032b964558e01e36;hb=f8303d6b2e11b97707d8b63aa80a2b814e145693;hpb=60b00d51a5d05ba33ae283577fa5a84899430641

diff --git a/Makefile b/Makefile
index 33deb50..2f10cae 100644
--- a/Makefile
+++ b/Makefile
@@ -21,74 +21,57 @@ 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) -cp $< edu.berkeley.sbp.misc.RegressionTests \
-		-profile -agentlib:yjpagent \
-		tests/meta.g \
-		tests/testcase.g \
-		tests/regression.tc
+VERSION = ${shell cat VERSION}
+releases_dir = /afs/research.cs.berkeley.edu/project/sbp/releases/
+git_repo = /afs/research.cs.berkeley.edu/project/sbp/edu.berkeley.sbp.git/
+release: edu.berkeley.sbp.jar
+	echo == making release ${VERSION} ==============================
+	echo
+	git push ${git_repo}
+	git archive --prefix=sbp-${VERSION} HEAD | gzip > \
+	  ${releases_dir}/sbp-${VERSION}.tgz
+	cp edu.berkeley.sbp.jar ${releases_dir}/sbp-${VERSION}.jar
+	emacs -nw ~/wix/src/research.cs.berkeley.edu/sbp/index.wix
+	cd ~/proj/wix; make
 
 #-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)
+edu.berkeley.sbp.jar: $(shell find src -name \*.java -or -name \*.scala)
+	rm -rf bin
 	mkdir -p bin
-	javac  -cp javax.servlet.jar -d bin -sourcepath src $^
+	javac  -cp javax.servlet.jar -d bin -sourcepath src `find src -name \*.java`
+	scalac -d bin -sourcepath src `find src -name \*.scala`
 	echo 'Main-Class: edu.berkeley.sbp.misc.CommandLine' > bin/manifest
 	cd bin; jar cmf manifest ../$@ .
 #-Xlint:unchecked
+
 javadoc:
 	rm -rf doc/api
 	mkdir -p doc/api