Changeset 29147

Show
Ignore:
Timestamp:
16.07.2014 21:31:39 (5 years ago)
Author:
ak19
Message:

Part of port from lucene3.3.0 to lucene4.7.2. Updating common-src makefiles to use LuceneWrapper?4 instead of LuceneWrapper?3.

Location:
main/trunk/greenstone2/common-src
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/Makefile.in

    r27330 r29147  
    106106      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    107107    done 
    108     if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar; then \ 
    109       cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar ../bin/java/.; \ 
     108    if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper4.jar; then \ 
     109      cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper4.jar ../bin/java/.; \ 
    110110    fi 
    111111    for idir in $(INSTALLDIRS); do \ 
     
    119119      (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 
    120120    done 
    121     if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar; then \ 
    122       cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar ../bin/java/.; \ 
     121    if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper4.jar; then \ 
     122      cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper4.jar ../bin/java/.; \ 
    123123    fi 
    124124    for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ 
  • main/trunk/greenstone2/common-src/win32.mak

    r27330 r29147  
    286286    for %%i in (bin\*.exe) do \ 
    287287      if exist %%i copy %%i "$(GSDLHOME)\bin\windows" 
    288     if EXIST "lucene-gs\LuceneWrapper3.jar" copy "lucene-gs\LuceneWrapper3.jar" "$(GSDLHOME)\bin\java" 
    289     @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 
     288    if EXIST "lucene-gs\LuceneWrapper4.jar" copy "lucene-gs\LuceneWrapper4.jar" "$(GSDLHOME)\bin\java" 
     289    @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 
    290290    cd "$(GSDLHOME)" 
    291291