projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
77e69b2
)
fix paths to electric.jar
author
Adam Megacz
<adam@megacz.com>
Fri, 20 Nov 2009 02:45:40 +0000
(18:45 -0800)
committer
Adam Megacz
<adam@megacz.com>
Fri, 20 Nov 2009 02:45:40 +0000
(18:45 -0800)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
cbcad7a
..
ce205fb
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-70,7
+70,7
@@
ship_files = $(shell find ships -name \*.ship)
fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
mkdir -p build/class/edu/berkeley/fleet/assembler/
cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
mkdir -p build/class/edu/berkeley/fleet/assembler/
cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
- javac -classpath lib/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+ javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:lib/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
cd build/class/; jar xf ../../lib/ibex.jar
for A in `find ships -name \*.ship`;\
cd build/class/; jar xf ../../lib/edu.berkeley.sbp.jar
cd build/class/; jar xf ../../lib/ibex.jar
for A in `find ships -name \*.ship`;\
@@
-80,7
+80,7
@@
fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
edu.berkeley.fleet.Main \
expand $$A;\
done
edu.berkeley.fleet.Main \
expand $$A;\
done
- javac -classpath lib/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
+ javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}lib/edu.berkeley.sbp.jar -d build/class/ `find build/java -name \*.java`
echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
jar cmf build/class/manifest $@ ships -C build/class .
echo 'Main-Class: edu.berkeley.fleet.Main' > build/class/manifest
jar cmf build/class/manifest $@ ships -C build/class .
@@
-464,7
+464,7
@@
testnum = 0
runtest: fleet.jar chips/marina/testCode/marina.xml chips/marina/testCode/marina.v chips/marina/testCode/marina.schematic-parasitics.spi
scp ${sun_fs_server}:${sun_dir}/chips/marina/testCode/out.dat . || true
${rsync} --delete ./ ${sun_fs_server}:${sun_dir}/
runtest: fleet.jar chips/marina/testCode/marina.xml chips/marina/testCode/marina.v chips/marina/testCode/marina.schematic-parasitics.spi
scp ${sun_fs_server}:${sun_dir}/chips/marina/testCode/out.dat . || true
${rsync} --delete ./ ${sun_fs_server}:${sun_dir}/
- ${rsync} --delete -L lib/electric.jar ${sun_fs_server}:/home/am77536/proj/electric/srcj/
+ ${rsync} --delete -L ~/proj/electric/srcj/electric.jar ${sun_fs_server}:/home/am77536/proj/electric/srcj/
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 .
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 .
@@
-490,7
+490,7
@@
testlocal: fleet.jar
cd chips/marina/testCode; \
export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/proj/async/cad/test/; \
java \
cd chips/marina/testCode; \
export LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/proj/async/cad/test/; \
java \
- -cp ~/proj/electric/srcj/electric.jar:`pwd`/../../../lib/electric.jar:`pwd`/../../../fleet.jar \
+ -cp ~/proj/electric/srcj/electric.jar:`pwd`/../../../fleet.jar \
-Djava.library.path=/proj/async/cad/test/ \
-Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \
com.sun.vlsi.chips.marina.test.MarinaTest \
-Djava.library.path=/proj/async/cad/test/ \
-Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina \
com.sun.vlsi.chips.marina.test.MarinaTest \