Adding #include<vector> declaration when array is translated as vector in C++

[iot2.git] / iotjava / Makefile

diff --git a/iotjava/Makefile b/iotjava/Makefile
index d40d939850a1d3682de104a25eebb34fabe3119b..9b858f77e29d2cd92a08fe249d005635284fc459 100644 (file)
--- a/iotjava/Makefile
+++ b/iotjava/Makefile
@@ -2,8 +2,9 @@ BASE := ..
 
 include $(BASE)/common.mk
 
-all: tree parser compiler
+all: tree parser compiler rmi
 
+# Parser compilation and run
 PHONY += tree
 tree:
        $(JAVAC) -cp .:$(PARSERJARS) -d $(BIN_DIR) iotpolicy/tree/*.java
@@ -21,10 +22,34 @@ PHONY += run-compiler
 run-compiler:
        cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler camerapolicy.pol camerarequires.pol lightbulbpolicy.pol lightbulbrequires.pol -cplus Cplus -java Java
 
+# Runtime system compilation
+PHONY += runtime
+runtime:
+       $(JAVAC) -classpath . iotruntime/master/*.java -d $(BIN_DIR)
+
+# RMI compilation and run
 PHONY += rmi
 rmi:
-       $(JAVAC) -cp . -d $(BIN_DIR) iotrmi/*.java
+       mkdir -p $(BIN_DIR)
        $(JAVAC) -cp .:../$(BIN_DIR) -d $(BIN_DIR) iotrmi/Java/*.java
+       $(JAVAC) -cp .:../$(BIN_DIR) -d $(BIN_DIR) iotrmi/Java/sample/*.java
+       mkdir -p $(BIN_DIR)/iotrmi/C++
+       #$(G++) iotrmi/C++/IoTSocketServer.cpp -o $(BIN_DIR)/iotrmi/C++/IoTSocketServer.out
+       #$(G++) iotrmi/C++/IoTSocketClient.cpp -o $(BIN_DIR)/iotrmi/C++/IoTSocketClient.out
+       $(G++) iotrmi/C++/IoTRMICall.cpp -o $(BIN_DIR)/iotrmi/C++/IoTRMICall.out --std=c++11
+       $(G++) iotrmi/C++/IoTRMIObject.cpp -o $(BIN_DIR)/iotrmi/C++/IoTRMIObject.out --std=c++11
+       mkdir -p $(BIN_DIR)/iotrmi/C++/sample
+       $(G++) iotrmi/C++/sample/TestClass.cpp -o $(BIN_DIR)/iotrmi/C++/sample/TestClass.out --std=c++11
+       $(G++) iotrmi/C++/sample/TestClass_Stub.cpp -o $(BIN_DIR)/iotrmi/C++/sample/TestClass_Stub.out --std=c++11
+       $(G++) iotrmi/C++/sample/TestClass_Skeleton.cpp -o $(BIN_DIR)/iotrmi/C++/sample/TestClass_Skeleton.out --std=c++11
+
+PHONY += run-rmiserver
+run-rmiserver:
+       $(JAVA) -cp .:$(BIN_DIR) iotrmi.Java.sample.TestClass_Skeleton
+
+PHONY += run-rmiclient
+run-rmiclient:
+       $(JAVA) -cp .:$(BIN_DIR) iotrmi.Java.sample.TestClass_Stub
 
 PHONY += doc
 doc: iotruntime iotinstaller