X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5637537dd8b8285ee759c2455fabb43ad35481d8;hb=1931d4064f6ae21b86284fea1319112a9d99546a;hp=ce205fb2ebb087bdfd02111d21b405740eef9d35;hpb=9709a3d5502fdb20d31765eb7a6a0c8f40633c41;p=fleet.git

diff --git a/Makefile b/Makefile
index ce205fb..5637537 100644
--- 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 .
 
@@ -484,7 +488,7 @@ endif
 urjtag: fleet.jar chips/marina/testCode/marina.xml
 	${rsync} --delete ./ root@goliath:fleet/
 	${rsync} --delete ~/proj/electric/srcj/electric.jar root@goliath:electric.jar
-	ssh -t root@goliath 'cd fleet/chips/marina/testCode; java -cp ../../../fleet.jar:/root/electric.jar -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina com.sun.vlsi.chips.marina.test.MarinaTest -silicon -testNum 0'
+	ssh -t root@goliath 'cd fleet/chips/marina/testCode; java -cp ../../../fleet.jar:/root/electric.jar -Dfleet.impl=edu.berkeley.fleet.marina.Marina edu.berkeley.fleet.marina.MarinaTest -silicon -testNum 0'
 
 testlocal: fleet.jar
 	cd chips/marina/testCode; \
@@ -492,8 +496,8 @@ testlocal: fleet.jar
 	  java \
 	  -cp ~/proj/electric/srcj/electric.jar:`pwd`/../../../fleet.jar \
 	  -Djava.library.path=/proj/async/cad/test/ \
-	  -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \
-	  com.sun.vlsi.chips.marina.test.MarinaTest \
+	  -Dfleet.impl=edu.berkeley.fleet.marina.Marina \
+	  edu.berkeley.fleet.marina.MarinaTest \
 	  ${testarg} \
 	  -testNum ${testnum} || tail -n 20 marina.spi.run