rework Makefile

diff --git a/Makefile b/Makefile
index fccc947..8cca58c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -286,7 +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
+       rm -f marina/testCode/marina.xml marina/testCode/marina.v marina/testCode/marina.schematic-parasitics.spi
 
 ## Dist ####################################################################################
 
@@ -312,7 +312,6 @@ dist: fleet.jar
        darcs dist -d fleet
        mv fleet.tar.gz /afs/research.cs.berkeley.edu/class/fleet/website/code/snapshots/fleet-`date +%Y.%m.%d`.tgz
        mkdir -p .build
-       rm -f lib/suncvs.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
@@ -339,74 +338,53 @@ f0: fleet.jar
 
 ## Targets below are for integration with Sun-Proprietary Marina Test Chip ##############################
 
-cleansuncvs:
-       rm -rf lib/suncvs.jar suncvs
+electric_jar = ~/proj/electric/srcj/electric.jar
+electric = java -Xss2m -XX:MaxPermSize=128m -Xmx2000m -jar ${electric_jar}
+electric_headless = java -Xmx1500m -jar -Djava.awt.headless=true ${electric_jar} -batch
+all_electric_files = $(shell find marina/electric/ -name \*.jelib -or -path \*.delib\*)
+modname = fakeMarinaPadframe
 
-lib/suncvs.jar: fleet.jar suncvs/marina suncvs/test
-       rm -rf suncvs/test/manuals
-       mkdir -p suncvs/build
-       for A in api marina two util; do rsync -a src/edu/berkeley/fleet/$$A/ suncvs/marina/testCode/edu/berkeley/fleet/$$A/; done
-       cd suncvs; javac -cp test/javamake.jar:test/jcommon.jar:test/jfreechart.jar -d build `find . -name \*.java`
-       cd suncvs/build; jar cvf ../../lib/suncvs.jar .
-       cd suncvs/test; jar uvf ../../lib/suncvs.jar .
+sun_server = simmons-tunnel
 
 #sun_server = frehley  # electric team uses frehley
 #sun_server = simmons
-sun_server = simmons-tunnel
 #sun_server = criss    # criss is used for nohupped nanosim
 #sun_server = stanley  # stanley is used for nohupped hsim
 
-runtest: fleet.jar suncvs/marina/testCode/marina.xml suncvs/marina/testCode/marina.v suncvs/marina/testCode/marina.schematic-parasitics.spi
-       rm lib/suncvs.jar; make lib/suncvs.jar
-       cp lib/suncvs.jar suncvs/marina/testCode/MarinaTest.jar
-#      ssh ${sun_server} 'skill nanosim; skill verilog; skill verilog.exe; skill java'
-#      ssh ${sun_server} find fleet/ -name .nfs\* -exec mv {} ~/tmp/ \\\;
+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'
 
-testlocal:
-       cd suncvs/marina/testCode; \
+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/suncvs.jar \
+         -cp `pwd`/../../../lib/com.sun.async.test.jar \
+         -cp `pwd`/../../../fleet.jar \
          com.sun.vlsi.chips.marina.test.MarinaTest \
          -hsim \
          -testNum 3040
 
-electric_jar = ~/proj/electric/srcj/electric.jar
-electric = java -Xss2m -XX:MaxPermSize=128m -Xmx2000m -jar ${electric_jar}
-electric_headless = java -Xmx1500m -jar -Djava.awt.headless=true ${electric_jar} -batch
-all_electric_files = $(shell find suncvs/marina/electric/ -name \*.jelib -or -path \*.delib\*)
-
-suncvs/marina/testCode/marina.xml \
-suncvs/marina/testCode/marina.v \
-suncvs/marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
+marina/testCode/marina.xml \
+marina/testCode/marina.v \
+marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
        @echo
        @echo == Rebuilding Netlists and XML ===========================================================
-       rm -f suncvs/marina/testCode/marina.v
-       rm -f suncvs/marina/testCode/marina.schematic-parasitics.spi
-       rm -f suncvs/marina/testCode/marina.xml
-       cd suncvs/marina/testCode; \
+       rm -f marina/testCode/marina.v
+       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
 
 electric:
-       ${electric} suncvs/marina/electric/aMarinaM.delib
+       ${electric} marina/electric/aMarinaM.delib
 
-suncvs/test:
-       mkdir -p suncvs
-       cd suncvs; cvs -d ${sun_server}:/import/async/cad/cvs co test
+chaing:
+       java -cp lib/com.sun.async.test.jar com.sun.async.test.ChainG marina/testCode/marina.xml
 
-suncvs/marina:
-       mkdir -p suncvs
-       cd suncvs; cvs -d ${sun_server}:/import/async/cad/cvs co marina
-
-chaing: lib/suncvs.jar
-       java -cp lib/suncvs.jar com.sun.async.test.ChainG suncvs/marina/testCode/marina.xml
-
-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
+       rsync -arze ssh --progress --verbose ${sun_server}:fleet/marina/testCode/marina\*.dump ~/ || true
+       rsync -arze ssh --progress --verbose ${sun_server}:fleet/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
+       cp ~/${modname}.spi marina/testCode/marina.schematic-parasitics.spi || true
+       cp ~/${modname}.v   marina/testCode/marina.v || true