Changeset 29147 for main/trunk/greenstone2

Timestamp:

2014-07-16T21:31:39+12:00 (10 years ago)

Author:

ak19

Message:

Part of port from lucene3.3.0 to lucene4.7.2. Updating common-src makefiles to use LuceneWrapper4 instead of LuceneWrapper3.

Location:

main/trunk/greenstone2/common-src

Files:

• Makefile.in (modified) (2 diffs)
• win32.mak (modified) (1 diff)

main/trunk/greenstone2/common-src/Makefile.in

@@ -106 +106 @@
       (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     done
-    if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar; then \
-      cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar ../bin/java/.; \
+    if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper4.jar; then \
+      cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper4.jar ../bin/java/.; \
     fi
     for idir in $(INSTALLDIRS); do \
@@ -119 +119 @@
       (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \
     done
-    if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar; then \
-      cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar ../bin/java/.; \
+    if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper4.jar; then \
+      cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper4.jar ../bin/java/.; \
     fi
     for odir in $(COMPILEDIRS) $(MODULEDIRS); do \

main/trunk/greenstone2/common-src/win32.mak

@@ -286 +286 @@
     for %%i in (bin\*.exe) do \
       if exist %%i copy %%i "$(GSDLHOME)\bin\windows"
-    if EXIST "lucene-gs\LuceneWrapper3.jar" copy "lucene-gs\LuceneWrapper3.jar" "$(GSDLHOME)\bin\java"
-    @if NOT EXIST "lucene-gs\LuceneWrapper3.jar" echo Warning: Failed to find lucene-gs\LuceneWrapper3.jar. Greenstone will not be able to use Lucene for indexing
+    if EXIST "lucene-gs\LuceneWrapper4.jar" copy "lucene-gs\LuceneWrapper4.jar" "$(GSDLHOME)\bin\java"
+    @if NOT EXIST "lucene-gs\LuceneWrapper4.jar" echo Warning: Failed to find lucene-gs\LuceneWrapper4.jar. Greenstone will not be able to use Lucene for indexing
     cd "$(GSDLHOME)"