Changeset 35309


Ignore:
Timestamp:
2021-08-18T11:50:25+12:00 (3 years ago)
Author:
davidb
Message:

Making javac default now source/target 1.6, rather than 1.4. This change was in response to 'javah' being deprecated. JNI is now down with 'javac -h' and to do that, you need to have at least a JDK 1.6 installed

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

    r33942 r35309  
    1515CXX = @CXX@
    1616JAVAC = @JAVAC@
    17 JAVAH = javah
     17# 'javah' has been deprecated since JDK1.6, Makefile rules below now use 'javac -h'
     18#JAVAH = javah
    1819JAR = jar
    1920CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
    … …  
    4950compile: setup
    5051    "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java
    51     $(eval found = $(shell which javah 2>/dev/null | wc -l))
    52     if test "$(found)" = "1" ; then \
    53       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGWrapper ; \
    54       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGPassesWrapper ; \
    55     else \
    56       "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java ; \
    57       "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java ; \
    58     fi 
     52    "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java
     53    "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java
     54#   $(eval found = $(shell which javah 2>/dev/null | wc -l))
     55#   if test "$(found)" = "1" ; then \
     56#     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGWrapper ; \
     57#     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGPassesWrapper ; \
     58#   else \
     59#     "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java ; \
     60#     "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java ; \
     61#   fi 
    5962    "$(JAR)" cf "$(MGHOME)/mg.jar" -C "$(JAVACLASSDIR)" org
    6063

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

    r33942 r35309  
    1515CXX = @CXX@
    1616JAVAC = @JAVAC@
    17 JAVAH = javah
     17# 'javah' has been deprecated since JDK1.6, Makefile rules below now use 'javac -h'
     18#JAVAH = javah
    1819JAR = jar
    1920CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX
    … …  
    5354compile: setup
    5455    "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java
    55     $(eval found = $(shell which javah 2>/dev/null | wc -l))
    56     if test "$(found)" = "1" ; then \
    57       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper ; \
    58       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPSearchWrapper ; \
    59       "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPRetrieveWrapper ; \
    60     else \
    61       "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java ; \
    62       "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java ; \
    63       "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java ; \
    64     fi
     56    "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java
     57    "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java
     58    "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java
     59#   $(eval found = $(shell which javah 2>/dev/null | wc -l))
     60#   if test "$(found)" = "1" ; then \
     61#     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper ; \
     62#     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPSearchWrapper ; \
     63#     "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPRetrieveWrapper ; \
     64#   else \
     65#     "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java ; \
     66#     "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java ; \
     67#     "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java ; \
     68#   fi
    6569    "$(JAR)" cf "$(MGPPHOME)/mgpp.jar" -C "$(JAVACLASSDIR)" org
    6670clean:
Note: See TracChangeset for help on using the changeset viewer.