remove lib/com.sun.async.test.jar

[fleet.git] / Makefile

diff --git a/Makefile b/Makefile
index 45ca649..fb6cc23 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -417,12 +417,18 @@ 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 chips/marina/electric/ -name \*.jelib -or -path \*.delib\*)
+all_electric_files = $(shell find chips/marina/electric -name \*.jelib -or -path \*.delib/\* | grep -v :)
 modname = fakeMarinaPadframe
 
 sun_dir = /home/am77536/fleet
 sun_fs_server = ivans
 sun_server = simmons
+sun_server_user = am77536
+
+#sun_dir = /root/fleet
+#sun_fs_server = vm
+#sun_server = localhost
+#sun_server_user = root
 
 #sun_server = frehley  # electric team uses frehley
 #sun_server = simmons
@@ -431,19 +437,23 @@ sun_server = simmons
 
 #testnum = 3025
 #testnum = 3040
-#testnum = 0
+#testnum = 7777
 #testnum = 999
-testnum = 8888
+#testnum = 0
+testnum = 8887
+#testnum = 8889
+#testnum = 6666
 
 runtest: fleet.jar chips/marina/testCode/marina.xml chips/marina/testCode/marina.v chips/marina/testCode/marina.schematic-parasitics.spi
        ${rsync} --delete ./ ${sun_fs_server}:${sun_dir}/
-       time ssh -t -Y ${sun_fs_server} 'ssh -t am77536@${sun_server} "cd ${sun_dir}/; make testlocal impl=${impl}"'
+       time ssh -t -Y ${sun_fs_server} 'ssh -t ${sun_server_user}@${sun_server} "bash --login -c \"make -C ${sun_dir} testlocal impl=${impl}\""'
+       scp ${sun_fs_server}:${sun_dir}/chips/marina/testCode/out.dat .
 
 spice: fleet.jar
        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_fs_server}:${sun_dir}/
-       ssh -t -Y ${sun_fs_server} 'cd ${sun_dir}/chips/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_fs_server} 'cd ${sun_dir}/chips/marina/testCode/; echo -e "rcf commands\n" | hsim64 -time 90000 go.spi -o go.spi'
 
 
 ifeq ($(impl),silicon)
@@ -452,11 +462,12 @@ else
 testarg=-hsim
 endif
 
+
+
 testlocal: fleet.jar
        cd chips/marina/testCode; \
-         export PATH=/proj/async/cad/linux/bin/:$$PATH; \
-         export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/proj/async/cad/test/; \
-         /proj/async/cad/linux/lib/jdk1.6/bin/java \
+         export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/proj/async/cad/test/; \
+         java \
          -cp `pwd`/../../../lib/com.sun.async.test.jar:`pwd`/../../../fleet.jar \
          -Djava.library.path=/proj/async/cad/test/ \
          -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \
@@ -473,10 +484,10 @@ chips/marina/testCode/marina.schematic-parasitics.spi: ${all_electric_files}
        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
+         nice -n 19 ${electric_headless} -s regen.bsh ../electric/aMarinaM.delib
 
 electric:
-       ${electric} chips/marina/electric/aMarinaM.jelib
+       ${electric} chips/marina/electric/aMarinaM.delib
 
 sync:
        ${rsync} ${sun_fs_server}:${sun_dir}/chips/marina/testCode/marina\*.dump ~/ || true
@@ -490,6 +501,6 @@ chips/marina/testCode/omegaCounter-extracted.spi: ${all_electric_files} chips/ma
        @echo == Extracting Layout ===========================================================
        ssh ${sun_fs_server} 'rm -rf /tmp/am77536; mkdir /tmp/am77536'
        cd chips/marina/testCode; \
-         nice -n 19 ${electric_headless} -s rcx.bsh ../electric/omegaCounter.jelib
+         nice -n 19 ${electric_headless} -s rcx.bsh ../electric/omegaCounter.delib
        mv chips/marina/electric/starrcxt/omegaCounter.sp $@