Show
Ignore:
Timestamp:
17.07.2014 19:26:19 (5 years ago)
Author:
ak19
Message:

Making the windows winMake.bat that creates the Lucene4Wrapper.jar more like the linux one, by using a for statement to include the jar files in the Make All target that generates the jar

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/common-src/indexers/lucene-gs/winMake.bat

    r29154 r29155  
    22 
    33set LUCENEHOME=. 
     4 
     5set LUCENE_VER=4.7.2 
    46 
    57rem ---- Where to put class files ---- 
     
    1921:: Note that both jar file lists need to be modified simultaneously when the jar dependencies are changed 
    2022set LUCENE4_JAR=.\lib\lucene4\lucene-core-4.7.2.jar;.\lib\lucene4\lucene-analyzers-common-4.7.2.jar;.\lib\lucene4\lucene-analyzers-kuromoji-4.7.2.jar;.\lib\lucene4\lucene-queryparser-4.7.2.jar 
    21 rem set UNJAR_LUCENE4_JAR=%JAR% xf ..\lib\lucene4\lucene-core-4.7.2.jar && %JAR% xf ..\lib\lucene4\lucene-analyzers-common-4.7.2.jar && %JAR% xf ..\lib\lucene4\lucene-analyzers-kuromoji-4.7.2.jar %JAR% xf ..\lib\lucene4\lucene-queryparser-4.7.2.jar 
     23set LUCENE3_JAR=.\lib\lucene-core-3.3.0.jar 
    2224 
    23 set LUCENE3_JAR=.\lib\lucene-core-3.3.0.jar 
     25set MYCLASSPATH4=%LUCENE4_JAR%;%JAVACLASSDIR4% 
    2426set MYCLASSPATH3=%LUCENE3_JAR%;%JAVACLASSDIR3% 
    2527 
    26  
    27 set MYCLASSPATH4=%LUCENE4_JAR%;%JAVACLASSDIR4% 
    2828 
    2929if "%DEBUG%" == "" ( 
     
    5252       goto done 
    5353 
    54 rem %UNJAR_LUCENE4_JAR% 
    5554:all 
    5655    if not exist %JAVACLASSDIR4% mkdir %JAVACLASSDIR4% 
    5756    echo Compiling Greenstone Lucene version 4.x Java classes ... 
    5857    %JAVAC% -d %JAVACLASSDIR4% -classpath %MYCLASSPATH4% %JAVACOPTIONS% -sourcepath src src\org\greenstone\LuceneWrapper4\*.java 
    59     cd %JAVACLASSDIR4% && %JAR% xf ..\lib\lucene4\lucene-core-4.7.2.jar && %JAR% xf ..\lib\lucene4\lucene-analyzers-common-4.7.2.jar && %JAR% xf ..\lib\lucene4\lucene-analyzers-kuromoji-4.7.2.jar %JAR% xf ..\lib\lucene4\lucene-queryparser-4.7.2.jar && cd .. 
    60     %JAR% cf LuceneWrapper4.jar -C %JAVACLASSDIR4% . 
     58    pushd %JAVACLASSDIR4%  
     59    for %%G in (..\lib\lucene4\*%LUCENE_VER%.jar) do %JAR% xf %%G 
     60    popd 
     61    %JAR% cf LuceneWrapper4.jar -C %JAVACLASSDIR4% .     
    6162    goto done 
    6263