X-Git-Url: http://plrg.eecs.uci.edu/git/?p=iot2.git;a=blobdiff_plain;f=iotjava%2FMakefile;h=1a4d49c9a94cc0f561dc8f025adfce7f9bb0beb5;hp=ab069c48b94eec2448c9e20eac9f19aa09398afc;hb=3ae46e02f3f8acc1e4fd279d9194f1f032452e75;hpb=4951f81458fa28e4db26f568df9f30e7afdecf0c

diff --git a/iotjava/Makefile b/iotjava/Makefile
index ab069c4..1a4d49c 100644
--- a/iotjava/Makefile
+++ b/iotjava/Makefile
@@ -21,7 +21,8 @@ compiler:
 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
-	cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler testclasspolicy.pol testclassrequires.pol -cplus Cplus -java Java
+	#cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler testclasspolicy.pol testclassrequires.pol callbackpolicy.pol callbackrequires.pol -cplus Cplus -java Java
+	cd $(BIN_DIR)/iotpolicy; $(JAVA) -cp .:..:../$(PARSERJARS):../$(BIN_DIR) iotpolicy.IoTCompiler callbackpolicy.pol callbackrequires.pol testclasspolicy_advanced.pol testclassrequires_advanced.pol -cplus Cplus -java Java
 
 # Runtime system compilation
 PHONY += runtime
@@ -35,10 +36,11 @@ compile:
 	cp ./iotrmi/C++/basics/* $(BIN_DIR)/iotpolicy/output_files/Cplus
 	cd $(BIN_DIR)/iotpolicy/output_files; cp *.java ./Java
 	cd $(BIN_DIR)/iotpolicy/output_files; cp *.hpp ./Cplus
-	cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) *.java
-#	cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(G++) ./*.hpp --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
-	cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(G++) ./TestClass_Skeleton.cpp -o ./TestClass_Skeleton.out --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
-	cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(G++) ./TestClass_Stub.cpp -o ./TestClass_Stub.out --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
+#	cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) TestClass_Skeleton.java
+#	cd $(BIN_DIR)/iotpolicy/output_files/Java; $(JAVAC) -cp .:..:../../../$(BIN_DIR) TestClassAdvanced_Stub.java
+#	cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(G++) ./TestClass_Skeleton.cpp -o ./TestClass_Skeleton.out --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
+#	cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(G++) ./TestClassAdvanced_Stub.cpp -o ./TestClassAdvanced_Stub.out --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
+	cd $(BIN_DIR)/iotpolicy/output_files/Cplus; $(ARM_G++) ./TestClassInterface_Skeleton.cpp -o ./TestClassInterface_Skeleton.out --std=c++11 -pthread -pg -I../../../../iotjava/iotrmi/C++/
 
 PHONY += run-java-skeleton
 run-java-skeleton:
@@ -46,7 +48,8 @@ run-java-skeleton:
 
 PHONY += run-java-stub
 run-java-stub:
-	cd ../bin/iotpolicy/output_files/Java; $(JAVA) -cp .:../../../$(BIN_DIR) TestClass_Stub
+#	cd ../bin/iotpolicy/output_files/Java; $(JAVA) -cp .:../../../$(BIN_DIR) TestClass_Stub
+	cd ../bin/iotpolicy/output_files/Java; $(JAVA) -cp .:../../../$(BIN_DIR) TestClassAdvanced_Stub
 
 PHONY += run-cplus-skeleton
 run-cplus-skeleton:
@@ -54,7 +57,8 @@ run-cplus-skeleton:
 
 PHONY += run-cplus-stub
 run-cplus-stub:
-	../bin/iotpolicy/output_files/Cplus/TestClass_Stub.out
+#	../bin/iotpolicy/output_files/Cplus/TestClass_Stub.out
+	../bin/iotpolicy/output_files/Cplus/TestClassAdvanced_Stub.out
 
 PHONY += folderclean
 folderclean:
@@ -65,6 +69,7 @@ clean:
 	cd $(BIN_DIR)/iotpolicy/output_files; rm -rf *.class *.gch
 	cd $(BIN_DIR)/iotpolicy/output_files/Java; rm -rf *.class
 	cd $(BIN_DIR)/iotpolicy/output_files/Cplus; rm -rf *.gch
+	cd $(BIN_DIR)/iotpolicy/output_files/Cplus; rm -rf *.out
 
 # RMI compilation and run
 PHONY += rmi