X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=df5384b3abc16d86776a60b50802905195276ec7;hb=c3b2767ddf20def72ede1745f03e4cb949bb8288;hp=9515eee1a4ea60b12a66e45c0347ebd41e9a9055;hpb=97ba866a96493f511c97d069f5caa8479ac5ccdf;p=fleet.git

diff --git a/Makefile b/Makefile
index 9515eee..df5384b 100644
--- a/Makefile
+++ b/Makefile
@@ -31,10 +31,14 @@ fleet.jar: $(shell find src -name \*.java) $(shell find ships -name \*.ship) src
 #remote_xilinx = /opt/ISE81/
 #remote_dir = fleet/
 
-host = intel2950-5.eecs.berkeley.edu
+host = intel2950-4.eecs.berkeley.edu
 remote_xilinx = /scratch/megacz/xilinx/
 remote_dir = /scratch/megacz/fleet/
 
+#host = cs61c-tb@ilinux1.eecs.berkeley.edu
+#remote_xilinx = /usr/local/xilinx/xilinx.ise.9.1-1607-8571-0259-2277
+#remote_dir = /home/tmp/cs61c-tb/fleet
+
 #host = mm2.millennium.berkeley.edu
 #remote_xilinx = /scratch/megacz/xilinx/
 #remote_dir = /scratch/megacz/fleet/
@@ -65,9 +69,9 @@ upload: fleet.jar build/fpga/main.bit
 
 uploadtest:
 	make upload
-	$(java) -jar fleet.jar target=fpga bitfile=megacz.bit test ships/*.ship tests
+	$(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests ships/*.ship
 testmegacz:
-	$(java) -jar fleet.jar target=fpga bitfile=megacz.bit test ships/*.ship tests
+	$(java) -jar fleet.jar target=fpga bitfile=megacz.bit test tests ships/*.ship
 
 build/fpga/fabric.v: $(verilog_files) src/edu/berkeley/fleet/fpga/Fpga.java
 	make fleet.jar
@@ -100,18 +104,37 @@ synth:
 #	$(xilinx)trce -intstyle xflow -e 3 -l 3 -s 6 -xml main main.ncd -o main.twr main.pcf
 
 
-manual: fleet.jar
-	$(java) -jar fleet.jar doc
-	cd .tmp; TEXINPUTS=$$TEXINPUTS:../doc/ pdflatex *.tex
-	open .tmp/*.pdf
-
 
-test:     fleet.jar; $(java) -jar fleet.jar             test ships/*.ship tests
-testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test ships/*.ship tests
+test:     fleet.jar; $(java) -jar fleet.jar             test tests ships/*.ship
+testfpga: fleet.jar; $(java) -jar fleet.jar target=fpga test tests ships/*.ship
 
 generate: fleet.jar
 	$(java) -cp fleet.jar edu.berkeley.fleet.fpga.Generator build/fpga/
 
+## Manual ####################################################################################
+
+svgs    = $(shell find doc -name \*.svg)
+%.eps: %.svg
+	DISPLAY= /Applications/Inkscape.app/Contents//Resources/bin/inkscape  -z --export-area-drawing $^ --export-eps=$@
+
+%.pdf: %.eps
+	epstopdf $^ --outfile=$@
+
+manual: archmanual toolmanual
+
+archmanual: fleet.jar $(svgs:%.svg=%.pdf)
+	$(java) -jar fleet.jar doc
+	cd .tmp; ln -sf ../doc/*.bib .
+	cd .tmp; TEXINPUTS=$$TEXINPUTS:../src/edu/berkeley/fleet/assembler/:../doc/ pdflatex FleetTwo.Manual.tex
+	cd .tmp; for A in *.mp; do mpost --tex=latex $$A; done
+	cd .tmp; TEXINPUTS=$$TEXINPUTS:../src/edu/berkeley/fleet/assembler/:../doc/ pdflatex FleetTwo.Manual.tex
+	open .tmp/FleetTwo.Manual.pdf
+toolmanual: fleet.jar $(svgs:%.svg=%.pdf)
+	$(java) -jar fleet.jar doc
+	cd .tmp; ln -sf ../doc/*.bib .
+	cd .tmp; TEXINPUTS=$$TEXINPUTS:../src/edu/berkeley/fleet/assembler/:../doc/ pdflatex toolchain.tex
+	open .tmp/toolchain.pdf
+
 ## API docs ####################################################################################
 
 javadoc: