Changeset 35385

Timestamp:

2021-09-14T12:08:55+12:00 (3 years ago)

Author:

kjdon

Message:

add JAVACFLAGS back in - source and target have been updated to 1.6 (and soon to go to 1.8), so lucene works with these now. We need to make sure all compiled java code is the same version. Also added delete all classes from LuceneWrapper4 dir under a make clean - otherwise you end up with some inner compiled classes with a wrong version if you do a make clean then change the java version

File:

• main/trunk/greenstone2/common-src/indexers/lucene-gs/Makefile.in (modified) (3 diffs)

main/trunk/greenstone2/common-src/indexers/lucene-gs/Makefile.in

@@ -51 +51 @@
 LUCENE3_WRAPPER_JAR = LuceneWrapper3.jar
 
-# For now, drop using JAVACFLAGS in compile line, as it typically sets
-# source and target to 1.4, only Lucene 3.x needs version 1.5 or higher
 classes4/org/greenstone/LuceneWrapper4/%.class: src/org/greenstone/LuceneWrapper4/%.java
 ifeq ($(GSDLOS),windows)
-    mkdir -p classes4 && $(JAVAC) $(JAVADEBUGFLAGS) -classpath "lib/lucene4/*;classes4;." -d classes4 -sourcepath src/ src/org/greenstone/LuceneWrapper4/$*.java
+    mkdir -p classes4 && $(JAVAC) $(JAVACFLAGS) $(JAVADEBUGFLAGS) -classpath "lib/lucene4/*;classes4;." -d classes4 -sourcepath src/ src/org/greenstone/LuceneWrapper4/$*.java
 else
-    mkdir -p classes4 && $(JAVAC) $(JAVADEBUGFLAGS) -classpath "lib/lucene4/*:classes4:." -d classes4 -sourcepath src/ src/org/greenstone/LuceneWrapper4/$*.java
+    mkdir -p classes4 && $(JAVAC) $(JAVACFLAGS) $(JAVADEBUGFLAGS) -classpath "lib/lucene4/*:classes4:." -d classes4 -sourcepath src/ src/org/greenstone/LuceneWrapper4/$*.java
 endif
 
@@ -72 +70 @@
 classes3/org/greenstone/LuceneWrapper3/%.class: src/org/greenstone/LuceneWrapper3/%.java
 ifeq ($(GSDLOS),windows)
-    mkdir -p classes3 && $(JAVAC) -classpath "$(LUCENE3_JAR);classes3;." -d classes3 -sourcepath src/ src/org/greenstone/LuceneWrapper3/$*.java
+    mkdir -p classes3 && $(JAVAC) $(JAVACFLAGS) -classpath "$(LUCENE3_JAR);classes3;." -d classes3 -sourcepath src/ src/org/greenstone/LuceneWrapper3/$*.java
 else
-    mkdir -p classes3 && $(JAVAC) -classpath $(LUCENE3_JAR):classes3:. -d classes3 -sourcepath src/ src/org/greenstone/LuceneWrapper3/$*.java
+    mkdir -p classes3 && $(JAVAC) $(JAVACFLAGS) -classpath $(LUCENE3_JAR):classes3:. -d classes3 -sourcepath src/ src/org/greenstone/LuceneWrapper3/$*.java
 endif
 
@@ -88 +86 @@
 clean:
     /bin/rm -f $(LUCENE4_WRAPPER_OBJECTS) $(LUCENE4_WRAPPER_JAR)
+    /bin/rm -f classes4/org/greenstone/LuceneWrapper4/*.class
     /bin/rm -f $(LUCENE3_WRAPPER_OBJECTS) $(LUCENE3_WRAPPER_JAR)
+    /bin/rm -f classes3/org/greenstone/LuceneWrapper3/*.class   
 
 distclean: clean