rename fleeterpreter.jar->fleet.jar, win32 fix

diff --git a/Makefile b/Makefile
index 9efd349..b60c53f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,13 @@
 ## Fleeterpreter ##############################################################################
 
 interpreter_class = edu.berkeley.fleet.interpreter.Main
-cp                = lib/edu.berkeley.sbp.jar:fleeterpreter.jar
+cp                = -cp lib/edu.berkeley.sbp.jar -cp fleet.jar
 java              = java -Xmx500m
 
-run: fleeterpreter.jar
-       $(java) -cp $(cp) $(interpreter_class)
+run: fleet.jar
+       $(java) $(cp) $(interpreter_class)
 
-fleeterpreter.jar: $(shell find src -name \*.java) src/edu/berkeley/fleet/assembler/fleet.g
+fleet.jar: $(shell find src -name \*.java) src/edu/berkeley/fleet/assembler/fleet.g
        mkdir -p bin/edu/berkeley/fleet/assembler/
        cp src/edu/berkeley/fleet/assembler/fleet.g bin/edu/berkeley/fleet/assembler/
        javac -cp lib/edu.berkeley.sbp.jar -d bin $(shell find src -name \*.java)
@@ -42,14 +42,14 @@ remote_run += echo running;
 remote_run +=  ./a.out /dev/selectmap1 fleet.bin
 
 runfpga: build/main.bit
-       $(java) -cp $(cp) $(interpreter_class) --dump-code < contrib/demo.fleet
+       $(java) $(cp) $(interpreter_class) --dump-code < contrib/demo.fleet
        mv fleet.bin build
        rsync -zare ssh --progress --verbose build/fleet.bin build/main.bit src/edu/berkeley/fleet/slipway/test.c root@bee441.cs.berkeley.edu:
        ssh root@bee441.cs.berkeley.edu '$(remote_run)'
 
-build/main.bit: fleeterpreter.jar contrib/demo.ships $(shell find src -name \*.v)
+build/main.bit: fleet.jar contrib/demo.ships $(shell find src -name \*.v)
        mkdir -p build
-       $(java) -cp $(cp) $(interpreter_class) --dump-fabric < contrib/demo.ships | tee build/fabric.v
+       $(java) $(cp) $(interpreter_class) --dump-fabric < contrib/demo.ships | tee build/fabric.v
        rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
        ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_xilinx}'
        scp ${host}:${remote_dir}/build/main.bit build/
@@ -92,7 +92,7 @@ javadoc:
 ## Misc ####################################################################################
 
 clean:
-       rm -rf bin fleeterpreter.jar
+       rm -rf bin fleet.jar
        @mv build/fabric.balsa .
        rm -rf build/*
        @mv fabric.balsa build