Changeset 35313 for main/trunk/greenstone2/common-src
- Timestamp:
- 2021-08-19T18:54:04+12:00 (3 years ago)
- 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
r35309 r35313 15 15 CXX = @CXX@ 16 16 JAVAC = @JAVAC@ 17 # 'javah' has been deprecated since JDK1.6, Makefile rules below now use 'javac -h' 18 #JAVAH = javah 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 JAVAH = javah 19 20 JAR = jar 20 21 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX … … 50 51 compile: setup 51 52 "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java 52 "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java53 "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java53 # "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java 54 # "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java 54 55 # $(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 56 $(eval found = $(shell command -v javah | wc -l)) 57 if test "$(found)" = "1" ; then \ 58 "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGWrapper ; \ 59 "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGHOME)/jni" org.greenstone.mg.MGPassesWrapper ; \ 60 else \ 61 "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGWrapper.java ; \ 62 "$(JAVAC)" -h "$(MGHOME)/jni" -classpath "$(JAVACLASSPATH)" MGPassesWrapper.java ; \ 63 fi 62 64 "$(JAR)" cf "$(MGHOME)/mg.jar" -C "$(JAVACLASSDIR)" org 63 65 -
main/trunk/greenstone2/common-src/indexers/mgpp/java/org/greenstone/mgpp/Makefile.in
r35309 r35313 15 15 CXX = @CXX@ 16 16 JAVAC = @JAVAC@ 17 # 'javah' has been deprecated since JDK1.6, Makefile rules below now use 'javac -h' 18 #JAVAH = javah 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 JAVAH = javah 19 20 JAR = jar 20 21 CFLAGS = @CFLAGS@ -ansi -DSILENT -DSHORT_SUFFIX … … 54 55 compile: setup 55 56 "$(JAVAC)" $(JAVACFLAGS) -d "$(JAVACLASSDIR)" -sourcepath "$(JAVASRCDIR)" $(JAVACOPTIONS) *.java 56 "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java57 "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java58 "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java57 # "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java 58 # "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java 59 # "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java 59 60 # $(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 61 $(eval found = $(shell command -v javah | wc -l)) 62 if test "$(found)" = "1" ; then \ 63 "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPPassesWrapper ; \ 64 "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPSearchWrapper ; \ 65 "$(JAVAH)" -classpath "$(JAVACLASSPATH)" -d "$(MGPPHOME)/jni" org.greenstone.mgpp.MGPPRetrieveWrapper ; \ 66 else \ 67 "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPPassesWrapper.java ; \ 68 "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPSearchWrapper.java ; \ 69 "$(JAVAC)" -classpath "$(JAVACLASSPATH)" -h "$(MGPPHOME)/jni" MGPPRetrieveWrapper.java ; \ 70 fi 69 71 "$(JAR)" cf "$(MGPPHOME)/mgpp.jar" -C "$(JAVACLASSDIR)" org 70 72 clean:
Note:
See TracChangeset
for help on using the changeset viewer.