From 7a119d4b8c8f39801afb6a2de46682715cedf289 Mon Sep 17 00:00:00 2001
From: rtrimana <rtrimana@uci.edu>
Date: Tue, 10 Jan 2017 15:12:51 -0800
Subject: [PATCH] Creating new directory for all Java benchmarks
---
.../AlarmSmart_Stub.java | 0
.../CameraCallback_CallbackSkeleton.java | 0
.../CameraSmart_Stub.java | 0
.../HomeSecurityController.config | 0
.../HomeSecurityController.java | 0
.../HomeSecurityController/Makefile | 4 ++--
.../MotionDetection.java | 0
.../MotionDetectionCallback.java | 0
.../RoomSmart_Stub.java | 0
...thingsSensorCallback_CallbackSkeleton.java | 0
.../SmartthingsSensorSmart_Stub.java | 0
.../CameraCallback_CallbackSkeleton.java | 0
.../CameraSmart_Stub.java | 0
.../IrrigationController/DayWeather.java | 0
.../IrrigationController.config | 0
.../IrrigationController.java | 0
.../IrrigationController/LawnSmart_Stub.java | 0
.../IrrigationController/LawnState.java | 0
.../IrrigationController/MANIFEST.MF | 0
.../{ => Java}/IrrigationController/Makefile | 4 ++--
...istureSensorCallback_CallbackSkeleton.java | 0
.../MoistureSensorSmart_Stub.java | 0
.../IrrigationController/MotionDetection.java | 0
.../MotionDetectionCallback.java | 0
.../SprinklerSmart_Stub.java | 0
.../IrrigationController/Tuple.java | 0
...atherGatewayCallback_CallbackSkeleton.java | 0
.../WeatherGatewaySmart_Stub.java | 0
.../IrrigationController/WeatherGrabber.java | 0
.../help_files/city_list_us.json | 0
.../help_files/html_files/error.html | 0
.../help_files/html_files/state0.html | 0
.../help_files/html_files/state1A.html | 0
.../help_files/html_files/state1B.html | 0
.../help_files/html_files/state2.html | 0
.../help_files/html_files/state4.html | 0
.../help_files/html_files/state5.html | 0
.../resources/area_codes.csv | 0
.../resources/zipcode.csv | 0
.../{ => Java}/Lifxtest/Lifxtest.config | 0
benchmarks/{ => Java}/Lifxtest/Lifxtest.java | 0
.../Lifxtest/LightBulbTest_Stub.java | 0
benchmarks/{ => Java}/Lifxtest/Makefile | 2 +-
.../CameraCallback_CallbackSkeleton.java | 0
.../CameraSmart_Stub.java | 0
.../ColorTemperature.java | 0
.../LightBulbSmart_Stub.java | 0
.../Java/SmartLightsController/Makefile | 19 ++++++++++++++++++
.../SmartLightsController/Makefile~} | 0
.../MotionDetection.java | 0
.../MotionDetectionCallback.java | 0
.../SmartLightsController/RoomSmart_Stub.java | 0
.../SmartLightsController.config | 0
.../SmartLightsController.java | 0
.../GPSGatewayCallback_CallbackSkeleton.java | 0
.../GPSGatewaySmart_Stub.java | 0
.../SpeakerController/MP3Decoder.java | 0
.../{ => Java}/SpeakerController/Makefile | 6 +++---
.../SpeakerController/RoomSmart_Stub.java | 0
.../SpeakerCallback_CallbackSkeleton.java | 0
.../SpeakerController.config | 0
.../SpeakerController/SpeakerController.java | 0
.../SpeakerController/SpeakerSmart_Stub.java | 0
.../SpeakerController/music/cool.mp3 | Bin
benchmarks/Makefile | 11 +++++-----
65 files changed, 33 insertions(+), 13 deletions(-)
rename benchmarks/{ => Java}/HomeSecurityController/AlarmSmart_Stub.java (100%)
rename benchmarks/{ => Java}/HomeSecurityController/CameraCallback_CallbackSkeleton.java (100%)
rename benchmarks/{ => Java}/HomeSecurityController/CameraSmart_Stub.java (100%)
rename benchmarks/{ => Java}/HomeSecurityController/HomeSecurityController.config (100%)
rename benchmarks/{ => Java}/HomeSecurityController/HomeSecurityController.java (100%)
rename benchmarks/{ => Java}/HomeSecurityController/Makefile (94%)
rename benchmarks/{ => Java}/HomeSecurityController/MotionDetection.java (100%)
rename benchmarks/{ => Java}/HomeSecurityController/MotionDetectionCallback.java (100%)
rename benchmarks/{ => Java}/HomeSecurityController/RoomSmart_Stub.java (100%)
rename benchmarks/{ => Java}/HomeSecurityController/SmartthingsSensorCallback_CallbackSkeleton.java (100%)
rename benchmarks/{ => Java}/HomeSecurityController/SmartthingsSensorSmart_Stub.java (100%)
rename benchmarks/{ => Java}/IrrigationController/CameraCallback_CallbackSkeleton.java (100%)
rename benchmarks/{ => Java}/IrrigationController/CameraSmart_Stub.java (100%)
rename benchmarks/{ => Java}/IrrigationController/DayWeather.java (100%)
rename benchmarks/{ => Java}/IrrigationController/IrrigationController.config (100%)
rename benchmarks/{ => Java}/IrrigationController/IrrigationController.java (100%)
rename benchmarks/{ => Java}/IrrigationController/LawnSmart_Stub.java (100%)
rename benchmarks/{ => Java}/IrrigationController/LawnState.java (100%)
rename benchmarks/{ => Java}/IrrigationController/MANIFEST.MF (100%)
rename benchmarks/{ => Java}/IrrigationController/Makefile (93%)
rename benchmarks/{ => Java}/IrrigationController/MoistureSensorCallback_CallbackSkeleton.java (100%)
rename benchmarks/{ => Java}/IrrigationController/MoistureSensorSmart_Stub.java (100%)
rename benchmarks/{ => Java}/IrrigationController/MotionDetection.java (100%)
rename benchmarks/{ => Java}/IrrigationController/MotionDetectionCallback.java (100%)
rename benchmarks/{ => Java}/IrrigationController/SprinklerSmart_Stub.java (100%)
rename benchmarks/{ => Java}/IrrigationController/Tuple.java (100%)
rename benchmarks/{ => Java}/IrrigationController/WeatherGatewayCallback_CallbackSkeleton.java (100%)
rename benchmarks/{ => Java}/IrrigationController/WeatherGatewaySmart_Stub.java (100%)
rename benchmarks/{ => Java}/IrrigationController/WeatherGrabber.java (100%)
rename benchmarks/{ => Java}/IrrigationController/help_files/city_list_us.json (100%)
rename benchmarks/{ => Java}/IrrigationController/help_files/html_files/error.html (100%)
rename benchmarks/{ => Java}/IrrigationController/help_files/html_files/state0.html (100%)
rename benchmarks/{ => Java}/IrrigationController/help_files/html_files/state1A.html (100%)
rename benchmarks/{ => Java}/IrrigationController/help_files/html_files/state1B.html (100%)
rename benchmarks/{ => Java}/IrrigationController/help_files/html_files/state2.html (100%)
rename benchmarks/{ => Java}/IrrigationController/help_files/html_files/state4.html (100%)
rename benchmarks/{ => Java}/IrrigationController/help_files/html_files/state5.html (100%)
rename benchmarks/{ => Java}/IrrigationController/resources/area_codes.csv (100%)
rename benchmarks/{ => Java}/IrrigationController/resources/zipcode.csv (100%)
rename benchmarks/{ => Java}/Lifxtest/Lifxtest.config (100%)
rename benchmarks/{ => Java}/Lifxtest/Lifxtest.java (100%)
rename benchmarks/{ => Java}/Lifxtest/LightBulbTest_Stub.java (100%)
rename benchmarks/{ => Java}/Lifxtest/Makefile (96%)
rename benchmarks/{ => Java}/SmartLightsController/CameraCallback_CallbackSkeleton.java (100%)
rename benchmarks/{ => Java}/SmartLightsController/CameraSmart_Stub.java (100%)
rename benchmarks/{ => Java}/SmartLightsController/ColorTemperature.java (100%)
rename benchmarks/{ => Java}/SmartLightsController/LightBulbSmart_Stub.java (100%)
create mode 100644 benchmarks/Java/SmartLightsController/Makefile
rename benchmarks/{SmartLightsController/Makefile => Java/SmartLightsController/Makefile~} (100%)
rename benchmarks/{ => Java}/SmartLightsController/MotionDetection.java (100%)
rename benchmarks/{ => Java}/SmartLightsController/MotionDetectionCallback.java (100%)
rename benchmarks/{ => Java}/SmartLightsController/RoomSmart_Stub.java (100%)
rename benchmarks/{ => Java}/SmartLightsController/SmartLightsController.config (100%)
rename benchmarks/{ => Java}/SmartLightsController/SmartLightsController.java (100%)
rename benchmarks/{ => Java}/SpeakerController/GPSGatewayCallback_CallbackSkeleton.java (100%)
rename benchmarks/{ => Java}/SpeakerController/GPSGatewaySmart_Stub.java (100%)
rename benchmarks/{ => Java}/SpeakerController/MP3Decoder.java (100%)
rename benchmarks/{ => Java}/SpeakerController/Makefile (88%)
rename benchmarks/{ => Java}/SpeakerController/RoomSmart_Stub.java (100%)
rename benchmarks/{ => Java}/SpeakerController/SpeakerCallback_CallbackSkeleton.java (100%)
rename benchmarks/{ => Java}/SpeakerController/SpeakerController.config (100%)
rename benchmarks/{ => Java}/SpeakerController/SpeakerController.java (100%)
rename benchmarks/{ => Java}/SpeakerController/SpeakerSmart_Stub.java (100%)
rename benchmarks/{ => Java}/SpeakerController/music/cool.mp3 (100%)
diff --git a/benchmarks/HomeSecurityController/AlarmSmart_Stub.java b/benchmarks/Java/HomeSecurityController/AlarmSmart_Stub.java
similarity index 100%
rename from benchmarks/HomeSecurityController/AlarmSmart_Stub.java
rename to benchmarks/Java/HomeSecurityController/AlarmSmart_Stub.java
diff --git a/benchmarks/HomeSecurityController/CameraCallback_CallbackSkeleton.java b/benchmarks/Java/HomeSecurityController/CameraCallback_CallbackSkeleton.java
similarity index 100%
rename from benchmarks/HomeSecurityController/CameraCallback_CallbackSkeleton.java
rename to benchmarks/Java/HomeSecurityController/CameraCallback_CallbackSkeleton.java
diff --git a/benchmarks/HomeSecurityController/CameraSmart_Stub.java b/benchmarks/Java/HomeSecurityController/CameraSmart_Stub.java
similarity index 100%
rename from benchmarks/HomeSecurityController/CameraSmart_Stub.java
rename to benchmarks/Java/HomeSecurityController/CameraSmart_Stub.java
diff --git a/benchmarks/HomeSecurityController/HomeSecurityController.config b/benchmarks/Java/HomeSecurityController/HomeSecurityController.config
similarity index 100%
rename from benchmarks/HomeSecurityController/HomeSecurityController.config
rename to benchmarks/Java/HomeSecurityController/HomeSecurityController.config
diff --git a/benchmarks/HomeSecurityController/HomeSecurityController.java b/benchmarks/Java/HomeSecurityController/HomeSecurityController.java
similarity index 100%
rename from benchmarks/HomeSecurityController/HomeSecurityController.java
rename to benchmarks/Java/HomeSecurityController/HomeSecurityController.java
diff --git a/benchmarks/HomeSecurityController/Makefile b/benchmarks/Java/HomeSecurityController/Makefile
similarity index 94%
rename from benchmarks/HomeSecurityController/Makefile
rename to benchmarks/Java/HomeSecurityController/Makefile
index 16ca57a..d507f6c 100644
--- a/benchmarks/HomeSecurityController/Makefile
+++ b/benchmarks/Java/HomeSecurityController/Makefile
@@ -1,8 +1,8 @@
-BASE = ../..
+BASE = ../../..
include $(BASE)/common.mk
-BOOFDIR := ../libs/boofcv_libs
+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):.
diff --git a/benchmarks/HomeSecurityController/MotionDetection.java b/benchmarks/Java/HomeSecurityController/MotionDetection.java
similarity index 100%
rename from benchmarks/HomeSecurityController/MotionDetection.java
rename to benchmarks/Java/HomeSecurityController/MotionDetection.java
diff --git a/benchmarks/HomeSecurityController/MotionDetectionCallback.java b/benchmarks/Java/HomeSecurityController/MotionDetectionCallback.java
similarity index 100%
rename from benchmarks/HomeSecurityController/MotionDetectionCallback.java
rename to benchmarks/Java/HomeSecurityController/MotionDetectionCallback.java
diff --git a/benchmarks/HomeSecurityController/RoomSmart_Stub.java b/benchmarks/Java/HomeSecurityController/RoomSmart_Stub.java
similarity index 100%
rename from benchmarks/HomeSecurityController/RoomSmart_Stub.java
rename to benchmarks/Java/HomeSecurityController/RoomSmart_Stub.java
diff --git a/benchmarks/HomeSecurityController/SmartthingsSensorCallback_CallbackSkeleton.java b/benchmarks/Java/HomeSecurityController/SmartthingsSensorCallback_CallbackSkeleton.java
similarity index 100%
rename from benchmarks/HomeSecurityController/SmartthingsSensorCallback_CallbackSkeleton.java
rename to benchmarks/Java/HomeSecurityController/SmartthingsSensorCallback_CallbackSkeleton.java
diff --git a/benchmarks/HomeSecurityController/SmartthingsSensorSmart_Stub.java b/benchmarks/Java/HomeSecurityController/SmartthingsSensorSmart_Stub.java
similarity index 100%
rename from benchmarks/HomeSecurityController/SmartthingsSensorSmart_Stub.java
rename to benchmarks/Java/HomeSecurityController/SmartthingsSensorSmart_Stub.java
diff --git a/benchmarks/IrrigationController/CameraCallback_CallbackSkeleton.java b/benchmarks/Java/IrrigationController/CameraCallback_CallbackSkeleton.java
similarity index 100%
rename from benchmarks/IrrigationController/CameraCallback_CallbackSkeleton.java
rename to benchmarks/Java/IrrigationController/CameraCallback_CallbackSkeleton.java
diff --git a/benchmarks/IrrigationController/CameraSmart_Stub.java b/benchmarks/Java/IrrigationController/CameraSmart_Stub.java
similarity index 100%
rename from benchmarks/IrrigationController/CameraSmart_Stub.java
rename to benchmarks/Java/IrrigationController/CameraSmart_Stub.java
diff --git a/benchmarks/IrrigationController/DayWeather.java b/benchmarks/Java/IrrigationController/DayWeather.java
similarity index 100%
rename from benchmarks/IrrigationController/DayWeather.java
rename to benchmarks/Java/IrrigationController/DayWeather.java
diff --git a/benchmarks/IrrigationController/IrrigationController.config b/benchmarks/Java/IrrigationController/IrrigationController.config
similarity index 100%
rename from benchmarks/IrrigationController/IrrigationController.config
rename to benchmarks/Java/IrrigationController/IrrigationController.config
diff --git a/benchmarks/IrrigationController/IrrigationController.java b/benchmarks/Java/IrrigationController/IrrigationController.java
similarity index 100%
rename from benchmarks/IrrigationController/IrrigationController.java
rename to benchmarks/Java/IrrigationController/IrrigationController.java
diff --git a/benchmarks/IrrigationController/LawnSmart_Stub.java b/benchmarks/Java/IrrigationController/LawnSmart_Stub.java
similarity index 100%
rename from benchmarks/IrrigationController/LawnSmart_Stub.java
rename to benchmarks/Java/IrrigationController/LawnSmart_Stub.java
diff --git a/benchmarks/IrrigationController/LawnState.java b/benchmarks/Java/IrrigationController/LawnState.java
similarity index 100%
rename from benchmarks/IrrigationController/LawnState.java
rename to benchmarks/Java/IrrigationController/LawnState.java
diff --git a/benchmarks/IrrigationController/MANIFEST.MF b/benchmarks/Java/IrrigationController/MANIFEST.MF
similarity index 100%
rename from benchmarks/IrrigationController/MANIFEST.MF
rename to benchmarks/Java/IrrigationController/MANIFEST.MF
diff --git a/benchmarks/IrrigationController/Makefile b/benchmarks/Java/IrrigationController/Makefile
similarity index 93%
rename from benchmarks/IrrigationController/Makefile
rename to benchmarks/Java/IrrigationController/Makefile
index e338f79..069fd90 100644
--- a/benchmarks/IrrigationController/Makefile
+++ b/benchmarks/Java/IrrigationController/Makefile
@@ -1,8 +1,8 @@
-BASE = ../..
+BASE = ../../..
include $(BASE)/common.mk
-BOOFDIR := ../libs/boofcv_libs
+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):.
diff --git a/benchmarks/IrrigationController/MoistureSensorCallback_CallbackSkeleton.java b/benchmarks/Java/IrrigationController/MoistureSensorCallback_CallbackSkeleton.java
similarity index 100%
rename from benchmarks/IrrigationController/MoistureSensorCallback_CallbackSkeleton.java
rename to benchmarks/Java/IrrigationController/MoistureSensorCallback_CallbackSkeleton.java
diff --git a/benchmarks/IrrigationController/MoistureSensorSmart_Stub.java b/benchmarks/Java/IrrigationController/MoistureSensorSmart_Stub.java
similarity index 100%
rename from benchmarks/IrrigationController/MoistureSensorSmart_Stub.java
rename to benchmarks/Java/IrrigationController/MoistureSensorSmart_Stub.java
diff --git a/benchmarks/IrrigationController/MotionDetection.java b/benchmarks/Java/IrrigationController/MotionDetection.java
similarity index 100%
rename from benchmarks/IrrigationController/MotionDetection.java
rename to benchmarks/Java/IrrigationController/MotionDetection.java
diff --git a/benchmarks/IrrigationController/MotionDetectionCallback.java b/benchmarks/Java/IrrigationController/MotionDetectionCallback.java
similarity index 100%
rename from benchmarks/IrrigationController/MotionDetectionCallback.java
rename to benchmarks/Java/IrrigationController/MotionDetectionCallback.java
diff --git a/benchmarks/IrrigationController/SprinklerSmart_Stub.java b/benchmarks/Java/IrrigationController/SprinklerSmart_Stub.java
similarity index 100%
rename from benchmarks/IrrigationController/SprinklerSmart_Stub.java
rename to benchmarks/Java/IrrigationController/SprinklerSmart_Stub.java
diff --git a/benchmarks/IrrigationController/Tuple.java b/benchmarks/Java/IrrigationController/Tuple.java
similarity index 100%
rename from benchmarks/IrrigationController/Tuple.java
rename to benchmarks/Java/IrrigationController/Tuple.java
diff --git a/benchmarks/IrrigationController/WeatherGatewayCallback_CallbackSkeleton.java b/benchmarks/Java/IrrigationController/WeatherGatewayCallback_CallbackSkeleton.java
similarity index 100%
rename from benchmarks/IrrigationController/WeatherGatewayCallback_CallbackSkeleton.java
rename to benchmarks/Java/IrrigationController/WeatherGatewayCallback_CallbackSkeleton.java
diff --git a/benchmarks/IrrigationController/WeatherGatewaySmart_Stub.java b/benchmarks/Java/IrrigationController/WeatherGatewaySmart_Stub.java
similarity index 100%
rename from benchmarks/IrrigationController/WeatherGatewaySmart_Stub.java
rename to benchmarks/Java/IrrigationController/WeatherGatewaySmart_Stub.java
diff --git a/benchmarks/IrrigationController/WeatherGrabber.java b/benchmarks/Java/IrrigationController/WeatherGrabber.java
similarity index 100%
rename from benchmarks/IrrigationController/WeatherGrabber.java
rename to benchmarks/Java/IrrigationController/WeatherGrabber.java
diff --git a/benchmarks/IrrigationController/help_files/city_list_us.json b/benchmarks/Java/IrrigationController/help_files/city_list_us.json
similarity index 100%
rename from benchmarks/IrrigationController/help_files/city_list_us.json
rename to benchmarks/Java/IrrigationController/help_files/city_list_us.json
diff --git a/benchmarks/IrrigationController/help_files/html_files/error.html b/benchmarks/Java/IrrigationController/help_files/html_files/error.html
similarity index 100%
rename from benchmarks/IrrigationController/help_files/html_files/error.html
rename to benchmarks/Java/IrrigationController/help_files/html_files/error.html
diff --git a/benchmarks/IrrigationController/help_files/html_files/state0.html b/benchmarks/Java/IrrigationController/help_files/html_files/state0.html
similarity index 100%
rename from benchmarks/IrrigationController/help_files/html_files/state0.html
rename to benchmarks/Java/IrrigationController/help_files/html_files/state0.html
diff --git a/benchmarks/IrrigationController/help_files/html_files/state1A.html b/benchmarks/Java/IrrigationController/help_files/html_files/state1A.html
similarity index 100%
rename from benchmarks/IrrigationController/help_files/html_files/state1A.html
rename to benchmarks/Java/IrrigationController/help_files/html_files/state1A.html
diff --git a/benchmarks/IrrigationController/help_files/html_files/state1B.html b/benchmarks/Java/IrrigationController/help_files/html_files/state1B.html
similarity index 100%
rename from benchmarks/IrrigationController/help_files/html_files/state1B.html
rename to benchmarks/Java/IrrigationController/help_files/html_files/state1B.html
diff --git a/benchmarks/IrrigationController/help_files/html_files/state2.html b/benchmarks/Java/IrrigationController/help_files/html_files/state2.html
similarity index 100%
rename from benchmarks/IrrigationController/help_files/html_files/state2.html
rename to benchmarks/Java/IrrigationController/help_files/html_files/state2.html
diff --git a/benchmarks/IrrigationController/help_files/html_files/state4.html b/benchmarks/Java/IrrigationController/help_files/html_files/state4.html
similarity index 100%
rename from benchmarks/IrrigationController/help_files/html_files/state4.html
rename to benchmarks/Java/IrrigationController/help_files/html_files/state4.html
diff --git a/benchmarks/IrrigationController/help_files/html_files/state5.html b/benchmarks/Java/IrrigationController/help_files/html_files/state5.html
similarity index 100%
rename from benchmarks/IrrigationController/help_files/html_files/state5.html
rename to benchmarks/Java/IrrigationController/help_files/html_files/state5.html
diff --git a/benchmarks/IrrigationController/resources/area_codes.csv b/benchmarks/Java/IrrigationController/resources/area_codes.csv
similarity index 100%
rename from benchmarks/IrrigationController/resources/area_codes.csv
rename to benchmarks/Java/IrrigationController/resources/area_codes.csv
diff --git a/benchmarks/IrrigationController/resources/zipcode.csv b/benchmarks/Java/IrrigationController/resources/zipcode.csv
similarity index 100%
rename from benchmarks/IrrigationController/resources/zipcode.csv
rename to benchmarks/Java/IrrigationController/resources/zipcode.csv
diff --git a/benchmarks/Lifxtest/Lifxtest.config b/benchmarks/Java/Lifxtest/Lifxtest.config
similarity index 100%
rename from benchmarks/Lifxtest/Lifxtest.config
rename to benchmarks/Java/Lifxtest/Lifxtest.config
diff --git a/benchmarks/Lifxtest/Lifxtest.java b/benchmarks/Java/Lifxtest/Lifxtest.java
similarity index 100%
rename from benchmarks/Lifxtest/Lifxtest.java
rename to benchmarks/Java/Lifxtest/Lifxtest.java
diff --git a/benchmarks/Lifxtest/LightBulbTest_Stub.java b/benchmarks/Java/Lifxtest/LightBulbTest_Stub.java
similarity index 100%
rename from benchmarks/Lifxtest/LightBulbTest_Stub.java
rename to benchmarks/Java/Lifxtest/LightBulbTest_Stub.java
diff --git a/benchmarks/Lifxtest/Makefile b/benchmarks/Java/Lifxtest/Makefile
similarity index 96%
rename from benchmarks/Lifxtest/Makefile
rename to benchmarks/Java/Lifxtest/Makefile
index 9a4eb32..08c190b 100755
--- a/benchmarks/Lifxtest/Makefile
+++ b/benchmarks/Java/Lifxtest/Makefile
@@ -1,4 +1,4 @@
-BASE = ../..
+BASE = ../../..
include $(BASE)/common.mk
diff --git a/benchmarks/SmartLightsController/CameraCallback_CallbackSkeleton.java b/benchmarks/Java/SmartLightsController/CameraCallback_CallbackSkeleton.java
similarity index 100%
rename from benchmarks/SmartLightsController/CameraCallback_CallbackSkeleton.java
rename to benchmarks/Java/SmartLightsController/CameraCallback_CallbackSkeleton.java
diff --git a/benchmarks/SmartLightsController/CameraSmart_Stub.java b/benchmarks/Java/SmartLightsController/CameraSmart_Stub.java
similarity index 100%
rename from benchmarks/SmartLightsController/CameraSmart_Stub.java
rename to benchmarks/Java/SmartLightsController/CameraSmart_Stub.java
diff --git a/benchmarks/SmartLightsController/ColorTemperature.java b/benchmarks/Java/SmartLightsController/ColorTemperature.java
similarity index 100%
rename from benchmarks/SmartLightsController/ColorTemperature.java
rename to benchmarks/Java/SmartLightsController/ColorTemperature.java
diff --git a/benchmarks/SmartLightsController/LightBulbSmart_Stub.java b/benchmarks/Java/SmartLightsController/LightBulbSmart_Stub.java
similarity index 100%
rename from benchmarks/SmartLightsController/LightBulbSmart_Stub.java
rename to benchmarks/Java/SmartLightsController/LightBulbSmart_Stub.java
diff --git a/benchmarks/Java/SmartLightsController/Makefile b/benchmarks/Java/SmartLightsController/Makefile
new file mode 100644
index 0000000..256b5b7
--- /dev/null
+++ b/benchmarks/Java/SmartLightsController/Makefile
@@ -0,0 +1,19 @@
+BASE = ../../..
+
+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):.
+JARFLAGS = cf
+
+all: smartlights
+
+PHONY += smartlights
+smartlights:
+ $(JAVAC) $(JFLAGS) *.java
+ cp SmartLightsController.config $(BIN_DIR)/SmartLightsController
+ cd $(BIN_DIR)/SmartLightsController; $(JAR) $(JARFLAGS) SmartLightsController.jar ../SmartLightsController/SmartLightsController*.class ../SmartLightsController/ColorTemperature*.class ../SmartLightsController/MotionDetection*.class ../iotcode/interfaces/Camera*.class ../iotcode/interfaces/Room*.class ../iotcode/interfaces/LightBulb*.class ../iotcode/interfaces/Resolution*.class
+
+.PHONY: $(PHONY)
diff --git a/benchmarks/SmartLightsController/Makefile b/benchmarks/Java/SmartLightsController/Makefile~
similarity index 100%
rename from benchmarks/SmartLightsController/Makefile
rename to benchmarks/Java/SmartLightsController/Makefile~
diff --git a/benchmarks/SmartLightsController/MotionDetection.java b/benchmarks/Java/SmartLightsController/MotionDetection.java
similarity index 100%
rename from benchmarks/SmartLightsController/MotionDetection.java
rename to benchmarks/Java/SmartLightsController/MotionDetection.java
diff --git a/benchmarks/SmartLightsController/MotionDetectionCallback.java b/benchmarks/Java/SmartLightsController/MotionDetectionCallback.java
similarity index 100%
rename from benchmarks/SmartLightsController/MotionDetectionCallback.java
rename to benchmarks/Java/SmartLightsController/MotionDetectionCallback.java
diff --git a/benchmarks/SmartLightsController/RoomSmart_Stub.java b/benchmarks/Java/SmartLightsController/RoomSmart_Stub.java
similarity index 100%
rename from benchmarks/SmartLightsController/RoomSmart_Stub.java
rename to benchmarks/Java/SmartLightsController/RoomSmart_Stub.java
diff --git a/benchmarks/SmartLightsController/SmartLightsController.config b/benchmarks/Java/SmartLightsController/SmartLightsController.config
similarity index 100%
rename from benchmarks/SmartLightsController/SmartLightsController.config
rename to benchmarks/Java/SmartLightsController/SmartLightsController.config
diff --git a/benchmarks/SmartLightsController/SmartLightsController.java b/benchmarks/Java/SmartLightsController/SmartLightsController.java
similarity index 100%
rename from benchmarks/SmartLightsController/SmartLightsController.java
rename to benchmarks/Java/SmartLightsController/SmartLightsController.java
diff --git a/benchmarks/SpeakerController/GPSGatewayCallback_CallbackSkeleton.java b/benchmarks/Java/SpeakerController/GPSGatewayCallback_CallbackSkeleton.java
similarity index 100%
rename from benchmarks/SpeakerController/GPSGatewayCallback_CallbackSkeleton.java
rename to benchmarks/Java/SpeakerController/GPSGatewayCallback_CallbackSkeleton.java
diff --git a/benchmarks/SpeakerController/GPSGatewaySmart_Stub.java b/benchmarks/Java/SpeakerController/GPSGatewaySmart_Stub.java
similarity index 100%
rename from benchmarks/SpeakerController/GPSGatewaySmart_Stub.java
rename to benchmarks/Java/SpeakerController/GPSGatewaySmart_Stub.java
diff --git a/benchmarks/SpeakerController/MP3Decoder.java b/benchmarks/Java/SpeakerController/MP3Decoder.java
similarity index 100%
rename from benchmarks/SpeakerController/MP3Decoder.java
rename to benchmarks/Java/SpeakerController/MP3Decoder.java
diff --git a/benchmarks/SpeakerController/Makefile b/benchmarks/Java/SpeakerController/Makefile
similarity index 88%
rename from benchmarks/SpeakerController/Makefile
rename to benchmarks/Java/SpeakerController/Makefile
index 1c042f0..61459c0 100644
--- a/benchmarks/SpeakerController/Makefile
+++ b/benchmarks/Java/SpeakerController/Makefile
@@ -1,10 +1,10 @@
-BASE = ../..
+BASE = ../../..
include $(BASE)/common.mk
-BOOFDIR := ../libs/boofcv_libs
+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)
-JLAYERDIR := ../libs/jlayer_libs
+JLAYERDIR := ../../libs/jlayer_libs
JLAYERJARS := $(JLAYERDIR)/jl1.0.1.jar
JFLAGS = -d $(BIN_DIR) -cp $(BOOFJARS):$(BIN_DIR):.:$(JLAYERJARS)
diff --git a/benchmarks/SpeakerController/RoomSmart_Stub.java b/benchmarks/Java/SpeakerController/RoomSmart_Stub.java
similarity index 100%
rename from benchmarks/SpeakerController/RoomSmart_Stub.java
rename to benchmarks/Java/SpeakerController/RoomSmart_Stub.java
diff --git a/benchmarks/SpeakerController/SpeakerCallback_CallbackSkeleton.java b/benchmarks/Java/SpeakerController/SpeakerCallback_CallbackSkeleton.java
similarity index 100%
rename from benchmarks/SpeakerController/SpeakerCallback_CallbackSkeleton.java
rename to benchmarks/Java/SpeakerController/SpeakerCallback_CallbackSkeleton.java
diff --git a/benchmarks/SpeakerController/SpeakerController.config b/benchmarks/Java/SpeakerController/SpeakerController.config
similarity index 100%
rename from benchmarks/SpeakerController/SpeakerController.config
rename to benchmarks/Java/SpeakerController/SpeakerController.config
diff --git a/benchmarks/SpeakerController/SpeakerController.java b/benchmarks/Java/SpeakerController/SpeakerController.java
similarity index 100%
rename from benchmarks/SpeakerController/SpeakerController.java
rename to benchmarks/Java/SpeakerController/SpeakerController.java
diff --git a/benchmarks/SpeakerController/SpeakerSmart_Stub.java b/benchmarks/Java/SpeakerController/SpeakerSmart_Stub.java
similarity index 100%
rename from benchmarks/SpeakerController/SpeakerSmart_Stub.java
rename to benchmarks/Java/SpeakerController/SpeakerSmart_Stub.java
diff --git a/benchmarks/SpeakerController/music/cool.mp3 b/benchmarks/Java/SpeakerController/music/cool.mp3
similarity index 100%
rename from benchmarks/SpeakerController/music/cool.mp3
rename to benchmarks/Java/SpeakerController/music/cool.mp3
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 481611c..3f664ed 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -21,22 +21,23 @@ drivers:
PHONY += Lifxtest
Lifxtest:
- $(MAKE) -C Lifxtest
+ $(MAKE) -C Java/Lifxtest
+ #$(MAKE) -C Cpp/Lifxtest
PHONY += SmartLights
SmartLights:
- $(MAKE) -C SmartLightsController
+ $(MAKE) -C Java/SmartLightsController
PHONY += Irrigation
Irrigation:
- $(MAKE) -C IrrigationController
+ $(MAKE) -C Java/IrrigationController
PHONY += Speaker
Speaker:
- $(MAKE) -C SpeakerController
+ $(MAKE) -C Java/SpeakerController
PHONY += HomeSecurity
HomeSecurity:
- $(MAKE) -C HomeSecurityController
+ $(MAKE) -C Java/HomeSecurityController
.PHONY: $(PHONY)
--
2.34.1