X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=benchmarks%2Fdrivers%2FJava%2FMakefile;h=3d45da43db177ae71b60b9425f6ba50286efbdf8;hb=8587d5dae9491656de998fc4dde0d4adc38ef3b9;hp=92ab192d492962ffe8fe4881b62b0313d04a4aff;hpb=79a07095edcd2818516d3608302323e0c37d1f81;p=iot2.git

diff --git a/benchmarks/drivers/Java/Makefile b/benchmarks/drivers/Java/Makefile
index 92ab192..3d45da4 100644
--- a/benchmarks/drivers/Java/Makefile
+++ b/benchmarks/drivers/Java/Makefile
@@ -16,8 +16,8 @@ CHECKER_OPT = -processor iotchecker.IoTJavaChecker -AprintErrorStack
 
 ASTUBS = -Astubs=../../../checker/astubs/ 
 
-all: light camera labroom greenlawn sprinkler moisture weathergateway audioroom gpsgateway ihome homeroom alarm motion multipurpose waterleak
-check-all: check-light check-camera check-labroom check-greenlawn check-sprinkler check-moisture check-weathergateway check-audioroom check-gpsgateway check-ihome check-homeroom check-alarm check-motion check-multipurpose check-waterleak
+all: light camera labroom greenlawn sprinkler moisture weathergateway audioroom gpsgateway ihome homeroom alarm motion multipurpose waterleak doorlock doorlockactuator
+check-all: check-light check-camera check-labroom check-greenlawn check-sprinkler check-moisture check-weathergateway check-audioroom check-gpsgateway check-ihome check-homeroom check-alarm check-motion check-multipurpose check-waterleak check-doorlock check-doorlockactuator
 
 # Compile - without checker
 #
