X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=d712df126622864fb6536f5bde91de8d6dd9e72b;hp=33deb5048a37b6cd7cf3740a032b964558e01e36;hb=HEAD;hpb=60b00d51a5d05ba33ae283577fa5a84899430641;ds=sidebyside
diff --git a/Makefile b/Makefile
index 33deb50..d712df1 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
@@ -104,18 +87,7 @@ javadoc:
-stylesheetfile doc/javadoc.css \
-noqualifier all \
-d doc/api \
- edu.berkeley.sbp
- javadoc \
- -linksource \
- -windowtitle "SBP: the Scannerless Boolean Parser" \
- -sourcepath src \
- -header "SBP
v1.0" \
- -public \
- -notree \
- -noindex \
- -nonavbar \
- -noqualifier all \
- -d doc/api \
+ edu.berkeley.sbp \
edu.berkeley.sbp.meta \
edu.berkeley.sbp.chr \
edu.berkeley.sbp.misc \