X-Git-Url: http://git.megacz.com/?p=wix.git;a=blobdiff_plain;f=Makefile;h=cbf8c619de23fc3a221eb844df6d1d5fb7026adc;hp=7b7e98fc2a6687877337ff823464a03c06b8178e;hb=78e11871be7fa7677a0e3822b6e08b3beca1c4b7;hpb=bed61afd3cf648b5cccc121c88af033c108f0106

diff --git a/Makefile b/Makefile
index 7b7e98f..cbf8c61 100644
--- a/Makefile
+++ b/Makefile
@@ -11,20 +11,26 @@ ghc     = $(ghcroot)/compiler/ghc-inplace -fallow-undecidable-instances -fallow-
 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 src:$(ghclibs):$(sbp)/edu.berkeley.sbp.jar:build/class
+jvmargs = -Xmx800m -XX:ThreadStackSize=160000
+
+java =  java $(jvmargs) $(profile) -cp src:$(ghclibs):$(sbp)/edu.berkeley.sbp.jar:build/class
+
+scala = JAVA_OPTS="$(jvmargs)" scala
 
 wix   = $(java) HaskellHelper
+args  = 
 
-install: build/class/Main.class build/class/Tib.class
-	aklog hcoop.net || true
+install: wix.jar
 	aklog research.cs.berkeley.edu || true
-	$(wix) ~/wix/src/ ~/wix/dest/
+	$(scala) -cp wix.jar:lib/edu.berkeley.sbp.jar Main $(args) ~/docs/wix/src/ ~/docs/wix/dest/
+# --delete disabled until I can keep it from clobbering GArrow.v
 	rsync -arL --rsync-path=/usr/sww/bin/rsync \
-		--progress --verbose --delete \
-		/Users/megacz/wix/dest/cs.berkeley.edu/ \
+		--progress --verbose \
+		~/docs/wix/dest/cs.berkeley.edu/ \
 		login.eecs.berkeley.edu:public_html/
 
+force:; make install args='-f'
+
 docs:
 	$(wix) xt2/docs/ ~/docs/
 
@@ -34,19 +40,19 @@ $(sbp):
 $(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; \
-	  do jar xvf $$A; done
-	echo 'Main-Class: HaskellHelper' > build/manifest
-	cp src/*.g build/class/
-	cd build/class; jar cvmf ../manifest ../../wix.jar .
+wix.jar: $(shell find src -name \*.java -or -name \*.scala)
+	rm -rf build
+	mkdir build
+	javac -cp lib/edu.berkeley.sbp.jar -d build `find src -name \*.java`
+	scalac -deprecation -cp lib/edu.berkeley.sbp.jar -sourcepath src -d build `find src -name \*.scala`
+	echo 'Main-Class: Main' > build/manifest
+	cp src/*.g build/
+	cd build; jar cvmf manifest ../wix.jar .
 
-build/class/Tib.class: $(shell find src -name \*.java) $(sbp)/edu.berkeley.sbp.jar
-	javac -d build/class -cp $(sbp)/edu.berkeley.sbp.jar $(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) $(sbp)/edu.berkeley.sbp.jar
+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