X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=d40b0c0942aba9ff20782eb1ce97b0bee7ea7e3b;hb=f810e5b65dd37e0f35457a4250587d43cd6572d8;hp=9966c34a4afd0a478abcef9001c573977aa240b6;hpb=0c91eca8f33ec53c701be60ba6d11461153466a8;p=wix.git

diff --git a/Makefile b/Makefile
index 9966c34..d40b0c0 100644
--- a/Makefile
+++ b/Makefile
@@ -11,43 +11,30 @@ ghc    += -fglasgow-exts -cpp -hidir $(pwd)/build/hi -i$(pwd)/build/hi -odir $(p
 ghclibs = $(ghcroot)/rts/HSrts.jar:$(ghcroot)/libraries/base/HSbase.jar:$(ghcroot)/libraries/stm/HSstm.jar
 
 java =  java -Xmx800m
-java += $(profile) -cp $(ghclibs):$(sbp)/edu.berkeley.sbp.jar:build/class
+java += $(profile) -cp src:$(ghclibs):$(sbp)/edu.berkeley.sbp.jar:build/class
 
-$(sbp):
-	darcs get --repo-name=$@ http://research.cs.berkeley.edu/project/sbp/edu.berkeley.sbp 
-
-$(sbp)/edu.berkeley.sbp.jar: $(sbp)
-	cd $(sbp); make edu.berkeley.sbp.jar
-
-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
+	aklog research.cs.berkeley.edu
+	$(wix) ~/wix/src/ ~/wix/dest/
 docs:
-	$(java) HaskellHelper xt2/docs/ ~/docs/
+	$(wix) xt2/docs/ ~/docs/
+
+$(sbp):
+	darcs get --partial --repo-name=$@ http://research.cs.berkeley.edu/project/sbp/edu.berkeley.sbp 
 
-debug: build/class/Main.class build/class/Tib.class
-	$(java) -Dsbp.verbose=true HaskellHelper xt html
+$(sbp)/edu.berkeley.sbp.jar: $(sbp)
+	cd $(sbp); make edu.berkeley.sbp.jar
 
 wix.jar: build/class/Main.class build/class/Tib.class $(sbp)/edu.berkeley.sbp.jar
 	rm -rf tmp
 	mkdir tmp
-	cd build/class; for A in $(lambdavm_jars) ../../$(sbp)/edu.berkeley.sbp.jar; \
+	cd build/class; for A in $(lambdavm_jars) $(sbp)/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) $(sbp)/edu.berkeley.sbp.jar
@@ -55,7 +42,7 @@ build/class/Tib.class: $(shell find src -name \*.java) $(sbp)/edu.berkeley.sbp.j
 
 build/class/Main.class: $(shell find src -name \*.lhs) $(sbp)/edu.berkeley.sbp.jar
 	mkdir -p build/class/Text/PrettyPrint
-	mkdir -p build/class/Edu/Berkeley/SBP/Haskell/
+	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
@@ -66,4 +53,6 @@ build/class/Main.class: $(shell find src -name \*.lhs) $(sbp)/edu.berkeley.sbp.j
 	cd src; $(ghc) -c -java Wix.lhs
 	cd src; $(ghc) -c -java Main.lhs
 
+echojava:; echo $(java)
+
 clean:; rm -rf build
\ No newline at end of file