X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=iotjava%2FMakefile;h=4f537989ac5b74409d79780926e8dcfc1f020791;hb=b6effa890ccb61eb4b7a82f0dd7493cac354ef49;hp=6fa12090de8cb240e88e365c24479e46d70ecb4c;hpb=de12bab65360671de45c0cd5a2b1eff5450a3649;p=iot2.git

diff --git a/iotjava/Makefile b/iotjava/Makefile
index 6fa1209..4f53798 100644
--- 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
@@ -17,9 +18,39 @@ compiler:
 	$(JAVAC) -cp .:$(PARSERJARS) -d $(BIN_DIR) iotpolicy/*.java
 	cp ../config/iotpolicy/*.pol $(BIN_DIR)/iotpolicy/
 
-PHONY += run
-run:
-	cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler policy.pol requires.pol -java Java -cplus Cplus
+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:
+	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:
+	$(JAVA) -cp .:$(BIN_DIR) iotrmi.Java.IoTRMIObject
+
+PHONY += run-rmiclient
+run-rmiclient:
+	$(JAVA) -cp .:$(BIN_DIR) iotrmi.Java.IoTRMICall
 
 PHONY += doc
 doc: iotruntime iotinstaller