Adding iotcloud as a JAR file (Java library)

diff --git a/benchmarks/Java/HomeSecurityController/Makefile b/benchmarks/Java/HomeSecurityController/Makefile
index 6f05a97b8b900314b1a7e9474c728d8edd9d50ae..472b4b3df119822753f7d3667fdc4d3aca8bd001 100644 (file)
--- 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 3f664eda915cff6fd69ce6a8fc7f67780109987e..b4b48738cd54ff7b2a30183441fd804bea70045e 100644 (file)
--- 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 e5fcbb8c6091a1580af320f18c443de55c179ffc..40d2ede38bd67be4beaedaae61d3a85f7affc613 100644 (file)
--- 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 (file)
index 0000000..336cb5b
Binary files /dev/null and b/jars/iotcloud.jar differ