X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=55c7365fc3f289efe280f3b36b1524d4262597d5;hb=c1a7dcf0dd5b839d82215263d0f57470e905a73d;hp=7cfc73da716ad33c117eb143b678c154288590cf;hpb=2c1c0293545f3d12c23220fd05c663e6aa3f3de1;p=sbp.git
diff --git a/Makefile b/Makefile
index 7cfc73d..55c7365 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,8 @@
java = java -Xmx900m
+default: edu.berkeley.sbp.jar
+
tibdoc: edu.berkeley.sbp.jar
$(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
tests/tibdoc.g \
@@ -24,67 +26,32 @@ regress:
rm edu.berkeley.sbp.jar
make test
-profile: edu.berkeley.sbp.jar
- $(java) -agentlib:yjpagent \
- -cp $< edu.berkeley.sbp.misc.RegressionTests \
- -profile \
- tests/meta.g \
- tests/testcase.g \
- tests/regression.tc
-
+#-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)
mkdir -p bin
- javac -cp javax.servlet.jar:tests/ArchSimA3.jar:tests/grappa.jar -d bin -sourcepath src $^
- cd bin; jar cf ../$@ .
+ javac -cp javax.servlet.jar -d bin -sourcepath src $^
+ echo 'Main-Class: edu.berkeley.sbp.misc.CommandLine' > bin/manifest
+ cd bin; jar cmf manifest ../$@ .
#-Xlint:unchecked
javadoc:
rm -rf doc/api
@@ -102,14 +69,23 @@ javadoc:
-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.meta \
+ edu.berkeley.sbp.chr \
+ edu.berkeley.sbp.misc \
+ edu.berkeley.sbp.util
clean:
rm -rf doc/api edu.berkeley.sbp.jar bin edu.berkeley.sbp.tar.gz
-
-upload:
- make clean
- make javadoc
- darcs dist
- echo '