Ignore:
Timestamp:
2024-04-03T12:16:36+13:00 (2 months ago)
Author:
kjdon
Message:

lets remove (comment out) the javah code, as we are committed to java 1.8 now.

Location:
main/trunk/greenstone2/common-src/indexers
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r36530 r38891  
    1515CXX = @CXX@
    1616JAVAC = @JAVAC@
    17 # 'javah' existed until JDK 1.7, transitional in JDK 1.8, then removed by JDK 1.9 (use 'javac -h' instead)
    18 # Makefile rules below test for 'javah' and use it if it found, otherwise runs with 'javac -h' version
    19 #
    20 # Since we're committed to JAVA_HOME being set, so jni.h header files can be found,
    21 # then we can lean on JAVA_HOME here to more precisely check for the existence of javah
    22 # within JAVA_HOME, and not accidentally pick up on another (older) JDK that is also
    23 # installed on the system, and does come with a 'javah' but is unlikely to be able
    24 # to cope with newer (e.g. JDK 11) version class files
    25 JAVAH = $(JAVA_HOME)/bin/javah
    2617JAR = jar
    2718CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
    … …  
    5748compile: setup
    5849    "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java
    59 #   "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java
    60 #   "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java
    61 #   $(eval found = $(shell which javah 2>/dev/null | wc -l))
    62     $(eval found = $(shell command -v $(JAVAH) | wc -l))
    63     if test "$(found)" = "1" ; then \
    64       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGWrapper ; \
    65       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGPassesWrapper ; \
    66     else \
    67       "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java ; \
    68       "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java ; \
    69     fi 
     50    "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java
     51    "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java
    7052    "$(JAR)" cf "$(MGHOME)/mg.jar" -C "$(JAVACLASSDIR)" org
    71 
    72 
    7353
    7454clean:
    … …  
    8161
    8262
     63# 'javah' existed until JDK 1.7, transitional in JDK 1.8, then removed by JDK 1.9 (use 'javac -h' instead)
     64# Since we are now committed to java 1.8, removing all the javah code
     65#JAVAH = $(JAVA_HOME)/bin/javah
     66
     67# the following was under the compile target
     68
     69#       #$(eval found = $(shell which javah 2>/dev/null | wc -l))
     70#   $(eval found = $(shell command -v $(JAVAH) | wc -l))
     71#   if test "$(found)" = "1" ; then \
     72#     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGWrapper ; \
     73#     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGPassesWrapper ; \
     74#   else \
     75#     "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java ; \
     76#     "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java ; \
     77#   fi 

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

    r36530 r38891  
    1515CXX = @CXX@
    1616JAVAC = @JAVAC@
    17 # 'javah' existed until JDK 1.7, transitional in JDK 1.8, then removed by JDK 1.9 (use 'javac -h' instead)
    18 # Makefile rules below test for 'javah' and use it if it found, otherwise runs with 'javac -h' version
    19 #
    20 # Since we're committed to JAVA_HOME being set, so jni.h header files can be found,
    21 # then we can lean on JAVA_HOME here to more precisely check for the existence of javah
    22 # within JAVA_HOME, and not accidentally pick up on another (older) JDK that is also
    23 # installed on the system, and does come with a 'javah' but is unlikely to be able
    24 # to cope with newer (e.g. JDK 11) version class files
    25 JAVAH = $(JAVA_HOME)/bin/javah
    2617JAR = jar
    2718CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
    … …  
    6152compile: setup
    6253    "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java
    63 #   "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java
    64 #   "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java
    65 #   "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java
    66 #   $(eval found = $(shell which javah 2>/dev/null | wc -l))
    67     $(eval found = $(shell command -v $(JAVAH) | wc -l))
    68     if test "$(found)" = "1" ; then \
    69       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper ; \
    70       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPSearchWrapper ; \
    71       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPRetrieveWrapper ; \
    72     else \
    73       "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java ; \
    74       "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java ; \
    75       "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java ; \
    76     fi
     54    "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java
     55    "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java
     56    "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java
    7757    "$(JAR)" cf "$(MGPPHOME)/mgpp.jar" -C "$(JAVACLASSDIR)" org
    7858clean:
    … …  
    8565
    8666
     67# 'javah' existed until JDK 1.7, transitional in JDK 1.8, then removed by JDK 1.9 (use 'javac -h' instead)
     68# Since we are now committed to java 1.8, removing all the javah code
     69#JAVAH = $(JAVA_HOME)/bin/javah
     70
     71# the following was under the compile target
     72#   #$(eval found = $(shell which javah 2>/dev/null | wc -l))
     73#   $(eval found = $(shell command -v $(JAVAH) | wc -l))
     74#   if test "$(found)" = "1" ; then \
     75#     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper ; \
     76#     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPSearchWrapper ; \
     77#     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPRetrieveWrapper ; \
     78#   else \
     79#     "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java ; \
     80#     "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java ; \
     81#     "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java ; \
     82#   fi
Note: See TracChangeset for help on using the changeset viewer.