replace the rest of javac invocations with $(JAVAC_CMD)

5 years ago · 49caf7eccc
9 changed files with 10 additions and 8 deletions
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/identities/Makefile
@ -22,7 +22,7 @@ run: compile
 compile: $(JAVA_CLASSES) pitytest

 %.class: %.java
-	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
+	cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_ping/Makefile
@ -25,7 +25,7 @@ bob: compile
 compile: $(JAVA_CLASSES) pitytest

 %.class: %.java
-	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
+	cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmqmanager/test/stateless_rxtx/Makefile
@ -23,7 +23,7 @@ run: compile
 compile: $(JAVA_CLASSES) pitytest

 %.class: %.java
-	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
+	cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/utils/transport/fsmsgqueue/test/regression/Makefile
@ -22,7 +22,7 @@ run: compile
 compile: $(JAVA_CLASSES) pitytest

 %.class: %.java
-	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
+	cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/pitytest/Makefile.conf
+++ b/test/java/foundation/pEp/pitytest/Makefile.conf
@ -1,9 +1,11 @@
 JAVA_PKG_BASENAME=foundation.pEp
 JAVA_PKG_BASEPATH=foundation/pEp
 CLASSPATH=.
+JAVAC_CMD=javac -encoding UTF-8
 JAVA=java -enableassertions
 JAVA_CWD=../../../

+
 JAVA_CLASSES_PITYTEST= \
 	TestSuite.class \
 	TestUnit.class \
--- a/test/java/foundation/pEp/pitytest/examples/ctxinitfail/Makefile
+++ b/test/java/foundation/pEp/pitytest/examples/ctxinitfail/Makefile
@ -23,7 +23,7 @@ run: compile
 compile: $(JAVA_CLASSES) pitytest

 %.class: %.java
-	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
+	cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/pitytest/examples/ctxmembers/Makefile
+++ b/test/java/foundation/pEp/pitytest/examples/ctxmembers/Makefile
@ -23,7 +23,7 @@ run: compile
 compile: $(JAVA_CLASSES) pitytest

 %.class: %.java
-	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
+	cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/pitytest/examples/helloworld/Makefile
+++ b/test/java/foundation/pEp/pitytest/examples/helloworld/Makefile
@ -23,7 +23,7 @@ run: compile
 compile: $(JAVA_CLASSES) pitytest

 %.class: %.java
-	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
+	cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/pitytest/examples/testsuite/Makefile
+++ b/test/java/foundation/pEp/pitytest/examples/testsuite/Makefile
@ -23,7 +23,7 @@ run: compile
 compile: $(JAVA_CLASSES) pitytest

 %.class: %.java
-	cd $(JAVA_CWD);pwd;javac $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<
+	cd $(JAVA_CWD);pwd;$(JAVAC_CMD) $(JAVA_PKG_BASEPATH)/$(TEST_UNIT_NAME)/$<

 clean:
 	rm -f $(JAVA_CLASSES)