Makefile adjustments

diff --git a/Makefile b/Makefile
index e5b1a9e..66c3a26 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -270,6 +270,9 @@ dist: fleet.jar
        cd .build; for A in ../fleet.jar ../lib/*.jar; do jar xvf $$A; done
        cd .build; jar cvf /afs/research.cs.berkeley.edu/class/fleet/website/code/snapshots/fleet-`date +%Y.%m.%d`.jar .
        rm -rf .build
+       echo
+       echo http://fleet.cs.berkeley.edu/code/snapshots/fleet-`date +%Y.%m.%d`.jar 
+       echo
 
 # you'll probably want to change this line
 ghc  = /usr/local/brian/ghc/compiler/ghc-inplace
@@ -300,18 +303,28 @@ lib/suncvs.jar: fleet.jar suncvs/marina suncvs/test
        cd suncvs/build; jar cvf ../../lib/suncvs.jar .
        cd suncvs/test; jar uvf ../../lib/suncvs.jar .
 
+#sun_server = frehley
+sun_server = simmons
+
 runtest: fleet.jar
        rm lib/suncvs.jar; make lib/suncvs.jar
        rm -f suncvs/marina/testSims/isolatedInDock.spi.run
-       ssh simmons 'skill nanosim'
-       rsync -are ssh --delete --progress --verbose ./ simmons:~/fleet/
-       ssh simmons 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cp -r /import/async/cad/2008/marina/rkao/marina/testSims/* ~/fleet/suncvs/marina/testSims/; cp -r /import/async/cad/2008/marina/rkao/marina/testCode/*.xml ~/fleet/suncvs/marina/testCode/; cd ~/fleet/suncvs/marina/testSims; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp $$HOME/fleet/fleet.jar:$$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3004'
+       ssh ${sun_server} 'skill nanosim'
+       rsync -are ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
+       ssh ${sun_server} 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; ln -s ../testCode/marina.xml ../testCode/marina.spi ../testCode/cfg .; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java  -cp $$HOME/fleet/fleet.jar:$$HOME/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest -testNum 3018'
+
+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/marinaL.jelib
 
 suncvs/test:
        mkdir -p suncvs
-       cd suncvs; cvs -d simmons:/import/async/cad/cvs co test
+       cd suncvs; cvs -d ${sun_server}:/import/async/cad/cvs co test
 
 suncvs/marina:
        mkdir -p suncvs
-       cd suncvs; cvs -d simmons:/import/async/cad/cvs co marina
+       cd suncvs; cvs -d ${sun_server}:/import/async/cad/cvs co marina
+
 
+syncspi:
+       rsync -are ssh --progress --verbose frehley:fleet/suncvs/marina/testSims/marina.spi.out ~/marina.spi.out