X-Git-Url: http://git.megacz.com/?p=wix.git;a=blobdiff_plain;f=Makefile;h=a1373e3008b00acd01d3ca89622db149aad058a4;hp=523c05bbb2178fe5463e40d57e88db04b2186af9;hb=13421e4b1878491e2607ca6d11c3f9b8bcf884b8;hpb=d60804399a886f1dc26f0f22fc066ba0dd49dc16

diff --git a/Makefile b/Makefile
index 523c05b..a1373e3 100644
--- a/Makefile
+++ b/Makefile
@@ -11,18 +11,22 @@ 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
 
-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 ~/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/
 
 docs:
@@ -34,14 +38,14 @@ $(sbp):
 $(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 $(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 .
+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) lib/edu.berkeley.sbp.jar
 	javac -d build/class -cp lib/edu.berkeley.sbp.jar $(shell find src -name \*.java)