From ac91696b0a7f0e6583a0c79d85a6f5657781d38e Mon Sep 17 00:00:00 2001 From: heck Date: Mon, 7 Sep 2020 18:40:18 +0200 Subject: [PATCH] And suddenly my linux box javac needs "-encoding UTF-8", well, cant hurtbeing explicit about that in general. (cherry picked from commit 242bdb073c234009b27249e51be33b426d1eb5da) --- Makefile.conf | 8 ++++++++ src/Makefile | 4 ++-- test/java/foundation/pEp/jniadapter/test/basic/Makefile | 2 +- test/java/foundation/pEp/jniadapter/test/jni100/Makefile | 2 +- test/java/foundation/pEp/jniadapter/test/jni111/Makefile | 2 +- test/java/foundation/pEp/jniadapter/test/jni114/Makefile | 2 +- test/java/foundation/pEp/jniadapter/test/jni115/Makefile | 2 +- test/java/foundation/pEp/jniadapter/test/jni88/Makefile | 2 +- test/java/foundation/pEp/jniadapter/test/jni91/Makefile | 2 +- test/java/foundation/pEp/jniadapter/test/jni92/Makefile | 2 +- test/java/foundation/pEp/jniadapter/test/jni94/Makefile | 2 +- test/java/foundation/pEp/jniadapter/test/jni96/Makefile | 2 +- test/java/foundation/pEp/jniadapter/test/jni98/Makefile | 2 +- .../foundation/pEp/jniadapter/test/regression/Makefile | 2 +- .../foundation/pEp/jniadapter/test/speedtest/Makefile | 2 +- .../foundation/pEp/jniadapter/test/templateAlice/Makefile | 2 +- .../pEp/jniadapter/test/templateAliceBob/Makefile | 2 +- .../pEp/jniadapter/test/templateAliceBobCarol/Makefile | 2 +- test/java/foundation/pEp/pitytest/Makefile | 2 +- 19 files changed, 27 insertions(+), 19 deletions(-) diff --git a/Makefile.conf b/Makefile.conf index e9f2627..fe07727 100644 --- 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) diff --git a/src/Makefile b/src/Makefile index e1a412b..a470ee4 100644 --- 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 diff --git a/test/java/foundation/pEp/jniadapter/test/basic/Makefile b/test/java/foundation/pEp/jniadapter/test/basic/Makefile index 0b1c12a..1366beb 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/jni100/Makefile b/test/java/foundation/pEp/jniadapter/test/jni100/Makefile index caec686..abc46e1 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/jni111/Makefile b/test/java/foundation/pEp/jniadapter/test/jni111/Makefile index 542cbb0..c2d0437 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/jni114/Makefile b/test/java/foundation/pEp/jniadapter/test/jni114/Makefile index 5180dc1..36d6ce8 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/jni115/Makefile b/test/java/foundation/pEp/jniadapter/test/jni115/Makefile index cbf5351..3ae14c6 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/jni88/Makefile b/test/java/foundation/pEp/jniadapter/test/jni88/Makefile index 9b8b4bf..5c70341 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/jni91/Makefile b/test/java/foundation/pEp/jniadapter/test/jni91/Makefile index d9a904c..e2f5fb6 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/jni92/Makefile b/test/java/foundation/pEp/jniadapter/test/jni92/Makefile index 290268b..745f3a3 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/jni94/Makefile b/test/java/foundation/pEp/jniadapter/test/jni94/Makefile index 1d3819a..9c7363b 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/jni96/Makefile b/test/java/foundation/pEp/jniadapter/test/jni96/Makefile index 101e87d..14cc8f6 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/jni98/Makefile b/test/java/foundation/pEp/jniadapter/test/jni98/Makefile index 0243a27..903216b 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/regression/Makefile b/test/java/foundation/pEp/jniadapter/test/regression/Makefile index 2271f45..56226c4 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/speedtest/Makefile b/test/java/foundation/pEp/jniadapter/test/speedtest/Makefile index 9b9204d..8506bd1 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAlice/Makefile index 5a4c801..e0799fa 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAliceBob/Makefile index ceb822f..7cb17b3 100644 --- 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) diff --git a/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile b/test/java/foundation/pEp/jniadapter/test/templateAliceBobCarol/Makefile index 644a79e..63cc519 100644 --- 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) diff --git a/test/java/foundation/pEp/pitytest/Makefile b/test/java/foundation/pEp/pitytest/Makefile index bb49978..203bfab 100644 --- 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)