X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=959a27d6373b629d553d0f4ef87896a741c78886;hb=312b8c5f85d45329cfefcad22c6ac610f52d0abf;hp=8cca58cc60f7e446d8c769caa04ba9552f18bd6e;hpb=2ebcc8c9013fa761b472131407c5b0320eaa8bed;p=fleet.git

diff --git a/Makefile b/Makefile
index 8cca58c..959a27d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,13 +17,13 @@ ship_files = $(shell find ships -name \*.ship)
 fleet.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/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+	javac -classpath lib/com.sun.async.test.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
 	cd build/class/; jar xf ../../lib/ibex.jar
 	for A in `find ships -name \*.ship`;\
 	  do java -cp fleet.jar:build/class edu.berkeley.fleet.Main expand $$A;\
 	  done
-	javac -classpath lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+	javac -classpath lib/com.sun.async.test.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/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 .
 
@@ -351,6 +351,8 @@ sun_server = simmons-tunnel
 #sun_server = criss    # criss is used for nohupped nanosim
 #sun_server = stanley  # stanley is used for nohupped hsim
 
+testnum = 0
+
 runtest: fleet.jar marina/testCode/marina.xml marina/testCode/marina.v marina/testCode/marina.schematic-parasitics.spi
 	rsync -azre ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
 	time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal'
@@ -359,11 +361,10 @@ testlocal: fleet.jar
 	cd marina/testCode; \
 	  export PATH=/proj/async/cad/linux/bin/:$$PATH; \
 	  /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java \
-	  -cp `pwd`/../../../lib/com.sun.async.test.jar \
-	  -cp `pwd`/../../../fleet.jar \
+	  -cp `pwd`/../../lib/com.sun.async.test.jar:`pwd`/../../fleet.jar \
 	  com.sun.vlsi.chips.marina.test.MarinaTest \
 	  -hsim \
-	  -testNum 3040
+	  -testNum ${testnum} || tail -n 20 marina.spi.run
 
 marina/testCode/marina.xml \
 marina/testCode/marina.v \
@@ -374,10 +375,10 @@ marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
 	rm -f marina/testCode/marina.schematic-parasitics.spi
 	rm -f marina/testCode/marina.xml
 	cd marina/testCode; \
-	  nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.delib
+	  nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.jelib
 
 electric:
-	${electric} marina/electric/aMarinaM.delib
+	${electric} marina/electric/aMarinaM.jelib
 
 chaing:
 	java -cp lib/com.sun.async.test.jar com.sun.async.test.ChainG marina/testCode/marina.xml