X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=6e6286aac3347a5cf215f67dd0c8ae6a116ba666;hp=43d6717d789c21bd280cc17d2972ea32dbb5e0fe;hb=eaa3114f9dbf4e0d3431da50791b9d3199f445be;hpb=e84029a8b861075d6d0ed5040f919b2e4da4c98f

diff --git a/Makefile b/Makefile
index 43d6717..6e6286a 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 \
@@ -25,15 +27,14 @@ regress:
 	make test
 
 profile: edu.berkeley.sbp.jar
-	$(java) -agentlib:yjpagent \
-		-cp $< edu.berkeley.sbp.misc.RegressionTests \
-		-profile \
+	$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
+		-profile -agentlib:yjpagent \
 		tests/meta.g \
 		tests/testcase.g \
 		tests/regression.tc
 
 test: edu.berkeley.sbp.jar
-	$(java) -cp $< edu.berkeley.sbp.misc.RegressionTests \
+	$(java) -Dsbp.verbose=true -cp $< edu.berkeley.sbp.misc.RegressionTests \
 		tests/meta.g \
 		tests/testcase.g \
 		tests/regression.tc
@@ -84,7 +85,8 @@ boot: edu.berkeley.sbp.jar
 edu.berkeley.sbp.jar: $(shell find src -name \*.java)
 	mkdir -p bin
 	javac  -cp javax.servlet.jar -d bin -sourcepath src $^
-	cd bin; jar cf ../$@ .
+	echo 'Main-Class: edu.berkeley.sbp.misc.CommandLine' > bin/manifest
+	cd bin; jar cmf manifest ../$@ .
 #-Xlint:unchecked
 javadoc:
 	rm -rf doc/api
@@ -201,12 +203,13 @@ bin/HaskellDemo: src/SBP.hs \
 
 
 ghcroot = /usr/local/brian/ghc
-ghc = $(ghcroot)/compiler/ghc-inplace
+ghc     = $(ghcroot)/compiler/ghc-inplace -fallow-undecidable-instances -fallow-overlapping-instances
 ghclibs = $(ghcroot)/rts/HSrts.jar:$(ghcroot)/libraries/base/HSbase.jar:$(ghcroot)/libraries/stm/HSstm.jar
 
 bin/Main.class: src/Main.lhs src/SBP.lhs
 	cd src; $(ghc) -fglasgow-exts -cpp -odir ../bin -c -java SBP.lhs
 	cd src; $(ghc) -fglasgow-exts -cpp -odir ../bin -java Main.lhs
 
+#profile=-agentlib:yjpagent
 go: bin/Main.class edu.berkeley.sbp.jar
-	java -cp bin:$(ghclibs):edu.berkeley.sbp.jar Main
\ No newline at end of file
+	java $(profile) -cp bin:$(ghclibs):edu.berkeley.sbp.jar Main
\ No newline at end of file