X-Git-Url: http://git.megacz.com/?p=wix.git;a=blobdiff_plain;f=Makefile;h=7b7e98fc2a6687877337ff823464a03c06b8178e;hp=d40b0c0942aba9ff20782eb1ce97b0bee7ea7e3b;hb=14761ee6aa4e73c218a6fdea51e783b59af46e29;hpb=08af352b8bd887312ef0a29d1f29d31553fb86e8

diff --git a/Makefile b/Makefile
index d40b0c0..7b7e98f 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ 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
 
@@ -16,9 +17,14 @@ java += $(profile) -cp src:$(ghclibs):$(sbp)/edu.berkeley.sbp.jar:build/class
 wix   = $(java) HaskellHelper
 
 install: build/class/Main.class build/class/Tib.class
-	aklog hcoop.net
-	aklog research.cs.berkeley.edu
+	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:
 	$(wix) xt2/docs/ ~/docs/
 
@@ -44,14 +50,14 @@ build/class/Main.class: $(shell find src -name \*.lhs) $(sbp)/edu.berkeley.sbp.j
 	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)/src/edu/berkeley/sbp/haskell/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)