update program.sh and Makefile for new jtag setup

diff --git a/Makefile b/Makefile
index 5637537..4b9fb4e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -312,7 +312,7 @@ ifneq ($(impl),bee2)
 endif
 
 runserver: fleet.jar
 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

diff --git a/misc/program.sh b/misc/program.sh
index 588b9f5..01fb7da 100755 (executable)
--- a/misc/program.sh
+++ b/misc/program.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
 #!/bin/bash
 

+jtag < misc/jtag-commands
+exit 0
+
+
+
+

 export XILINX=/usr/local/xilinx/ise/
 
 
 export XILINX=/usr/local/xilinx/ise/