projects
/
iot2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
2e2dc22
)
Adding class file deletion in Makefile for controllers
author
rtrimana
<rtrimana@uci.edu>
Mon, 19 Feb 2018 22:31:01 +0000
(14:31 -0800)
committer
rtrimana
<rtrimana@uci.edu>
Mon, 19 Feb 2018 22:31:01 +0000
(14:31 -0800)
benchmarks/Java/HomeSecurityController/Makefile
patch
|
blob
|
history
benchmarks/Java/IrrigationController/Makefile
patch
|
blob
|
history
benchmarks/Java/Lifxtest/Makefile
patch
|
blob
|
history
benchmarks/Java/SmartLightsController/Makefile
patch
|
blob
|
history
benchmarks/Java/SpeakerController/Makefile
patch
|
blob
|
history
diff --git
a/benchmarks/Java/HomeSecurityController/Makefile
b/benchmarks/Java/HomeSecurityController/Makefile
index ca4234cc0dba3415c832f87b4f57e0a97b1f7130..570be5b4c11ee14119b1a84c9f9e371f4224c502 100644
(file)
--- a/
benchmarks/Java/HomeSecurityController/Makefile
+++ b/
benchmarks/Java/HomeSecurityController/Makefile
@@
-23,13
+23,13
@@
homesecurity:
$(JAVAC) $(JFLAGS) *.java
cp HomeSecurityController.config $(BIN_DIR)/HomeSecurityController
#cp HomeSecurityController.tomoyo $(BIN_DIR)/HomeSecurityController
$(JAVAC) $(JFLAGS) *.java
cp HomeSecurityController.config $(BIN_DIR)/HomeSecurityController
#cp HomeSecurityController.tomoyo $(BIN_DIR)/HomeSecurityController
- cd $(BIN_DIR)/HomeSecurityController; $(JAR) $(JARFLAGS) HomeSecurityController.jar ../HomeSecurityController/HomeSecurityController*.class ../HomeSecurityController/*.class ../iotcode/interfaces/SmartthingsSensor*.class ../iotcode/interfaces/SmartthingsActuator*.class ../iotcode/interfaces/Camera*.class ../iotcode/interfaces/Alarm*.class ../iotcode/interfaces/Room*.class ../iotcode/interfaces/ZoneState*.class ../iotcode/interfaces/Resolution*.class
+ cd $(BIN_DIR)/HomeSecurityController; $(JAR) $(JARFLAGS) HomeSecurityController.jar ../HomeSecurityController/HomeSecurityController*.class ../HomeSecurityController/*.class ../iotcode/interfaces/SmartthingsSensor*.class ../iotcode/interfaces/SmartthingsActuator*.class ../iotcode/interfaces/Camera*.class ../iotcode/interfaces/Alarm*.class ../iotcode/interfaces/Room*.class ../iotcode/interfaces/ZoneState*.class ../iotcode/interfaces/Resolution*.class
; rm -rf *.class
PHONY += check-homesecurity
check-homesecurity:
$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) *.java
cp HomeSecurityController.config $(BIN_DIR)/HomeSecurityController
#cp HomeSecurityController.tomoyo $(BIN_DIR)/HomeSecurityController
PHONY += check-homesecurity
check-homesecurity:
$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) *.java
cp HomeSecurityController.config $(BIN_DIR)/HomeSecurityController
#cp HomeSecurityController.tomoyo $(BIN_DIR)/HomeSecurityController
- cd $(BIN_DIR)/HomeSecurityController; $(JAR) $(JARFLAGS) HomeSecurityController.jar ../HomeSecurityController/HomeSecurityController*.class ../HomeSecurityController/*.class ../iotcode/interfaces/SmartthingsSensor*.class ../iotcode/interfaces/SmartthingsActuator*.class ../iotcode/interfaces/Camera*.class ../iotcode/interfaces/Alarm*.class ../iotcode/interfaces/Room*.class ../iotcode/interfaces/ZoneState*.class ../iotcode/interfaces/Resolution*.class
+ cd $(BIN_DIR)/HomeSecurityController; $(JAR) $(JARFLAGS) HomeSecurityController.jar ../HomeSecurityController/HomeSecurityController*.class ../HomeSecurityController/*.class ../iotcode/interfaces/SmartthingsSensor*.class ../iotcode/interfaces/SmartthingsActuator*.class ../iotcode/interfaces/Camera*.class ../iotcode/interfaces/Alarm*.class ../iotcode/interfaces/Room*.class ../iotcode/interfaces/ZoneState*.class ../iotcode/interfaces/Resolution*.class
; rm -rf *.class
.PHONY: $(PHONY)
.PHONY: $(PHONY)
diff --git
a/benchmarks/Java/IrrigationController/Makefile
b/benchmarks/Java/IrrigationController/Makefile
index fa69d0d215f604cea239bc3d7539f06483f967d5..a797ab4169a46514bd97d92b92101b44a8f887ee 100644
(file)
--- a/
benchmarks/Java/IrrigationController/Makefile
+++ b/
benchmarks/Java/IrrigationController/Makefile
@@
-21,19
+21,19
@@
check-all: check-irrigation
PHONY += irrigation
irrigation:
$(JAVAC) $(JFLAGS) *.java
PHONY += irrigation
irrigation:
$(JAVAC) $(JFLAGS) *.java
- cd $(BIN_DIR)/IrrigationController; $(JAR) $(JARFLAGS) IrrigationController.jar ../IrrigationController/*.class ../iotcode/interfaces/*.class
+ cd $(BIN_DIR)/IrrigationController; $(JAR) $(JARFLAGS) IrrigationController.jar ../IrrigationController/*.class ../iotcode/interfaces/*.class
; rm -rf *.class
cp IrrigationController.config $(BIN_DIR)/IrrigationController
cp IrrigationController.tomoyo $(BIN_DIR)/IrrigationController
cp -rf ./resources ./help_files $(BIN_DIR)/IrrigationController
cp IrrigationController.config $(BIN_DIR)/IrrigationController
cp IrrigationController.tomoyo $(BIN_DIR)/IrrigationController
cp -rf ./resources ./help_files $(BIN_DIR)/IrrigationController
- cd $(BIN_DIR)/IrrigationController; zip -r IrrigationController.zip ./resources ./help_files
+ cd $(BIN_DIR)/IrrigationController; zip -r IrrigationController.zip ./resources ./help_files
; rm -rf ./resources ./help_files
PHONY += check-irrigation
check-irrigation:
$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) *.java
PHONY += check-irrigation
check-irrigation:
$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) *.java
- cd $(BIN_DIR)/IrrigationController; $(JAR) $(JARFLAGS) IrrigationController.jar ../IrrigationController/*.class ../iotcode/interfaces/*.class
+ cd $(BIN_DIR)/IrrigationController; $(JAR) $(JARFLAGS) IrrigationController.jar ../IrrigationController/*.class ../iotcode/interfaces/*.class
; rm -rf *.class
cp IrrigationController.config $(BIN_DIR)/IrrigationController
cp IrrigationController.tomoyo $(BIN_DIR)/IrrigationController
cp -rf ./resources ./help_files $(BIN_DIR)/IrrigationController
cp IrrigationController.config $(BIN_DIR)/IrrigationController
cp IrrigationController.tomoyo $(BIN_DIR)/IrrigationController
cp -rf ./resources ./help_files $(BIN_DIR)/IrrigationController
- cd $(BIN_DIR)/IrrigationController; zip -r IrrigationController.zip ./resources ./help_files
+ cd $(BIN_DIR)/IrrigationController; zip -r IrrigationController.zip ./resources ./help_files
; rm -rf ./resources ./help_files
.PHONY: $(PHONY)
.PHONY: $(PHONY)
diff --git
a/benchmarks/Java/Lifxtest/Makefile
b/benchmarks/Java/Lifxtest/Makefile
index 1fbe2046b577704f0c8f0c4906da6421a66c0aa6..23f2d56f38833450ca6d5f65d13d2afca8001d6e 100644
(file)
--- a/
benchmarks/Java/Lifxtest/Makefile
+++ b/
benchmarks/Java/Lifxtest/Makefile
@@
-20,12
+20,12
@@
PHONY += lifxtest
lifxtest:
$(JAVAC) $(JFLAGS) *.java
cp Lifxtest.config $(BIN_DIR)/Lifxtest
lifxtest:
$(JAVAC) $(JFLAGS) *.java
cp Lifxtest.config $(BIN_DIR)/Lifxtest
- cd $(BIN_DIR)/Lifxtest; $(JAR) $(JARFLAGS) Lifxtest.jar ../Lifxtest/Lifxtest*.class ../Lifxtest/LightBulb*.class ../iotcode/LifxLightBulb/*.class ../iotcode/interfaces/LightBulb*.class
+ cd $(BIN_DIR)/Lifxtest; $(JAR) $(JARFLAGS) Lifxtest.jar ../Lifxtest/Lifxtest*.class ../Lifxtest/LightBulb*.class ../iotcode/LifxLightBulb/*.class ../iotcode/interfaces/LightBulb*.class
; rm -rf *.class
PHONY += check-lifxtest
check-lifxtest:
$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) *.java
cp Lifxtest.config $(BIN_DIR)/Lifxtest
PHONY += check-lifxtest
check-lifxtest:
$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) *.java
cp Lifxtest.config $(BIN_DIR)/Lifxtest
- cd $(BIN_DIR)/Lifxtest; $(JAR) $(JARFLAGS) Lifxtest.jar ../Lifxtest/Lifxtest*.class ../Lifxtest/LightBulb*.class ../iotcode/LifxLightBulb/*.class ../iotcode/interfaces/LightBulb*.class
+ cd $(BIN_DIR)/Lifxtest; $(JAR) $(JARFLAGS) Lifxtest.jar ../Lifxtest/Lifxtest*.class ../Lifxtest/LightBulb*.class ../iotcode/LifxLightBulb/*.class ../iotcode/interfaces/LightBulb*.class
; rm -rf *.class
.PHONY: $(PHONY)
.PHONY: $(PHONY)
diff --git
a/benchmarks/Java/SmartLightsController/Makefile
b/benchmarks/Java/SmartLightsController/Makefile
index e4dd350e8a0a066fe7846673e59618ad58642598..4d26b0e8d50f7d10518c8d780fd0134479fb2aa8 100644
(file)
--- a/
benchmarks/Java/SmartLightsController/Makefile
+++ b/
benchmarks/Java/SmartLightsController/Makefile
@@
-23,13
+23,13
@@
smartlights:
$(JAVAC) $(JFLAGS) *.java
cp SmartLightsController.config $(BIN_DIR)/SmartLightsController
cp SmartLightsController.tomoyo $(BIN_DIR)/SmartLightsController
$(JAVAC) $(JFLAGS) *.java
cp SmartLightsController.config $(BIN_DIR)/SmartLightsController
cp SmartLightsController.tomoyo $(BIN_DIR)/SmartLightsController
- cd $(BIN_DIR)/SmartLightsController; $(JAR) $(JARFLAGS) SmartLightsController.jar ../SmartLightsController/SmartLightsController*.class ../SmartLightsController/ColorTemperature*.class ../SmartLightsController/MotionDetection*.class ../SmartLightsController/*.class ../iotcode/interfaces/Camera*.class ../iotcode/interfaces/Room*.class ../iotcode/interfaces/LightBulb*.class ../iotcode/interfaces/Resolution*.class
+ cd $(BIN_DIR)/SmartLightsController; $(JAR) $(JARFLAGS) SmartLightsController.jar ../SmartLightsController/SmartLightsController*.class ../SmartLightsController/ColorTemperature*.class ../SmartLightsController/MotionDetection*.class ../SmartLightsController/*.class ../iotcode/interfaces/Camera*.class ../iotcode/interfaces/Room*.class ../iotcode/interfaces/LightBulb*.class ../iotcode/interfaces/Resolution*.class
; rm -rf *.class
PHONY += check-smartlights
check-smartlights:
$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) *.java
cp SmartLightsController.config $(BIN_DIR)/SmartLightsController
cp SmartLightsController.tomoyo $(BIN_DIR)/SmartLightsController
PHONY += check-smartlights
check-smartlights:
$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) *.java
cp SmartLightsController.config $(BIN_DIR)/SmartLightsController
cp SmartLightsController.tomoyo $(BIN_DIR)/SmartLightsController
- cd $(BIN_DIR)/SmartLightsController; $(JAR) $(JARFLAGS) SmartLightsController.jar ../SmartLightsController/SmartLightsController*.class ../SmartLightsController/ColorTemperature*.class ../SmartLightsController/MotionDetection*.class ../SmartLightsController/*.class ../iotcode/interfaces/Camera*.class ../iotcode/interfaces/Room*.class ../iotcode/interfaces/LightBulb*.class ../iotcode/interfaces/Resolution*.class
+ cd $(BIN_DIR)/SmartLightsController; $(JAR) $(JARFLAGS) SmartLightsController.jar ../SmartLightsController/SmartLightsController*.class ../SmartLightsController/ColorTemperature*.class ../SmartLightsController/MotionDetection*.class ../SmartLightsController/*.class ../iotcode/interfaces/Camera*.class ../iotcode/interfaces/Room*.class ../iotcode/interfaces/LightBulb*.class ../iotcode/interfaces/Resolution*.class
; rm -rf *.class
.PHONY: $(PHONY)
.PHONY: $(PHONY)
diff --git
a/benchmarks/Java/SpeakerController/Makefile
b/benchmarks/Java/SpeakerController/Makefile
index 8903728997673c9ada41a802eaa4f4d2b7a149b0..9a3a38a3c27a2451089e47013a5ddfe859a0c4be 100644
(file)
--- a/
benchmarks/Java/SpeakerController/Makefile
+++ b/
benchmarks/Java/SpeakerController/Makefile
@@
-23,7
+23,7
@@
check-all: check-speaker
PHONY += speaker
speaker:
$(JAVAC) $(JFLAGS) *.java
PHONY += speaker
speaker:
$(JAVAC) $(JFLAGS) *.java
- cd $(BIN_DIR)/SpeakerController; $(JAR) $(JARFLAGS) SpeakerController.jar ../SpeakerController/*.class ../iotcode/interfaces/*.class
+ cd $(BIN_DIR)/SpeakerController; $(JAR) $(JARFLAGS) SpeakerController.jar ../SpeakerController/*.class ../iotcode/interfaces/*.class
; rm -rf *.class
cp SpeakerController.config $(BIN_DIR)/SpeakerController
cp SpeakerController.tomoyo $(BIN_DIR)/SpeakerController
zip -r SpeakerController.zip ./music
cp SpeakerController.config $(BIN_DIR)/SpeakerController
cp SpeakerController.tomoyo $(BIN_DIR)/SpeakerController
zip -r SpeakerController.zip ./music
@@
-32,7
+32,7
@@
speaker:
PHONY += check-speaker
check-speaker:
$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) *.java
PHONY += check-speaker
check-speaker:
$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) *.java
- cd $(BIN_DIR)/SpeakerController; $(JAR) $(JARFLAGS) SpeakerController.jar ../SpeakerController/*.class ../iotcode/interfaces/*.class
+ cd $(BIN_DIR)/SpeakerController; $(JAR) $(JARFLAGS) SpeakerController.jar ../SpeakerController/*.class ../iotcode/interfaces/*.class
; rm -rf *.class
cp SpeakerController.config $(BIN_DIR)/SpeakerController
cp SpeakerController.tomoyo $(BIN_DIR)/SpeakerController
zip -r SpeakerController.zip ./music
cp SpeakerController.config $(BIN_DIR)/SpeakerController
cp SpeakerController.tomoyo $(BIN_DIR)/SpeakerController
zip -r SpeakerController.zip ./music