Changeset 35310 for main/trunk


Ignore:
Timestamp:
2021-08-18T11:50:50+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/greenstone3/src/packages/javagdbm
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/src/packages/javagdbm/java/Makefile.in

    r33943 r35310  
    66#JAR = $(JAVA_HOME)/bin/jar
    77JAVAC = @JAVAC@
    8 JAVAH = javah
     8# 'javah' has been deprecated since JDK1.6, Makefile rules below now use 'javac -h'
     9#JAVAH = javah
    910JAR = jar
    1011
    … …  
    2223compile: setup
    2324    $(JAVAC) -d $(JAVACLASSDIR) -sourcepath $(JAVASRCDIR) $(JAVACOPTIONS) au/com/pharos/*/*.java
    24     @echo Checking for javah ...
    25     $(eval found = $(shell which javah 2>/dev/null | wc -l))
    26     @if test "$(found)" = "1" ; then \
    27       echo ... found ; \
    28       echo javah -o $(JAVAGDBMHOME)/jni/GdbmFile.h -classpath $(JAVACLASSPATH) au.com.pharos.gdbm.GdbmFile ; \
    29       javah -o $(JAVAGDBMHOME)/jni/GdbmFile.h -classpath $(JAVACLASSPATH) au.com.pharos.gdbm.GdbmFile ; \
    30     else \
    31       echo ... not found => using 'javac -h' ; \
    32       echo $(JAVAC) -h $(JAVAGDBMHOME)/jni -classpath $(JAVACLASSPATH) -d java au/com/pharos/gdbm/GdbmFile.java ; \
    33       $(JAVAC) -h $(JAVAGDBMHOME)/jni -classpath $(JAVACLASSPATH) -d java au/com/pharos/gdbm/GdbmFile.java ; \
    34     fi
     25    $(JAVAC) -h $(JAVAGDBMHOME)/jni -classpath $(JAVACLASSPATH) -d java au/com/pharos/gdbm/GdbmFile.java
     26#   @echo Checking for javah ...
     27#   $(eval found = $(shell which javah 2>/dev/null | wc -l))
     28#   @if test "$(found)" = "1" ; then \
     29#     echo ... found ; \
     30#     echo javah -o $(JAVAGDBMHOME)/jni/GdbmFile.h -classpath $(JAVACLASSPATH) au.com.pharos.gdbm.GdbmFile ; \
     31#     javah -o $(JAVAGDBMHOME)/jni/GdbmFile.h -classpath $(JAVACLASSPATH) au.com.pharos.gdbm.GdbmFile ; \
     32#   else \
     33#     echo ... not found => using 'javac -h' ; \
     34#     echo $(JAVAC) -h $(JAVAGDBMHOME)/jni -classpath $(JAVACLASSPATH) -d java au/com/pharos/gdbm/GdbmFile.java ; \
     35#     $(JAVAC) -h $(JAVAGDBMHOME)/jni -classpath $(JAVACLASSPATH) -d java au/com/pharos/gdbm/GdbmFile.java ; \
     36#   fi
    3537    jar cf $(JAVAGDBMHOME)/javagdbm.jar -C $(JAVACLASSDIR) au
    3638

  • main/trunk/greenstone3/src/packages/javagdbm/jni/Makefile.in

    r26711 r35310  
    5353
    5454# no easy way to tell if a class file has changed or not
    55 #GdbmFile.h:
    56 #   $(javah) -o GdbmFile.h -jni $(PKG).GdbmFile
     55#
     56# Note, 'javah' has been deprecated since JDK1.6, Makefile rules below now use 'javac -h'
     57# So if bringing back this rule for some reason, then needs to be expressed differently
     58#
     59##GdbmFile.h:
     60##  $(javah) -o GdbmFile.h -jni $(PKG).GdbmFile
    5761
    5862clean: 
Note: See TracChangeset for help on using the changeset viewer.