X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=Makefile;h=75d88af6be14cc44a2b1de85bf62be7f62bf7e88;hp=205b410760b7eef5b07506e08500ea9acc929727;hb=b9228a7c1bd98e514e6a5c0483c2e539ee777992;hpb=85016412a8eb6bfd0a4bd57a01a966ca9c5302f7

diff --git a/Makefile b/Makefile
index 205b410..75d88af 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,9 +27,8 @@ 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
@@ -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
@@ -139,24 +141,7 @@ upload:
 ##   make runHaskellDemo JAVA_HOME=<java-home>
 ##
 
-ifeq ($(shell uname),Darwin)
-with_jvmdir = --with-jvmdir=/System/Library/Frameworks/JavaVM.framework/
-jvmlink     = -framework JavaVM -optl -fexceptions
-else
-with_jvmdir = --with-jvmdir=$(JAVA_HOME)
-jvmlink     = -ljava -ljvm -lverify
-endif
-
-prefix          = $(shell pwd)/prefix
-jvm-bridge-site = umn.dl.sourceforge.net
-jvm-bridge-url  = http://$(jvm-bridge-site)/sourceforge/jvm-bridge/haskell-jvm-bridge-0.3.tar.gz
-link            = -L$(prefix)/lib/ \
-                   -L$(JAVA_HOME)/jre/lib/i386/ \
-                   -L$(JAVA_HOME)/jre/lib/i386/client/ \
-                   -lstdc++ -lJVMBridge -lJVMInvocation -lHaskellJVMBridge $(jvmlink)
-packages        = -package haskell98 -package base -package rts -package rts
-ghc             = ghc -fglasgow-exts $(packages) $(link) -i$(prefix)/imports/
-bin             = $(prefix)/bin/
+include Makefile.haskell
 
 .jvm-bridge:
 	mkdir -p $(prefix)/src
@@ -165,8 +150,9 @@ bin             = $(prefix)/bin/
 		curl $(jvm-bridge-url) | tar -xvzf -
 
 	cd $(prefix)/src/haskell-jvm-bridge-*; \
-		patch -p0 < $(shell pwd)/misc/jvm-bridge.patch && \
-		patch -p0 < $(shell pwd)/misc/jvm-bridge.intelmac2.patch && \
+		patch -p0 < $(shell pwd)/misc/broken-cygwin-detection-patch && \
+		$(patchmac) \
+		$(patchghc) \
 		(cd Native; autoreconf; true) && \
 		(cd Haskell; autoreconf; true)
 
@@ -185,27 +171,45 @@ bin             = $(prefix)/bin/
 runHaskellDemo: .jvm-bridge
 	mkdir -p bin
 	make bin/HaskellDemo
-	LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/usr/lib/:$(JAVA_HOME)/jre/lib/i386/:$(JAVA_HOME)/jre/lib/i386/client bin/HaskellDemo
+	bin/HaskellDemo
 
 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
+	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
+	cd bin; $(ghc) -c Class_$*.hs $(link)
 
-bin/JVM_%.o: bin/Class_%.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
+	cd bin; $(ghc) -c JVM_$*.hs $(link)
 
 edu_berkeley_sbp_misc_HaskellHelper_list = "edu.berkeley.sbp.misc.HaskellHelper\njava.lang.String\nedu.berkeley.sbp.Tree\njava.lang.Object"
 
-bin/HaskellDemo: src/HaskellDemo.hs \
-		bin/Class_java_lang_Object.o \
-		bin/Class_java_lang_String.o \
-		bin/Class_edu_berkeley_sbp_Tree.o \
-		bin/JVM_edu_berkeley_sbp_misc_HaskellHelper.o
-	cd bin; $(ghc) -c ../src/HaskellDemo.hs -o HaskellDemo.o
-	cd bin; for A in *.hs; do $(ghc) -c $$A; done
-	cd bin; $(ghc) -o HaskellDemo *.o
+bin/HaskellDemo: src/SBP.hs \
+                 src/HaskellDemo.hs \
+	 	 bin/Class_java_lang_Object.o \
+		 bin/Class_java_lang_String.o \
+		 bin/Class_edu_berkeley_sbp_Tree.o \
+		 bin/JVM_edu_berkeley_sbp_misc_HaskellHelper.o
+	cd bin; $(ghc) -c ../src/SBP.hs $(link) -o SBP.o
+	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