Refactoring type size handler; using Java types as standard

[iot2.git] / iotjava / Makefile

diff --git a/iotjava/Makefile b/iotjava/Makefile
index c02a5feaffb227418705b3a1ca3e40ae6e351f06..4f537989ac5b74409d79780926e8dcfc1f020791 100644 (file)
--- a/iotjava/Makefile
+++ b/iotjava/Makefile
@@ -22,11 +22,27 @@ 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
-       $(JAVAC) -cp .:../$(BIN_DIR) -d $(BIN_DIR) iotrmi/Java/*.java
+       mkdir -p $(BIN_DIR)
+       #$(JAVAC) -cp . -d $(BIN_DIR) iotrmi/*.java
+       #$(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: