API: inert changes (cleanup, visibility, toString())

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 450e739..4b82b46 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,12 +10,12 @@ run: fleet.jar; $(java) $(cp) $(interpreter_class)
 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)
+       javac -classpath 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;\
          done
-       javac -cp build/class:lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+       javac -classpath 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 cmf manifest ../../$@ .
 
@@ -50,12 +50,13 @@ verilog_files += $(shell find src -name \*.inc)
 runfpga: fleet.jar
        $(java) -jar fleet.jar target=fpga run
 
-mrunfpga: fleet.jar build/main.bit
+upload: 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
-       #bitfile option doesn't work
-       #$(java) -jar fleet.jar bitfile=megacz.bit target=fpga run
+
+uploadtest:
+       make upload
+       $(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests
 
 build/fabric.v: $(verilog_files) src/edu/berkeley/fleet/slipway/Slipway.java
        make fleet.jar
@@ -124,7 +125,8 @@ dist:
        darcs get . --repo-name=fleet-`date +%d.%h.%y`
        make -C fleet-`date +%d.%h.%y` fleet.jar
        rm -rf fleet-`date +%d.%h.%y`/build
-       cp _darcs/prefs/defaultrepo fleet-`date +%d.%h.%y`/_darcs/prefs/defaultrepo
+       echo 'http://research.cs.berkeley.edu/class/fleet/repos/fleet/' > \
+         fleet-`date +%d.%h.%y`/_darcs/prefs/defaultrepo
        tar cvzf fleet-`date +%d.%h.%y`.tgz fleet-`date +%d.%h.%y`
        rm -rf fleet-`date +%d.%h.%y`
        mv fleet-`date +%d.%h.%y`.tgz /afs/research.cs.berkeley.edu/class/fleet/website/files/