From: rtrimana <rtrimana@uci.edu>
Date: Wed, 21 Feb 2018 17:37:41 +0000 (-0800)
Subject: Adding copy function for JAR files; cleaning cleanrun.bash
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iot2.git;a=commitdiff_plain;h=ea936b2ea306bb40358cb91aa60549d7ec05be1c

Adding copy function for JAR files; cleaning cleanrun.bash
---

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index b4b4873..2a886b1 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -4,7 +4,15 @@ BOOFJARS := $(BOOFDIR)/BoofCV-feature-0.21.jar:$(BOOFDIR)/BoofCV-io-0.21.jar:$(B
 
 include $(BASE)/common.mk
 
-all: interfaces annotation drivers Lifxtest SmartLights Irrigation Speaker HomeSecurity
+all: copy_libs interfaces annotation drivers Lifxtest SmartLights Irrigation Speaker HomeSecurity
+
+PHONY += copy_libs
+copy_libs:
+	sudo cp ../jars/*.jar /usr/share/java
+	sudo cp ../jars/java-cup-bin-11b-20160615/*.jar /usr/share/java
+	sudo cp libs/boofcv_libs/*.jar /usr/share/java
+	sudo cp libs/georegression_libs/*.jar /usr/share/java
+	sudo cp libs/jlayer_libs/*.jar /usr/share/java
 
 PHONY += interfaces
 interfaces:
diff --git a/localconfig/iotruntime/cleanrun.bash b/localconfig/iotruntime/cleanrun.bash
index f314db9..92a1d59 100755
--- a/localconfig/iotruntime/cleanrun.bash
+++ b/localconfig/iotruntime/cleanrun.bash
@@ -12,7 +12,7 @@ cd slave/; rm -rf *.so; rm -rf *.zip; rm -rf *.log;
 sudo pkill -f Djava
 sudo pkill -f IoTSlave
 sudo iptables -F
-sudo tomoyo-loadpolicy -df < /home/iotuser/iot2/bin/iotruntime/clear.tomoyo
+sudo tomoyo-loadpolicy -df < /home/iotuser/iot2/bin/iotruntime/tomoyo/clear.tomoyo
 echo "Master cleaned!"
 
 # Clean the slave(s) and router