Fixing misunderstood config files for the phone app.

[iot2.git] / iotjava / Makefile

diff --git a/iotjava/Makefile b/iotjava/Makefile
index ff1fac246848ff2663ecbc7cb898548d964f406d..94c01f6acc16a75472e8f048ad066bb46c9dc508 100644 (file)
--- a/iotjava/Makefile
+++ b/iotjava/Makefile
@@ -47,6 +47,9 @@ installer:
        $(JAVAC)  -d $(BIN_DIR) iotinstaller/*.java
        cp ../localconfig/iotruntime/MySQLInterface.config $(BIN_DIR)/iotruntime/
        cp ../localconfig/iotruntime/MySQLInterface.config $(BIN_DIR)/iotinstaller/
+       cp -r ../localconfig/SupportedDevices/ $(BIN_DIR)/
+       cp ../localconfig/SupportedDevices/driversList.config $(BIN_DIR)/iotinstaller/
+       cp ../localconfig/SupportedDevices/AddressInformation.config $(BIN_DIR)/iotinstaller/
 
 PHONY += runtime
 runtime:
@@ -75,7 +78,7 @@ run-compiler-lbtest:
        cp ../localconfig/iotpolicy/LifxLightBulb/*.pol $(BIN_DIR)/iotpolicy/
        cp ../localconfig/iotpolicy/LifxLightBulb/*.req $(BIN_DIR)/iotpolicy/
        cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler -cont Lifxtest lifxlightbulb.pol lifxtest.req -drv LifxLightBulb -java Java
-       #cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler lifxlightbulb.pol lifxtest.req -cplus Cplus
+       #cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler -cont Lifxtest lifxlightbulb.pol lifxtest.req -drv LifxLightBulb -cplus Cplus
 
 # SmartLightsController
 PHONY += run-compiler-smartlight
@@ -86,7 +89,8 @@ run-compiler-smartlight:
        cp ../localconfig/iotpolicy/AmcrestCamera/*.req $(BIN_DIR)/iotpolicy/
        cp ../localconfig/iotpolicy/Room/*.pol $(BIN_DIR)/iotpolicy/
        cp ../localconfig/iotpolicy/Room/*.req $(BIN_DIR)/iotpolicy/
-       cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler -cont SmartLightsController lifxlightbulb.pol smartlightsbulb.req -drv LifxLightBulb amcrestcamera.pol smartlightscam.req -drv AmcrestCamera motiondetection.pol motiondetection.req -drv AmcrestCamera room.pol roomsmart.req -drv LabRoom -java Java
+       #cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler -cont SmartLightsController lifxlightbulb.pol smartlightsbulb.req -drv LifxLightBulb amcrestcamera.pol smartlightscam.req -drv AmcrestCamera motiondetection.pol motiondetection.req -drv AmcrestCamera room.pol roomsmart.req -drv LabRoom -java Java
+       cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler -cont SmartLightsController lifxlightbulb.pol smartlightsbulb.req -drv LifxLightBulb amcrestcamera.pol smartlightscam.req -drv AmcrestCamera motiondetection.pol motiondetection.req -drv AmcrestCamera room.pol roomsmart.req -drv LabRoom -cplus Cplus
 
 PHONY += run-compiler-lifx
 run-compiler-lifx: