update electric target

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index cc8f8d7..8b4610c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,8 +36,8 @@ host = intel2950-5.eecs.berkeley.edu
 # 128Gb ram, 2x4-core.  small-config:1189s  large-config:3065s
 #host = amdr905-1.eecs.berkeley.edu
 
-#remote_ise = /tools/xilinx/10.1/ISE
-#remote_edk = /tools/xilinx/10.1/EDK
+remote_ise = /tools/xilinx/10.1/ISE
+remote_edk = /tools/xilinx/10.1/EDK
 
 #remote_ise = /tools/xilinx/ISE9.1i_lin
 #remote_edk = /tools/xilinx/EDK9.1i
@@ -46,8 +46,8 @@ host = intel2950-5.eecs.berkeley.edu
 #remote_dir = /tmp/megacz/fleet/
 
 remote_dir = /scratch/megacz/fleet/
-remote_ise = /scratch/megacz/xilinx/10.1/ISE
-remote_edk = /scratch/megacz/xilinx/10.1/EDK
+#remote_ise = /scratch/megacz/xilinx/10.1/ISE
+#remote_edk = /scratch/megacz/xilinx/10.1/EDK
 
 #host = mm2.millennium.berkeley.edu
 #remote_ise = /scratch/megacz/xilinx/ise/
@@ -286,6 +286,7 @@ javadoc:
 
 clean:
        rm -rf fleet.jar build
+       rm -f suncvs/marina/testCode/marina.xml suncvs/marina/testCode/marina.v suncvs/marina/testCode/marina.schematic-parasitics.spi
 
 ## Dist ####################################################################################
 
@@ -360,8 +361,7 @@ runtest: fleet.jar
        ssh -Y ${sun_server} 'export PATH=/proj/async/cad/linux/bin/:$$PATH; cd ~/fleet/suncvs/marina/testCode; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp $$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3'
 
 electric:
-       rsync -are ssh --progress --verbose ${sun_server}:fleet/suncvs/marina/testSims/marina.spi.out ~/marina.spi.out
-       java -Xmx900m -jar /Applications/electric.jar suncvs/marina/electric/aMarinaM.jelib
+       ${electric} suncvs/marina/electric/aMarinaM.delib
 
 suncvs/test:
        mkdir -p suncvs
@@ -374,5 +374,10 @@ suncvs/marina:
 chaing: lib/suncvs.jar
        java -cp lib/suncvs.jar com.sun.async.test.ChainG suncvs/marina/testCode/marina.xml
 
-syncspi:
-       rsync -are ssh --progress --verbose frehley:fleet/suncvs/marina/testCode/marina.spi.out ~/marina.spi.out
+modname = fakeMarinaPadframe
+sync:
+       rsync -arze ssh --progress --verbose ${sun_server}:fleet/suncvs/marina/testCode/marina\*.dump ~/ || true
+       rsync -arze ssh --progress --verbose ${sun_server}:fleet/suncvs/marina/testCode/marina.spi.out ~/${modname}.out || true
+copyin:
+       cp ~/${modname}.spi suncvs/marina/testCode/marina.schematic-parasitics.spi || true
+       cp ~/${modname}.v   suncvs/marina/testCode/marina.v || true