X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=55c7365fc3f289efe280f3b36b1524d4262597d5;hp=8b465850c0fac21d52a15f5d5fb393c03c4d03ec;hb=f95343b3b6e918434ff68924e79df22b9cb074e8;hpb=8abe88ea7a5d7b1fc20c45b05e6397dad81e7cdb

diff --git a/Makefile b/Makefile
index 8b46585..55c7365 100644
--- a/Makefile
+++ b/Makefile
@@ -1,102 +1,91 @@
 
-java = java
+java = java -Xmx900m
+
+default: edu.berkeley.sbp.jar
 
 tibdoc: edu.berkeley.sbp.jar
 	$(java) -cp $< edu.berkeley.sbp.tib.TibDoc \
 		tests/tibdoc.g \
-		tests/tib.in
+		tests/bitstream.tib
+
+java15: edu.berkeley.sbp.jar
+	$(java) -cp $< edu.berkeley.sbp.misc.Java15 \
+		tests/java15.g \
+		tests/java15.test
 
 demo: edu.berkeley.sbp.jar
 	$(java) -cp $< edu.berkeley.sbp.misc.Demo \
-		tests/meta.g \
-		tests/meta.g
+		tests/demo.g \
+		'(11+2*3)-44'
+
+demo2: edu.berkeley.sbp.jar
+	$(java) -cp $< edu.berkeley.sbp.misc.Demo2
 
 regress:
 	make boot
 	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.misc.MetaGrammar \
-		../tests/meta.g \
-		edu.berkeley.sbp.misc.MetaGrammarTree
-
-newboot: edu.berkeley.sbp.jar
-	cd src; \
-	$(java) -cp ../$< \
-		edu.berkeley.sbp.misc.Demo \
-		../tests/meta.g \
-		edu.berkeley.sbp.misc.DemoMetaGrammarTree
+		edu.berkeley.sbp.meta.MetaGrammar \
+		../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
 	mkdir -p doc/api
-	javadoc -sourcepath src -public -d doc/api `find src -name \*.java`
+	javadoc \
+		-linksource \
+		-windowtitle "SBP: the Scannerless Boolean Parser" \
+		-sourcepath src \
+		-header "<b>SBP </b><br>v1.0" \
+		-public \
+		-notree \
+		-noindex \
+		-nonavbar \
+		-stylesheetfile doc/javadoc.css \
+		-noqualifier all \
+		-d doc/api \
+		edu.berkeley.sbp
+	javadoc \
+		-linksource \
+		-windowtitle "SBP: the Scannerless Boolean Parser" \
+		-sourcepath src \
+		-header "<b>SBP </b><br>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 '<html><head><meta HTTP-EQUIV="Refresh" CONTENT="0;URL=doc/sbp.html"></head></html>' > index.html
-	rsync -are ssh --progress --verbose --delete ./ argus.cs.berkeley.edu:public_html/sbp/
+	rm -rf Makefile.bak *.hi *.o *.class *.jar Header_*.hs Class_*.hs *_JVM.hs InterfaceMyClass