@@ -50,6 +50,12 @@ sprinkler:
 	$(JAVAC) $(JFLAGS) EspSprinkler/*.java
 	cp EspSprinkler/EspSprinkler.config $(BIN_DIR)/iotcode/EspSprinkler
 	cd $(BIN_DIR)/iotcode/EspSprinkler; $(JAR) $(JARFLAGS) EspSprinkler.jar ../../iotcode/EspSprinkler/*.class ../../iotcode/interfaces/Sprinkler*.class ../../iotcode/interfaces/ZoneState*.class
+	
+PHONY += blossomsprinkler
+blossomsprinkler:
+	$(JAVAC) $(JFLAGS) BlossomSprinkler/*.java
+	cp BlossomSprinkler/BlossomSprinkler.config $(BIN_DIR)/iotcode/BlossomSprinkler
+	cd $(BIN_DIR)/iotcode/BlossomSprinkler; $(JAR) $(JARFLAGS) BlossomSprinkler.jar ../../iotcode/BlossomSprinkler/*.class ../../iotcode/interfaces/Sprinkler*.class ../../iotcode/interfaces/ZoneState*.class
 
 PHONY += moisture
 moisture:
@@ -93,6 +99,12 @@ alarm:
 	$(JAVAC) $(JFLAGS) EspAlarm/*.java
 	cp EspAlarm/EspAlarm.config $(BIN_DIR)/iotcode/EspAlarm
 	cd $(BIN_DIR)/iotcode/EspAlarm; $(JAR) $(JARFLAGS) EspAlarm.jar ../../iotcode/EspAlarm/*.class ../../iotcode/interfaces/Alarm*.class ../../iotcode/interfaces/ZoneState*.class
+	
+PHONY += dlink-alarm
+dlink-alarm:
+	$(JAVAC) $(JFLAGS) DlinkAlarm/*.java
+	cp DlinkAlarm/DlinkAlarm.config $(BIN_DIR)/iotcode/DlinkAlarm
+	cd $(BIN_DIR)/iotcode/DlinkAlarm; $(JAR) $(JARFLAGS) DlinkAlarm.jar ../../iotcode/DlinkAlarm/*.class ../../iotcode/interfaces/Alarm*.class ../../iotcode/interfaces/ZoneState*.class
 
 PHONY += motion
 motion:
@@ -121,6 +133,12 @@ doorlock:
 	cp DoorlockSensor/DoorlockSensor.config $(BIN_DIR)/iotcode/DoorlockSensor
 	cd $(BIN_DIR)/iotcode/DoorlockSensor; $(JAR) $(JARFLAGS) DoorlockSensor.jar ../../iotcode/DoorlockSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class
 
+PHONY += doorlockactuator
+doorlockactuator:
+	$(JAVAC) $(JFLAGS) DoorlockActuator/*.java
+	cp DoorlockActuator/DoorlockActuator.config $(BIN_DIR)/iotcode/DoorlockActuator
+	cd $(BIN_DIR)/iotcode/DoorlockActuator; $(JAR) $(JARFLAGS) DoorlockActuator.jar ../../iotcode/DoorlockActuator/*.class ../../iotcode/interfaces/SmartthingsActuator*.class ../../iotcode/interfaces/Camera*.class
+
 # Compile - with checker
 #
 PHONY += check-light
@@ -152,6 +170,12 @@ check-sprinkler:
 	$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) EspSprinkler/*.java
 	cp EspSprinkler/EspSprinkler.config $(BIN_DIR)/iotcode/EspSprinkler
 	cd $(BIN_DIR)/iotcode/EspSprinkler; $(JAR) $(JARFLAGS) EspSprinkler.jar ../../iotcode/EspSprinkler/*.class ../../iotcode/interfaces/Sprinkler*.class ../../iotcode/interfaces/ZoneState*.class
+	
+PHONY += check-blossomsprinkler
+check-blossomsprinkler:
+	$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) BlossomSprinkler/*.java
+	cp BlossomSprinkler/BlossomSprinkler.config $(BIN_DIR)/iotcode/BlossomSprinkler
+	cd $(BIN_DIR)/iotcode/BlossomSprinkler; $(JAR) $(JARFLAGS) BlossomSprinkler.jar ../../iotcode/BlossomSprinkler/*.class ../../iotcode/interfaces/Sprinkler*.class ../../iotcode/interfaces/ZoneState*.class
 
 PHONY += check-moisture
 check-moisture:
@@ -193,9 +217,15 @@ check-homeroom:
 PHONY += check-alarm
 check-alarm:
 	$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) EspAlarm/*.java
-	cp EspAlarm/EspAlarm.config $(BIN_DIR)/iotcode/EspAlarm
+	cp DlinkAlarm/EspAlarm.config $(BIN_DIR)/iotcode/EspAlarm
 	cd $(BIN_DIR)/iotcode/EspAlarm; $(JAR) $(JARFLAGS) EspAlarm.jar ../../iotcode/EspAlarm/*.class ../../iotcode/interfaces/Alarm*.class ../../iotcode/interfaces/ZoneState*.class
 
+PHONY += check-dlink-alarm
+check-dlink-alarm:
+	$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) DlinkAlarm/*.java
+	cp EspAlarm/DlinkAlarm.config $(BIN_DIR)/iotcode/DlinkAlarm
+	cd $(BIN_DIR)/iotcode/DlinkAlarm; $(JAR) $(JARFLAGS) DlinkAlarm.jar ../../iotcode/DlinkAlarm/*.class ../../iotcode/interfaces/Alarm*.class ../../iotcode/interfaces/ZoneState*.class
+
 PHONY += check-motion
 check-motion:
 	$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) MotionSensor/*.java
@@ -220,4 +250,10 @@ check-doorlock:
 	cp DoorlockSensor/DoorlockSensor.config $(BIN_DIR)/iotcode/DoorlockSensor
 	cd $(BIN_DIR)/iotcode/DoorlockSensor; $(JAR) $(JARFLAGS) DoorlockSensor.jar ../../iotcode/DoorlockSensor/*.class ../../iotcode/interfaces/SmartthingsSensor*.class ../../iotcode/interfaces/Camera*.class
 
+PHONY += check-doorlockactuator
+check-doorlockactuator:
+	$(JAVAC) $(JFLAGS) $(CHECKER_OPT) $(ASTUBS) DoorlockActuator/*.java
+	cp DoorlockActuator/DoorlockActuator.config $(BIN_DIR)/iotcode/DoorlockActuator
+	cd $(BIN_DIR)/iotcode/DoorlockActuator; $(JAR) $(JARFLAGS) DoorlockActuator.jar ../../iotcode/DoorlockActuator/*.class ../../iotcode/interfaces/SmartthingsActuator*.class ../../iotcode/interfaces/Camera*.class
+
 .PHONY: $(PHONY)