fix NPE due to misplaced grammar file

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 71898f1..da98e04 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,115 @@
 
-run: fleeterpreter.jar
-       java -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.FleetParser < test.fleet
+## Fleeterpreter ##############################################################################
 
-applet: fleeterpreter.jar
+interpreter_class = edu.berkeley.fleet.interpreter.Main
+cp                = -cp lib/edu.berkeley.sbp.jar -cp fleet.jar
+java              = java -Xmx500m
 
-java -cp lib/edu.berkeley.sbp.jar:fleeterpreter.jar edu.berkeley.fleet.FleetApplet < test.fleet
+run: fleet.jar
+       $(java) $(cp) $(interpreter_class)
 
-fleeterpreter.jar: $(shell find src -name \*.java) fleet.g
-       mkdir -p bin
-       cp fleet.g bin
-       cp test.fleet bin
+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: edu.berkeley.fleet.FleetApplet' > bin/manifest
+       echo 'Main-Class: $(interpreter_class)' > bin/manifest
        cd bin; jar cvmf manifest ../$@ .
+
+
+## Slipway ####################################################################################
+
+#host = sting.eecs.berkeley.edu
+#remote_xilinx = /opt/ISE81/
+#remote_dir = fleet/
+
+host = mm2.millennium.berkeley.edu
+remote_xilinx = /scratch/megacz/xilinx/
+remote_dir = /scratch/megacz/fleet/
+
+xilinx =  cd build; 
+xilinx += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(XILINX)/bin/lin
+xilinx += XILINX=$(XILINX)
+xilinx += PATH=$$PATH:$(XILINX)/bin/lin
+xilinx += $(XILINX)/bin/lin/
+
+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
+
+runfpga: build/main.bit
+       $(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: fleet.jar contrib/demo.ships $(shell find src -name \*.v)
+       mkdir -p build
+       $(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/
+
+synth:
+       cd build; ln -sf ../src/edu/berkeley/fleet/slipway/* .
+       cd build; echo work > main.lso
+       cd build; for A in *.v; do echo verilog work \""$$A"\"; done > main.prj
+       cd build; mkdir -p tmp
+       cd build; mkdir -p xst
+       rm -rf build/_ngo
+       $(xilinx)xst -intstyle ise -ifn main.xst -ofn main.syr < main.xst
+       $(xilinx)ngdbuild -intstyle ise -dd _ngo -nt timestamp -uc main.ucf -p xc2vp70-ff1704-6 main.ngc main.ngd
+       $(xilinx)map -intstyle ise -p xc2vp70-ff1704-6 -cm area -l -pr b -k 4 -c 100 -tx off -o main_map.ncd main.ngd main.pcf
+       $(xilinx)par -w -intstyle ise -pl std -ol std -t 99 main_map.ncd main.ncd main.pcf
+       $(xilinx)bitgen -intstyle ise -d -f main.ut main.ncd
+#      $(xilinx)trce -intstyle ise -e 3 -l 3 -s 6 -xml main main.ncd -o main.twr main.pcf
+
+
+## API docs ####################################################################################
+
+javadoc:
+       mkdir -p doc/api
+       javadoc \
+               -classpath lib/edu.berkeley.sbp.jar \
+               -linksource \
+               -windowtitle "Fleet API" \
+               -sourcepath src \
+               -header "<b>Fleet</b><br>API" \
+               -public \
+               -notree \
+               -noindex \
+               -nonavbar \
+               -stylesheetfile doc/javadoc.css \
+               -noqualifier all \
+               -d doc/api \
+               edu.berkeley.fleet.api \
+               edu.berkeley.fleet.assembler
+
+## Misc ####################################################################################
+
+clean:
+       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
+
+
+