Adding copy function for JAR files; cleaning cleanrun.bash

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index b4b48738cd54ff7b2a30183441fd804bea70045e..2a886b10633b67b630168e4797a417ead81a3f34 100644 (file)
--- 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 f314db9151eba1da4c57d628abf0b5151b5c1417..92a1d59b3c33c35fd0ad287f97609eaff660d14d 100755 (executable)
--- 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