add Scala support

[sbp.git] / Makefile

diff --git a/Makefile b/Makefile
index c3642cf..2f10cae 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,19 @@ regress:
        rm edu.berkeley.sbp.jar
        make test
 
+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 \
@@ -50,12 +63,15 @@ boot: edu.berkeley.sbp.jar
                ../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