X-Git-Url: http://git.megacz.com/?p=wix.git;a=blobdiff_plain;f=Makefile;h=523c05bbb2178fe5463e40d57e88db04b2186af9;hp=007ac4b0f86b40c1b23cde23201cdcd099d5f421;hb=37d6f30e568ed38c76164bd11b09a35e32886f8f;hpb=3c96b1336f651fa3689e975f4793b55c43591d21

diff --git a/Makefile b/Makefile
index 007ac4b..523c05b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,56 +1,64 @@
+sbp     = $(shell pwd)/sbp/
+
+lambdavm_jars  = $(ghcroot)/rts/HSrts.jar
+lambdavm_jars += $(ghcroot)/libraries/base/HSbase.jar
+lambdavm_jars += $(ghcroot)/libraries/stm/HSstm.jar
+
 ghcroot = /usr/local/brian/ghc
 pwd     = $(shell pwd)
-ghc     = $(ghcroot)/compiler/ghc-inplace -fallow-undecidable-instances -fallow-overlapping-instances
+ghc     = $(ghcroot)/compiler/ghc-inplace -fallow-undecidable-instances -fallow-overlapping-instances -java
+#ghc     = ghc -fallow-undecidable-instances -fallow-overlapping-instances -package javavm
 ghc    += -fglasgow-exts -cpp -hidir $(pwd)/build/hi -i$(pwd)/build/hi -odir $(pwd)/build/class/ 
 ghclibs = $(ghcroot)/rts/HSrts.jar:$(ghcroot)/libraries/base/HSbase.jar:$(ghcroot)/libraries/stm/HSstm.jar
 
 java =  java -Xmx800m
-java += $(profile) -cp $(ghclibs):lib/edu.berkeley.sbp.jar:build/class
+java += $(profile) -cp src:$(ghclibs):$(sbp)/edu.berkeley.sbp.jar:build/class
 
-run: build/class/Main.class build/class/Tib.class
-	$(java) HaskellHelper xt html
+wix   = $(java) HaskellHelper
 
 install: build/class/Main.class build/class/Tib.class
-	$(java) HaskellHelper xt/ ~/www/
-
-install2: build/class/Main.class build/class/Tib.class
-#	$(java) HaskellHelper xt/slipway/ ~/www/slipway/
-#	$(java) HaskellHelper xt/research/ ~/www/research/
-#	$(java) HaskellHelper xt/research.cs.berkeley.edu/ ~/www/research.cs.berkeley.edu/
-#	$(java) HaskellHelper xt/random/ ~/www/random/
-#	$(java) HaskellHelper xt/otherpeople/ ~/www/otherpeople/
-#	$(java) HaskellHelper xt/sbp ~/www/sbp
-	$(java) HaskellHelper xt/software/wix ~/www/software/wix
-#	$(java) HaskellHelper xt/thoughts ~/www/thoughts
-#	$(java) HaskellHelper xt2 ~/
+	aklog hcoop.net || true
+	aklog research.cs.berkeley.edu || true
+	$(wix) ~/wix/src/ ~/wix/dest/
+	rsync -arL --rsync-path=/usr/sww/bin/rsync \
+		--progress --verbose --delete \
+		/Users/megacz/wix/dest/cs.berkeley.edu/ \
+		login.eecs.berkeley.edu:public_html/
 
 docs:
-	$(java) HaskellHelper xt2/docs/ ~/docs/
+	$(wix) xt2/docs/ ~/docs/
 
-debug: build/class/Main.class build/class/Tib.class
-	$(java) -Dsbp.verbose=true HaskellHelper xt html
+$(sbp):
+	darcs get --partial --repo-name=$@ http://research.cs.berkeley.edu/project/sbp/edu.berkeley.sbp 
 
-wix.jar: build/class/Main.class build/class/Tib.class
+$(sbp)/edu.berkeley.sbp.jar: $(sbp)
+	cd $(sbp); make edu.berkeley.sbp.jar
+
+wix.jar: build/class/Main.class build/class/Tib.class lib/edu.berkeley.sbp.jar
 	rm -rf tmp
 	mkdir tmp
-	cd build/class; for A in $(ghcroot)/rts/HSrts.jar $(ghcroot)/libraries/base/HSbase.jar $(ghcroot)/libraries/stm/HSstm.jar ../../lib/edu.berkeley.sbp.jar; \
+	cd build/class; for A in $(lambdavm_jars) lib/edu.berkeley.sbp.jar; \
 	  do jar xvf $$A; done
 	echo 'Main-Class: HaskellHelper' > build/manifest
+	cp src/*.g build/class/
 	cd build/class; jar cvmf ../manifest ../../wix.jar .
 
-build/class/Tib.class: $(shell find src -name \*.java)
+build/class/Tib.class: $(shell find src -name \*.java) lib/edu.berkeley.sbp.jar
 	javac -d build/class -cp lib/edu.berkeley.sbp.jar $(shell find src -name \*.java)
 
-build/class/Main.class: $(shell find src -name \*.lhs)
+build/class/Main.class: $(shell find src -name \*.lhs) lib/edu.berkeley.sbp.jar
 	mkdir -p build/class/Text/PrettyPrint
+	mkdir -p build/class/edu/berkeley/sbp/haskell/
 	mkdir -p build/hi
-	cd src; $(ghc) -c -java Util.lhs
-	cd src; $(ghc) -c -java Text/PrettyPrint/Leijen.hs
-	cd src; $(ghc) -c -java SBP.lhs
-	cd src; $(ghc) -c -java FromTree.lhs
-	cd src; $(ghc) -c -java Doc.lhs
-	cd src; $(ghc) -c -java Html.lhs
-	cd src; $(ghc) -c -java Wix.lhs
-	cd src; $(ghc) -c -java Main.lhs
+	cd src; $(ghc) -c Util.lhs
+	cd src; $(ghc) -c Text/PrettyPrint/Leijen.hs
+	cd src; $(ghc) -c $(sbp)/src/edu/berkeley/sbp/haskell/SBP.lhs
+	cd src; $(ghc) -c FromTree.lhs
+	cd src; $(ghc) -c Doc.lhs
+	cd src; $(ghc) -c Html.lhs
+	cd src; $(ghc) -c Wix.lhs
+	cd src; $(ghc) -c Main.lhs
+
+echojava:; echo $(java)
 
 clean:; rm -rf build
\ No newline at end of file