Changeset 36530

Timestamp:

2022-08-29T13:17:21+12:00 (20 months ago)

Author:

davidb

Message:

Changed to a more careful way of determining whether javah (used in older JDKs) should be used or not. Need to do this in a way that doesn't accidentally pick up on an older system-wide installed JDK (that has a javah), given that we use JAVA_HOME to precisely determine which java/javac that should be used

Location:

main/trunk/greenstone2/common-src/indexers

Files:

• mg/java/org/greenstone/mg/Makefile.in (modified) (2 diffs)
• mgpp/java/org/greenstone/mgpp/Makefile.in (modified) (2 diffs)

main/trunk/greenstone2/common-src/indexers/mg/java/org/greenstone/mg/Makefile.in

@@ -17 +17 @@
 # 'javah' existed until JDK 1.7, transitional in JDK 1.8, then removed by JDK 1.9 (use 'javac -h' instead)
 # Makefile rules below test for 'javah' and use it if it found, otherwise runs with 'javac -h' version
-JAVAH = javah
+#
+# Since we're committed to JAVA_HOME being set, so jni.h header files can be found,
+# then we can lean on JAVA_HOME here to more precisely check for the existence of javah
+# within JAVA_HOME, and not accidentally pick up on another (older) JDK that is also
+# installed on the system, and does come with a 'javah' but is unlikely to be able
+# to cope with newer (e.g. JDK 11) version class files
+JAVAH = $(JAVA_HOME)/bin/javah
 JAR = jar
 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
@@ -54 +60 @@
 #   "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java
 #   $(eval found = $(shell which javah 2>/dev/null | wc -l))
-    $(eval found = $(shell command -v javah | wc -l))
+    $(eval found = $(shell command -v $(JAVAH) | wc -l))
     if test "$(found)" = "1" ; then \
       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGWrapper ; \

main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in

@@ -17 +17 @@
 # 'javah' existed until JDK 1.7, transitional in JDK 1.8, then removed by JDK 1.9 (use 'javac -h' instead)
 # Makefile rules below test for 'javah' and use it if it found, otherwise runs with 'javac -h' version
-JAVAH = javah
+#
+# Since we're committed to JAVA_HOME being set, so jni.h header files can be found,
+# then we can lean on JAVA_HOME here to more precisely check for the existence of javah
+# within JAVA_HOME, and not accidentally pick up on another (older) JDK that is also
+# installed on the system, and does come with a 'javah' but is unlikely to be able
+# to cope with newer (e.g. JDK 11) version class files
+JAVAH = $(JAVA_HOME)/bin/javah
 JAR = jar
 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
@@ -59 +65 @@
 #   "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java
 #   $(eval found = $(shell which javah 2>/dev/null | wc -l))
-    $(eval found = $(shell command -v javah | wc -l))
+    $(eval found = $(shell command -v $(JAVAH) | wc -l))
     if test "$(found)" = "1" ; then \
       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper ; \