From 35422d192ef19f92baeb74c06e409fa80202f9b6 Mon Sep 17 00:00:00 2001
From: Adam Megacz <adam@megacz.com>
Date: Sun, 10 Jan 2010 17:53:18 -0800
Subject: [PATCH] update program.sh and Makefile for new jtag setup

---
 Makefile        |    2 +-
 misc/program.sh |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5637537..4b9fb4e 100644
--- a/Makefile
+++ b/Makefile
@@ -312,7 +312,7 @@ ifneq ($(impl),bee2)
 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
diff --git a/misc/program.sh b/misc/program.sh
index 588b9f5..01fb7da 100755
--- a/misc/program.sh
+++ b/misc/program.sh
@@ -1,5 +1,11 @@
 #!/bin/bash
 
+jtag < misc/jtag-commands
+exit 0
+
+
+
+
 export XILINX=/usr/local/xilinx/ise/
 
 
-- 
1.7.10.4