projects
/
fleet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f780e83
)
hide errors in uname test
author
adam
<adam@megacz.com>
Thu, 16 Aug 2007 02:39:16 +0000
(
03:39
+0100)
committer
adam
<adam@megacz.com>
Thu, 16 Aug 2007 02:39:16 +0000
(
03:39
+0100)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
7ee8667
..
1c1408c
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-6,7
+6,7
@@
java = java -Xmx500m
run: fleet.jar; $(java) $(cp) $(interpreter_class)
run: fleet.jar; $(java) $(cp) $(interpreter_class)
-ifeq ($(shell uname -o),Cygwin)
+ifeq ($(shell uname -o 2>/dev/null),Cygwin)
ps=\;
else
ps=:
ps=\;
else
ps=:
@@
-79,8
+79,9
@@
build/main.bit: build/fabric.v $(verilog_files)
for A in `find ships -name \*.ship`;\
do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
done
for A in `find ships -name \*.ship`;\
do java -cp build/class edu.berkeley.fleet.Main target=fpga expand $$A;\
done
+ $(java) -cp fleet.jar edu.berkeley.fleet.slipway.Generator
rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
rsync -zare ssh --progress --delete --verbose ./ ${host}:${remote_dir}
- ssh ${host} 'time make -C ${remote_dir} synth XILINX=${remote_xilinx}'
+ time ssh ${host} 'make -C ${remote_dir} synth XILINX=${remote_xilinx}'
scp ${host}:${remote_dir}/build/main.bit build/
synth:
scp ${host}:${remote_dir}/build/main.bit build/
synth: