adjust Makefile to account for marina being a subdirectory of chips

diff --git a/Makefile b/Makefile
index dfd59ad..b2b1bd9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -84,7 +84,7 @@ board = ml505   # ??
 #package = 7ff1704
 
 device = ${part}${package}-${speed_grade}
-rsync = rsync --exclude=marina/images -zare ssh --progress --verbose
+rsync = rsync --exclude=chips/marina/images -zare ssh --progress --verbose
 
 upload: fleet.jar build/fpga/main.bit
        mkdir -p build
@@ -291,7 +291,10 @@ javadoc:
 
 clean:
        rm -rf fleet.jar build
-       rm -f marina/testCode/marina.xml marina/testCode/marina.v marina/testCode/marina.schematic-parasitics.spi
+       rm -f \
+         chips/marina/testCode/marina.xml \
+         chips/marina/testCode/marina.v \
+         chips/marina/testCode/marina.schematic-parasitics.spi
 
 ## Dist ####################################################################################
 
@@ -346,7 +349,7 @@ f0: fleet.jar
 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\*)
+all_electric_files = $(shell find chips/marina/electric/ -name \*.jelib -or -path \*.delib\*)
 modname = fakeMarinaPadframe
 
 sun_server = simmons-tunnel
@@ -358,69 +361,69 @@ sun_server = simmons-tunnel
 
 testnum = 0
 
-runtest: fleet.jar marina/testCode/marina.xml marina/testCode/marina.v marina/testCode/marina.schematic-parasitics.spi
+runtest: fleet.jar chips/marina/testCode/marina.xml chips/marina/testCode/marina.v chips/marina/testCode/marina.schematic-parasitics.spi
        ${rsync} --delete ./ ${sun_server}:~/fleet/
        time ssh -t -Y ${sun_server} 'cd ~/fleet/; make testlocal'
 
-silicon: fleet.jar marina/testCode/marina.xml
+silicon: fleet.jar chips/marina/testCode/marina.xml
        ${rsync} --delete ./ ${sun_server}:~/fleet/
        time ssh -t -Y ${sun_server} 'cd ~/fleet/; make siliconlocal'
 
 spice: fleet.jar
-       cp ~/omegaCounter.spi marina/testCode/omegaCounter.spi
-       cp ~/omegaCounter-extracted.spi marina/testCode/omegaCounter-extracted.spi
+       cp ~/omegaCounter.spi chips/marina/testCode/omegaCounter.spi
+       cp ~/omegaCounter-extracted.spi chips/marina/testCode/omegaCounter-extracted.spi
        rsync -azre ssh --delete --progress --verbose ./ ${sun_server}:~/fleet/
-       ssh -t -Y ${sun_server} 'cd ~/fleet/marina/testCode/; export PATH=/proj/async/cad/linux/bin/:$$PATH; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
+       ssh -t -Y ${sun_server} 'cd ~/fleet/chips/marina/testCode/; export PATH=/proj/async/cad/linux/bin/:$$PATH; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
 
 
 testlocal: fleet.jar
-       cd marina/testCode; \
+       cd chips/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:`pwd`/../../fleet.jar \
+         -cp `pwd`/../../../lib/com.sun.async.test.jar:`pwd`/../../../fleet.jar \
          com.sun.vlsi.chips.marina.test.MarinaTest \
          -hsim \
          -testNum ${testnum} || tail -n 20 marina.spi.run
 
 siliconlocal: fleet.jar
-       cd marina/testCode; \
+       cd chips/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:`pwd`/../../fleet.jar \
+         -cp `pwd`/../../../lib/com.sun.async.test.jar:`pwd`/../../../fleet.jar \
          -Djava.library.path=/proj/async/cad/test/ \
          com.sun.vlsi.chips.marina.test.MarinaTest \
          -silicon \
          -testNum ${testnum}
 
-marina/testCode/marina.xml \
-marina/testCode/marina.v \
-marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
+chips/marina/testCode/marina.xml \
+chips/marina/testCode/marina.v \
+chips/marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
        @echo
        @echo == Rebuilding Netlists and XML ===========================================================
-       rm -f marina/testCode/marina.v
-       rm -f marina/testCode/marina.schematic-parasitics.spi
-       rm -f marina/testCode/marina.xml
-       cd marina/testCode; \
+       rm -f chips/marina/testCode/marina.v
+       rm -f chips/marina/testCode/marina.schematic-parasitics.spi
+       rm -f chips/marina/testCode/marina.xml
+       cd chips/marina/testCode; \
          nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.jelib
 
 electric:
-       ${electric} marina/electric/aMarinaM.jelib
+       ${electric} chips/marina/electric/aMarinaM.jelib
 
 chaing:
-       java -cp lib/com.sun.async.test.jar com.sun.async.test.ChainG marina/testCode/marina.xml
+       java -cp lib/com.sun.async.test.jar com.sun.async.test.ChainG chips/marina/testCode/marina.xml
 
 sync:
-       ${rsync} ${sun_server}:fleet/marina/testCode/marina\*.dump ~/ || true
-       ${rsync} ${sun_server}:fleet/marina/testCode/marina.spi.out ~/${modname}.out || true
+       ${rsync} ${sun_server}:fleet/chips/marina/testCode/marina\*.dump ~/ || true
+       ${rsync} ${sun_server}:fleet/chips/marina/testCode/marina.spi.out ~/${modname}.out || true
 copyin:
-       cp ~/${modname}.spi marina/testCode/marina.schematic-parasitics.spi || true
-       cp ~/${modname}.v   marina/testCode/marina.v || true
+       cp ~/${modname}.spi chips/marina/testCode/marina.schematic-parasitics.spi || true
+       cp ~/${modname}.v   chips/marina/testCode/marina.v || true
 
-marina/testCode/omegaCounter-extracted.spi: ${all_electric_files} marina/testCode/rcx.bsh
+chips/marina/testCode/omegaCounter-extracted.spi: ${all_electric_files} chips/marina/testCode/rcx.bsh
        @echo
        @echo == Extracting Layout ===========================================================
        ssh ${sun_server} 'rm -rf /tmp/am77536; mkdir /tmp/am77536'
-       cd marina/testCode; \
+       cd chips/marina/testCode; \
          nice -n 19 ${electric_headless} -s rcx.bsh ../electric/omegaCounter.jelib
-       mv marina/electric/starrcxt/omegaCounter.sp $@
+       mv chips/marina/electric/starrcxt/omegaCounter.sp $@