X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=5637537dd8b8285ee759c2455fabb43ad35481d8;hb=b1638574f882069f08c93445e6d7ce88c44c793b;hp=cbcad7a655d46a12989fb7606d73096a87c9c64f;hpb=fcf6bfe537a716299bb58e6dfb1c20afeb39c6ed;p=fleet.git

diff --git a/Makefile b/Makefile
index cbcad7a..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 lib/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 lib/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 .
 
@@ -464,7 +468,7 @@ testnum = 0
 runtest: fleet.jar chips/marina/testCode/marina.xml chips/marina/testCode/marina.v chips/marina/testCode/marina.schematic-parasitics.spi
 	scp ${sun_fs_server}:${sun_dir}/chips/marina/testCode/out.dat . || true
 	${rsync} --delete ./ ${sun_fs_server}:${sun_dir}/
-	${rsync} --delete -L lib/electric.jar ${sun_fs_server}:/home/am77536/proj/electric/srcj/
+	${rsync} --delete -L ~/proj/electric/srcj/electric.jar ${sun_fs_server}:/home/am77536/proj/electric/srcj/
 	time ssh -t -Y ${sun_fs_server} 'ssh -t ${sun_server_user}@${sun_server} "bash --login -c \"make -C ${sun_dir} testlocal impl=${impl}\""'
 	scp ${sun_fs_server}:${sun_dir}/chips/marina/testCode/out.dat .
 
@@ -484,16 +488,16 @@ 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; \
 	  export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/proj/async/cad/test/; \
 	  java \
-	  -cp ~/proj/electric/srcj/electric.jar:`pwd`/../../../lib/electric.jar:`pwd`/../../../fleet.jar \
+	  -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