From: rtrimana <rtrimana@uci.edu>
Date: Tue, 20 Feb 2018 19:13:12 +0000 (-0800)
Subject: Adding iotcloud as a JAR file (Java library)
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iot2.git;a=commitdiff_plain;h=002ebd7984cad81f3a28695e2969785fac76ca4b;ds=sidebyside

Adding iotcloud as a JAR file (Java library)
---

diff --git a/benchmarks/Java/HomeSecurityController/Makefile b/benchmarks/Java/HomeSecurityController/Makefile
index 6f05a97..472b4b3 100644
--- a/benchmarks/Java/HomeSecurityController/Makefile
+++ b/benchmarks/Java/HomeSecurityController/Makefile
@@ -5,7 +5,7 @@ include $(BASE)/common.mk
 BOOFDIR := ../../libs/boofcv_libs
 BOOFJARS := $(BOOFDIR)/BoofCV-feature-0.21.jar:$(BOOFDIR)/BoofCV-io-0.21.jar:$(BOOFDIR)/BoofCV-visualize-0.21.jar:$(BOOFDIR)/BoofCV-ip-0.21.jar:$(CHECKERJARS)
 
-JFLAGS = -d $(BIN_DIR) -cp $(BOOFJARS):$(BIN_DIR):$(CHECKERJARS):.
+JFLAGS = -d $(BIN_DIR) -cp $(BOOFJARS):$(BIN_DIR):$(CHECKERJARS):$(IOTCLOUDJARS):.
 JARFLAGS = cf 
 
 # checker option
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 3f664ed..b4b4873 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -17,7 +17,7 @@ annotation:
 PHONY += drivers
 drivers:
 	$(MAKE) -C drivers/Java
-	$(MAKE) -C drivers/Cpp
+	#$(MAKE) -C drivers/Cpp
 
 PHONY += Lifxtest
 Lifxtest:
diff --git a/common.mk b/common.mk
index e5fcbb8..40d2ede 100644
--- a/common.mk
+++ b/common.mk
@@ -7,6 +7,7 @@ JAVADOC := javadoc
 JAVAC := javac
 BIN_DIR := $(BASE)/bin
 DOCS_DIR := $(BASE)/doc
+IOTCLOUDJARS := $(BASE)/jars/iotcloud.jar
 RUNTIMEJARS := $(BASE)/jars/asm-all-5.0.3.jar
 CHECKERJARS := $(BASE)/jars/checker.jar:$(BASE)/jars/javac.jar
 PHONEJARS := $(BASE)/jars/java-json.jar
diff --git a/jars/iotcloud.jar b/jars/iotcloud.jar
new file mode 100644
index 0000000..336cb5b
Binary files /dev/null and b/jars/iotcloud.jar differ