X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=6e6286aac3347a5cf215f67dd0c8ae6a116ba666;hp=24d374941d47c5138651981c6c4d11395903eb41;hb=a60fa7d36f9039881c6eac2b771bd53943d997b7;hpb=a89e644223670c82561eb08c3f3f4d13b386341a

diff --git a/Makefile b/Makefile
index 24d3749..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
@@ -175,11 +177,14 @@ bin/Header_%.o: edu.berkeley.sbp.jar .jvm-bridge
 	cd bin; $(bin)/MakeHeaderModule -module Header_$* -jar ../edu.berkeley.sbp.jar
 	cd bin; $(ghc) -c Header_$*.hs $(link)
 
-bin/Class_%.o: bin/Header_%.o
+bin/Class_%.o:
+	make bin/Header_$*.o
 	cd bin; $(bin)/MakeClassModule -import Header_Java -import Header_$* -cp ../edu.berkeley.sbp.jar `echo $* | sed s/_/./g`
 	cd bin; $(ghc) -c Class_$*.hs $(link)
 
-bin/JVM_%.o: bin/Class_%.o bin/Header_%.o
+bin/JVM_%.o:
+	make bin/Class_$*.o
+	make bin/Header_$*.o
 	cd bin; echo -e $($*_list) | $(bin)/MakeJVMModule JVM_$*
 	cd bin; $(ghc) -c JVM_$*.hs $(link)
 
@@ -195,3 +200,16 @@ bin/HaskellDemo: src/SBP.hs \
 	cd bin; $(ghc) -i../src/ -c ../src/HaskellDemo.hs $(link) -o HaskellDemo.o
 	cd bin; for A in *.hs; do $(ghc) -c $$A $(link); done
 	cd bin; $(ghc) $(linkopts) $(link) -o HaskellDemo *.o
+
+
+ghcroot = /usr/local/brian/ghc
+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 $(profile) -cp bin:$(ghclibs):edu.berkeley.sbp.jar Main
\ No newline at end of file