Changeset 33927

Timestamp:

2020-02-15T14:57:35+13:00 (4 years ago)

Author:

davidb

Message:

Reworking of javah test

Location:

main/trunk/greenstone2/common-src/indexers

Files:

• mg/java/org/greenstone/mg/Makefile.in (modified) (1 diff)
• mgpp/java/org/greenstone/mgpp/Makefile.in (modified) (1 diff)

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

@@ -47 +47 @@
     mkdir -p $(JAVACLASSDIR)
 
-compilePreJDK8: setup
+compile: setup
     "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java
-    "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGWrapper
-    "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGPassesWrapper
-    "$(JAR)" cf "$(MGHOME)/mg.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 \
+        found=`which javah | wc -l`
+        if test "$(found)" = "1" ; then \
       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGWrapper ; \
       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGPassesWrapper ; \
     else \
-      "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGHOME)/jni" MGWrapper.java ; \
-      "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGHOME)/jni" MGPassesWrapper.java ; \
+      "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java ; \
+      "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java ; \
     fi  
     "$(JAR)" cf "$(MGHOME)/mg.jar" -C "$(JAVACLASSDIR)" org

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

@@ -51 +51 @@
     mkdir -p $(JAVACLASSDIR)
 
-compilePreJDK8: setup
-    "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java
-    "$(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   
-    "$(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 \
+        found=`which javah | wc -l`
+        if test "$(found)" = "1" ; then \
       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper ; \
       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPSearchWrapper ; \