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

Timestamp:

2020-02-14T18:11:22+13:00 (4 years ago)

Author:

davidb

Message:

Newer Java's don't have 'javah' any more. The functionality has been rolled into javac. MG/MG++ JNI Makefile updated to test for existence of javah and use it if it finds it, otherwise runs a 'javac -h' command

File:

• main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in (modified) (2 diffs)

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

@@ -51 +51 @@
     mkdir -p $(JAVACLASSDIR)
 
-compile: setup
+compilePreJDK8: setup
     "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java
     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper
@@ -58 +58 @@
     "$(JAR)" cf "$(MGPPHOME)/mgpp.jar" -C "$(JAVACLASSDIR)" org
 
+compile: setup
+    "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java
+    if test `javah -version >/dev/null 2>&1 ; echo $?` = 0 ; then \
+      "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper ; \
+      "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPSearchWrapper ; \
+      "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPRetrieveWrapper ; \
+    else \
+      "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java ; \
+      "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java ; \
+      "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java ; \
+    fi
+    "$(JAR)" cf "$(MGPPHOME)/mgpp.jar" -C "$(JAVACLASSDIR)" org
 clean:
     rm -rf "$(JAVACLASSDIR)" "$(MGPPHOME)/mgpp.jar" "$(MGPPHOME)/jni/org_greenstone_mgpp_MGPPSearchWrapper.h" "$(MGPPHOME)/jni/org_greenstone_mgpp_MGPPRetrieveWrapper.h" "$(MGPPHOME)/jni/org_greenstone_mgpp_MGPPPassesWrapper.h"