And suddenly my linux box javac needs "-encoding UTF-8", well, cant hurtbeing explicit about that in general.

5 years ago · 242bdb073c
19 changed files with 24 additions and 22 deletions
--- a/Makefile.conf
+++ b/Makefile.conf
@ -31,6 +31,8 @@ ifeq ($(.SHELLSTATUS),0)
    OLD_JAVA=true
 endif

+JAVAC_CMD=javac -encoding UTF-8
+
 ######### Overrides from the config file(s) #########
 ifneq ("$(wildcard $(HERE)local.conf)","")
    $(info including: $(HERE)local.conf)
--- a/src/Makefile
+++ b/src/Makefile
@ -81,7 +81,7 @@ GENERATED_CC=\
 GENERATED_HH=\
 	$(CXX_DIR)/throw_pEp_exception.hh

-# Generated JNI headers (javac -h)
+# Generated JNI headers
 JNI_GENERATED_HH=\
 	$(CXX_DIR)/foundation_pEp_jniadapter_AbstractEngine.h \
    $(CXX_DIR)/foundation_pEp_jniadapter__Blob.h \
@ -128,9 +128,9 @@ $(LIB_CXX_STATIC): compile-cxx

 # -------------- Compile -----------------
 compile-java: create-dirs codegen
-	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/*.java
-	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/exceptions/*.java
-	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/interfaces/*.java
+	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/$(JAVAC_CMD) -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/*.java
+	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/$(JAVAC_CMD) -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/exceptions/*.java
+	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/$(JAVAC_CMD) -d ../$(JAVA_BUILD_ROOT) $(JAVA_PKG_BASENAME)/interfaces/*.java


 compile-cxx: create-dirs gen-jni-headers $(OBJECTS)
@ -146,7 +146,7 @@ $(JNI_GENERATED_HH):
 ifdef OLD_JAVA
 	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javah -d ../$(JAVA_BUILD_ROOT) $(subst /,.,$(subst .java,,$<))
 else
-	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/javac -d ../$(JAVA_BUILD_ROOT) -h ../$(CXX_DIR)/ $(JAVA_PKG_BASENAME)/*.java
+	cd $(JAVA_DIR);$(JAVA_BIN_DIR)/$(JAVAC_CMD) -d ../$(JAVA_BUILD_ROOT) -h ../$(CXX_DIR)/ $(JAVA_PKG_BASENAME)/*.java
 endif


--- a/test/java/foundation/pEp/jniadapter/test/basic/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/basic/Makefile
@ -23,7 +23,7 @@ run: compile clean-pep-home
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/jni100/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni100/Makefile
@ -22,7 +22,7 @@ run: compile clean-pep-home
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/jni111/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni111/Makefile
@ -22,7 +22,7 @@ alice: compile clean-pep-home-alice
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/jni114/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni114/Makefile
@ -22,7 +22,7 @@ alice: compile clean-pep-home-alice
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/jni115/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni115/Makefile
@ -22,7 +22,7 @@ alice: compile clean-pep-home-alice
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/jni88/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni88/Makefile
@ -20,7 +20,7 @@ run: compile clean-pep-home
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/jni91/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni91/Makefile
@ -20,7 +20,7 @@ run: compile clean-pep-home
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/jni92/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni92/Makefile
@ -21,7 +21,7 @@ run: compile clean-pep-home
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/jni94/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni94/Makefile
@ -20,7 +20,7 @@ run: compile clean-pep-home
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/jni96/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni96/Makefile
@ -22,7 +22,7 @@ alice: compile clean-pep-home-alice
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/jni98/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/jni98/Makefile
@ -21,7 +21,7 @@ run: compile clean-pep-home
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/regression/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/regression/Makefile
@ -21,7 +21,7 @@ run: compile clean-pep-home
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/speedtest/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/speedtest/Makefile
@ -23,7 +23,7 @@ alice: compile clean-pep-home-alice
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile
@ -22,7 +22,7 @@ alice: compile clean-pep-home-alice
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile
@ -29,7 +29,7 @@ bob: compile clean-pep-home-bob
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile
+++ b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile
@ -30,7 +30,7 @@ carol: compile clean-pep-home-carol
 compile: $(JAVA_CLASSES) pitytest

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

 clean:
 	rm -f $(JAVA_CLASSES)
--- a/test/java/foundation/pEp/pitytest/Makefile
+++ b/test/java/foundation/pEp/pitytest/Makefile
@ -14,7 +14,7 @@ all: compile
 compile: $(JAVA_CLASSES)

 %.class: %.java
-	cd $(JAVA_CWD);javac -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(PKGNAME)/$<
+	cd $(JAVA_CWD);$(JAVAC_CMD) -cp $(CLASSPATH) $(JAVA_PKG_BASEPATH)/$(PKGNAME)/$<

 clean:
 	rm -f $(JAVA_CLASSES)