ML509: use urjtag's fjmem block as the debug controller (JtagConnectedFpga).

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 6307b0e..3f393ba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,11 +67,15 @@ endif
 
 java_files = $(shell find src -name \*.java)
 ship_files = $(shell find ships -name \*.ship)
-fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
+upstream/sbp/edu.berkeley.sbp.jar:
+       git submodule init
+       git submodule update
+       cd upstream/sbp; make edu.berkeley.sbp.jar
+fleet.jar: upstream/sbp/edu.berkeley.sbp.jar $(java_files) $(ship_files) 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 -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
-       cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
+       javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:upstream/sbp/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+       cd build/class/; jar xf ../../upstream/sbp/edu.berkeley.sbp.jar
        cd build/class/; jar xf ../../lib/ibex.jar
        for A in `find ships -name \*.ship`;\
          do java \
@@ -80,7 +84,7 @@ fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
                 edu.berkeley.fleet.Main \
                 expand $$A;\
          done
-       javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+       javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}upstream/sbp/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
        echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
        jar cmf build/class/manifest $@ ships -C build/class .
 
@@ -130,7 +134,6 @@ upload: fleet.jar build/${impl}/main.bit
        chmod +x misc/program.sh
 ifneq ($(impl),bee2)
        ${rsync} ./ root@${runhost}:fleet/
-       ssh -t root@${runhost} 'cd fleet; jtag < misc/jtag-commands'
 endif
 
 build/${impl}/main.bit: $(java_files) $(ship_files)
@@ -308,7 +311,7 @@ ifneq ($(impl),bee2)
 endif
 
 runserver: fleet.jar
-       $(java) -Djava.library.path=lib -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
+       $(java) -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
 
 test:     fleet.jar
        $(java) -jar fleet.jar             test ships/*.ship tests