more fixes to bring things up to date with the new test/doc apis

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 6a37da3..76cb533 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,19 @@ interpreter_class = edu.berkeley.fleet.interpreter.Main
 cp                = -cp fleet.jar
 java              = java -Xmx500m
 
-run: fleet.jar
-       $(java) $(cp) $(interpreter_class)
+run: fleet.jar; $(java) $(cp) $(interpreter_class)
 
-fleet.jar: $(shell find src -name \*.java) src/edu/berkeley/fleet/assembler/fleet.g
+fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) 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 -cp lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
-       cd build/class/; jar xvf ../../lib/edu.berkeley.sbp.jar
+       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;\
+         done
+       javac -cp build/class:lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
        echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
-       cd build/class/; jar cvmf manifest ../../$@ .
+       cd build/class/; jar cmf manifest ../../$@ .
 
 
 ## Slipway ####################################################################################
@@ -44,16 +47,14 @@ 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
-       mkdir -p build
-       $(java) $(cp) $(interpreter_class) --dump-code
-       $(java) $(cp) edu.berkeley.fleet.slipway.Client superbowl.bit < build/fleet.bin
+runfpga: fleet.jar; $(java) -jar fleet.jar target=fpga run
 
 mrunfpga: fleet.jar build/main.bit
        mkdir -p build
        $(java) $(cp) $(interpreter_class) --dump-code
        rsync -zare ssh --progress --verbose build/main.bit root@bee441.cs.berkeley.edu:/var/slipway/megacz.bit
-       $(java) $(cp) edu.berkeley.fleet.slipway.Client megacz.bit < build/fleet.bin
+       #bitfile option doesn't work
+       #$(java) -jar fleet.jar bitfile=megacz.bit target=fpga run
 
 build/fabric.v: $(verilog_files) src/edu/berkeley/fleet/slipway/Slipway.java
        make fleet.jar
@@ -81,6 +82,11 @@ synth:
 #      $(xilinx)trce -intstyle ise -e 3 -l 3 -s 6 -xml main main.ncd -o main.twr main.pcf
 
 
+doc: fleet.jar
+       $(java) $(cp) edu.berkeley.fleet.doc.Doc < ships/Alu2.ship
+
+test: fleet.jar; $(java) -jar fleet.jar test tests/
+
 ## API docs ####################################################################################
 
 javadoc: