switch to using patched ISE in /scratch/megacz/xilinx

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index aa5881a..aa7638a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
        javac -classpath lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
        cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
        for A in `find ships -name \*.ship`;\
-         do java -cp build/class edu.berkeley.fleet.Main expand $$A;\
+         do java -cp fleet.jar:build/class edu.berkeley.fleet.Main expand $$A;\
          done
        javac -classpath lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
        echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
@@ -35,15 +35,18 @@ host = intel2950-5.eecs.berkeley.edu
 # 128Gb ram, 2x4-core.  small-config:1189s  large-config:3065s
 #host = amdr905-1.eecs.berkeley.edu
 
-remote_ise = /tools/xilinx/10.1/ISE
-remote_edk = /tools/xilinx/10.1/EDK
+#remote_ise = /tools/xilinx/10.1/ISE
+#remote_edk = /tools/xilinx/10.1/EDK
 
 #remote_ise = /tools/xilinx/ISE9.1i_lin
 #remote_edk = /tools/xilinx/EDK9.1i
 
-#remote_dir = /scratch/megacz/fleet/
 #remote_dir = /vol/hitz/home/megacz/fleet/
-remote_dir = /tmp/megacz/fleet/
+#remote_dir = /tmp/megacz/fleet/
+
+remote_dir = /scratch/megacz/fleet/
+remote_ise = /scratch/megacz/xilinx/10.1/ISE
+remote_edk = /scratch/megacz/xilinx/10.1/EDK
 
 #host = mm2.millennium.berkeley.edu
 #remote_ise = /scratch/megacz/xilinx/ise/
@@ -93,6 +96,7 @@ build/fpga/main.bit: $(java_files) $(ship_files)
        for A in `find ships -name \*.ship`;\
          do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
          done
+       ssh ${host} 'mkdir -p ${remote_dir}'
        rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
        time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_ise} remote_ise=${remote_ise} remote_edk=${remote_edk}'
        scp ${host}:${remote_dir}/build/fpga/main.bit build/fpga/