## 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) < contrib/demo.fleet
+run: fleet.jar
+ $(java) $(cp) $(interpreter_class)
-fleeterpreter.jar: $(shell find src -name \*.java) src/edu/berkeley/fleet/parser/fleet.g
- mkdir -p bin/edu/berkeley/fleet/parser/
- cp src/edu/berkeley/fleet/parser/fleet.g bin/edu/berkeley/fleet/parser/
+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)
cd bin; jar xvf ../lib/edu.berkeley.sbp.jar
echo 'Main-Class: $(interpreter_class)' > bin/manifest
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/
-noqualifier all \
-d doc/api \
edu.berkeley.fleet.api \
- edu.berkeley.fleet.parser
+ edu.berkeley.fleet.assembler
## Misc ####################################################################################
clean:
- rm -rf bin fleeterpreter.jar
- @mv build/fabric.balsa .
- rm -rf build/*
- @mv fabric.balsa build
+ rm -rf bin fleet.jar build
+
+## Dist ####################################################################################
+
+dist:
+ darcs record
+ 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`/bin
+ rm -rf fleet-`date +%d.%h.%y`/build
+ 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/
+ @echo
+ @echo
+ @echo http://research.cs.berkeley.edu/class/fleet/files/fleet-`date +%d.%h.%y`.tgz
+ @echo
+ @echo
+
+