update Makefile

diff --git a/Makefile b/Makefile
index 0c3dad9..84d76fa 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,9 @@ else
 ps=:
 endif
 
-fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src/edu/berkeley/fleet/assembler/fleet.g
+java_files = $(shell find src -name \*.java)
+ship_files = $(shell find ships -name \*.ship)
+fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
        mkdir -p build/class/edu/berkeley/fleet/assembler/
        cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
        javac -classpath lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
@@ -27,18 +29,10 @@ fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src
 
 ## Fpga ####################################################################################
 
-#host = sting.eecs.berkeley.edu
-#remote_xilinx = /opt/ISE81/
-#remote_dir = fleet/
-
-host = intel2950-4.eecs.berkeley.edu
+host = intel2950-3.eecs.berkeley.edu
 remote_xilinx = /scratch/megacz/xilinx/
 remote_dir = /scratch/megacz/fleet/
 
-#host = cs61c-tb@ilinux1.eecs.berkeley.edu
-#remote_xilinx = /usr/local/xilinx/xilinx.ise.9.1-1607-8571-0259-2277
-#remote_dir = /home/tmp/cs61c-tb/fleet
-
 #host = mm2.millennium.berkeley.edu
 #remote_xilinx = /scratch/megacz/xilinx/
 #remote_dir = /scratch/megacz/fleet/
@@ -49,44 +43,20 @@ xilinx += XILINX=$(XILINX)
 xilinx += PATH=$$PATH:$(XILINX)/bin/lin
 xilinx += $(XILINX)/bin/lin/
 
-device = xc4vfx60-ff1152
-
-remote_run =  skill a.out;
-remote_run += user_unprogram 1;
-remote_run += user_program 1 main.bit;
-remote_run += echo compiling;
-remote_run += gcc test.c;
-remote_run += echo running;
-remote_run +=  ./a.out /dev/selectmap1 fleet.bin
-
-verilog_files  = $(shell find src -name \*.v)
-verilog_files += $(shell find src -name \*.inc)
-
-runfpga: fleet.jar
-       $(java) -jar fleet.jar target=fpga run
+device = xc4vfx60-11ff1152
 
 upload: fleet.jar build/fpga/main.bit
        mkdir -p build
        rsync -are ssh --progress --verbose ./ root@goliath:fleet/
 
-uploadtest:
-       make upload
-       $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests ships/*.ship
-testmegacz:
-       $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests ships/*.ship
-
-build/fpga/fabric.v: $(verilog_files) src/edu/berkeley/fleet/fpga/Fpga.java
+build/fpga/main.bit: $(java_files) $(ship_files)
        make fleet.jar
        mkdir -p build/fpga
-       $(java) $(cp) edu.berkeley.fleet.fpga.Fpga > build/fpga/fabric.v
-
-build/fpga/main.bit: build/fpga/fabric.v $(verilog_files) src/edu/berkeley/fleet/fpga/Fpga.java src/edu/berkeley/fleet/fpga/Generator.java
-       make fleet.jar
+       $(java) $(cp) edu.berkeley.fleet.fpga.Fpga build/fpga/
        cp src/edu/berkeley/fleet/fpga/* build/fpga
        for A in `find ships -name \*.ship`;\
          do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
          done
-       $(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/
        rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
        time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_xilinx}'
        scp ${host}:${remote_dir}/build/fpga/main.bit build/fpga/
@@ -107,11 +77,8 @@ synth:
 
 
 
-test:     fleet.jar; $(java) -jar fleet.jar             test tests ships/*.ship
-testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test tests ships/*.ship
-
-generate: fleet.jar
-       $(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/
+test:     fleet.jar; $(java) -jar fleet.jar             test ships/*.ship tests
+testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests
 
 ## Manual ####################################################################################
 
@@ -140,22 +107,19 @@ toolmanual: fleet.jar $(svgs:%.svg=%.pdf)
 ## API docs ####################################################################################
 
 javadoc:
-       mkdir -p doc/api
        javadoc \
-               -classpath lib/edu.berkeley.sbp.jar \
                -linksource \
-               -windowtitle "Fleet API" \
+               -windowtitle "FleetCode API Documentation" \
                -sourcepath src \
-               -header "<b>Fleet</b><br>API" \
+               -header "<b>FleetCode API Documentation</b><br>" \
                -public \
                -notree \
-               -noindex \
                -nonavbar \
-               -stylesheetfile doc/javadoc.css \
                -noqualifier all \
-               -d doc/api \
-               edu.berkeley.fleet.api \
-               edu.berkeley.fleet.assembler
+               -stylesheetfile doc/javadoc.css \
+               -d /afs/research.cs.berkeley.edu/class/fleet/website/code/javadoc/ \
+               edu.berkeley.fleet.api
+       open http://fleet.cs.berkeley.edu/code/javadoc/
 
 ## Misc ####################################################################################