From 385617cefcb2b4442b7316bd3e8cdf658ce43c99 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 3 Nov 2008 11:20:36 +0100 Subject: [PATCH] update Marina Makefile lines --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 13d0f21..97e9b59 100644 --- a/Makefile +++ b/Makefile @@ -210,15 +210,16 @@ f0: fleet.jar cleansuncvs: rm -rf lib/suncvs.jar suncvs -lib/suncvs.jar: suncvs/marina suncvs/test +lib/suncvs.jar: fleet.jar suncvs/marina suncvs/test mkdir -p suncvs/build - cd suncvs; javac -cp test/javamake.jar:test/jcommon.jar:test/jfreechart.jar -d build `find . -name \*.java` + cd suncvs; javac -cp ../fleet.jar: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 . -runtest: lib/suncvs.jar fleet.jar +runtest: fleet.jar lib/suncvs.jar + ssh simmons 'skill nanosim' rsync -are ssh --delete --progress --verbose ./ simmons:~/fleet/ - ssh simmons 'export PATH=$$PATH:/proj/async/cad/linux/bin/; cd ~/fleet/suncvs/marina/testSims; /proj/async/cad/linux/lib/jdk1.5.0_05-linux-i586/bin/java -cp ~/fleet/fleet.jar -cp ~/fleet/lib/suncvs.jar com.sun.vlsi.chips.marina.test.MarinaTest' + ssh simmons 'export PATH=$$PATH:/proj/async/cad/linux/bin/; 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 3' suncvs/test: mkdir -p suncvs -- 1.7.10.4