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

(cherry picked from commit 242bdb073c)
5 years ago · ac91696b0a
19 changed files with 27 additions and 19 deletions
--- a/Makefile.conf
+++ b/Makefile.conf
@ -24,6 +24,14 @@ ifeq ($(PLATFORM),linux)
 endif


+# Old versions of a Java distribution have a `javah` binary, new versions do not. This checks whether or not `javah` can be found in the Java distribution found in the directory `$JAVA_HOME`.
+DUMMY:=$(shell which $(JAVA_HOME)/bin/javah)
+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
@ -70,7 +70,7 @@ PEP_HEADER:=$(shell $(CXX) $(CXXFLAGS) -E -M get_header.cc | grep -oe '[^[:space
 all: $(JAR) $(SHARED)

 $(JAR): status_list.yml2 passphrase_status_list.yml2 $(JAVA_SOURCES) $(C_SOURCES)
-	$(JP)/javac foundation/pEp/jniadapter/*.java
+	$(JP)/$(JAVAC_CMD) foundation/pEp/jniadapter/*.java
 	$(JP)/jar cf $@ foundation/pEp/jniadapter/*.class

 BLUBB=foundation_pEp_jniadapter_AbstractEngine.h foundation_pEp_jniadapter_Engine.h foundation_pEp_jniadapter_Message.h foundation_pEp_jniadapter__Blob.h
@ -78,7 +78,7 @@ $(BLUBB): foundation_pEp_jniadapter_%.h: foundation/pEp/jniadapter/%.java
 ifdef OLD_JAVA
 	$(JP)/javah $(subst /,.,$(subst .java,,$<))
 else
-	$(JP)/javac -h . $<
+	$(JP)/$(JAVAC_CMD) -h . $<
 endif

 foundation_pEp_jniadapter_AbstractEngine.o: %.o: %.cc %.h throw_pEp_exception.hh jniutils.hh
--- 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)