projects
/
fleet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change build machine, use /usr/bin/tclsh instead of /usr/bin/tcl
[fleet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
ce205fb
..
16d18b8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-67,11
+67,15
@@
endif
java_files = $(shell find src -name \*.java)
ship_files = $(shell find ships -name \*.ship)
java_files = $(shell find src -name \*.java)
ship_files = $(shell find ships -name \*.ship)
-fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
+upstream/sbp/edu.berkeley.sbp.jar:
+ git submodule init
+ git submodule update
+ cd upstream/sbp; make edu.berkeley.sbp.jar
+fleet.jar: upstream/sbp/edu.berkeley.sbp.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/
mkdir -p build/class/edu/berkeley/fleet/assembler/
cp src/edu/berkeley/fleet/assembler/fleet.g build/class/edu/berkeley/fleet/assembler/
- 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
+ javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:upstream/sbp/edu.berkeley.sbp.jar -d build/class/ $(shell find src -name \*.java)
+ cd build/class/; jar xf ../../upstream/sbp/edu.berkeley.sbp.jar
cd build/class/; jar xf ../../lib/ibex.jar
for A in `find ships -name \*.ship`;\
do java \
cd build/class/; jar xf ../../lib/ibex.jar
for A in `find ships -name \*.ship`;\
do java \
@@
-80,7
+84,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 ~/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`
+ javac -classpath ~/proj/electric/srcj/electric.jar:lib/ibex.jar:lib/RXTXcomm.jar:build/class${ps}upstream/sbp/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 .
@@
-88,8
+92,8
@@
fleet.jar: $(java_files) $(ship_files) src/edu/berkeley/fleet/assembler/fleet.g
## Fpga ####################################################################################
# 32Gb ram, 4-core. small-config:1019s large-config:2530s
## Fpga ####################################################################################
# 32Gb ram, 4-core. small-config:1019s large-config:2530s
-#host = intel2950-5.eecs.berkeley.edu
-host = intel2950-4.eecs.berkeley.edu
+host = intel2950-5.eecs.berkeley.edu
+#host = intel2950-4.eecs.berkeley.edu
# 128Gb ram, 2x4-core. small-config:1189s large-config:3065s
#host = amdr905-1.eecs.berkeley.edu
# 128Gb ram, 2x4-core. small-config:1189s large-config:3065s
#host = amdr905-1.eecs.berkeley.edu
@@
-130,7
+134,6
@@
upload: fleet.jar build/${impl}/main.bit
chmod +x misc/program.sh
ifneq ($(impl),bee2)
${rsync} ./ root@${runhost}:fleet/
chmod +x misc/program.sh
ifneq ($(impl),bee2)
${rsync} ./ root@${runhost}:fleet/
- ssh -t root@${runhost} 'cd fleet; jtag < misc/jtag-commands'
endif
build/${impl}/main.bit: $(java_files) $(ship_files)
endif
build/${impl}/main.bit: $(java_files) $(ship_files)
@@
-303,12
+306,12
@@
ifneq ($(impl),bee2)
echo "quit" >> build/${impl}/impact.cmd
$(xilinx_ise)impact -batch < impact.cmd
echo "quit" >> build/${impl}/impact.cmd
$(xilinx_ise)impact -batch < impact.cmd
- $(xilinx) tcl $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -ace mainx.ace
+ $(xilinx) tclsh $(remote_edk)/data/xmd/genace.tcl -jprog -hw main.bit -board ${board} -ace mainx.ace
mv build/${impl}/mainx.ace build/${impl}/main.ace # genace throws a fit if the filename prefix is the same?
endif
runserver: fleet.jar
mv build/${impl}/mainx.ace build/${impl}/main.ace # genace throws a fit if the filename prefix is the same?
endif
runserver: fleet.jar
- $(java) -Djava.library.path=lib -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
+ $(java) -cp fleet.jar:lib/RXTXcomm.jar edu.berkeley.fleet.fpga.Server
test: fleet.jar
$(java) -jar fleet.jar test ships/*.ship tests
test: fleet.jar
$(java) -jar fleet.jar test ships/*.ship tests
@@
-484,7
+487,7
@@
endif
urjtag: fleet.jar chips/marina/testCode/marina.xml
${rsync} --delete ./ root@goliath:fleet/
${rsync} --delete ~/proj/electric/srcj/electric.jar root@goliath:electric.jar
urjtag: fleet.jar chips/marina/testCode/marina.xml
${rsync} --delete ./ root@goliath:fleet/
${rsync} --delete ~/proj/electric/srcj/electric.jar root@goliath:electric.jar
- ssh -t root@goliath 'cd fleet/chips/marina/testCode; java -cp ../../../fleet.jar:/root/electric.jar -Dfleet.impl=com.sun.vlsi.chips.marina.test.Marina com.sun.vlsi.chips.marina.test.MarinaTest -silicon -testNum 0'
+ ssh -t root@goliath 'cd fleet/chips/marina/testCode; java -cp ../../../fleet.jar:/root/electric.jar -Dfleet.impl=edu.berkeley.fleet.marina.Marina edu.berkeley.fleet.marina.MarinaTest -silicon -testNum 0'
testlocal: fleet.jar
cd chips/marina/testCode; \
testlocal: fleet.jar
cd chips/marina/testCode; \
@@
-492,8
+495,8
@@
testlocal: fleet.jar
java \
-cp ~/proj/electric/srcj/electric.jar:`pwd`/../../../fleet.jar \
-Djava.library.path=/proj/async/cad/test/ \
java \
-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 \
+ -Dfleet.impl=edu.berkeley.fleet.marina.Marina \
+ edu.berkeley.fleet.marina.MarinaTest \
${testarg} \
-testNum ${testnum} || tail -n 20 marina.spi.run
${testarg} \
-testNum ${testnum} || tail -n 20 marina.spi.run