Changeset 29155 for main/trunk/greenstone2

Timestamp:

2014-07-17T19:26:19+12:00 (10 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

File:

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

main/trunk/greenstone2/common-src/indexers/lucene-gs/winMake.bat

@@ -2 +2 @@
 
 set LUCENEHOME=.
+
+set LUCENE_VER=4.7.2
 
 rem ---- Where to put class files ----
@@ -19 +21 @@
 :: Note that both jar file lists need to be modified simultaneously when the jar dependencies are changed
 set 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
-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
+set LUCENE3_JAR=.\lib\lucene-core-3.3.0.jar
 
-set LUCENE3_JAR=.\lib\lucene-core-3.3.0.jar
+set MYCLASSPATH4=%LUCENE4_JAR%;%JAVACLASSDIR4%
 set MYCLASSPATH3=%LUCENE3_JAR%;%JAVACLASSDIR3%
 
-
-set MYCLASSPATH4=%LUCENE4_JAR%;%JAVACLASSDIR4%
 
 if "%DEBUG%" == "" (
@@ -52 +52 @@
        goto done
 
-rem %UNJAR_LUCENE4_JAR%
 :all
     if not exist %JAVACLASSDIR4% mkdir %JAVACLASSDIR4%
     echo Compiling Greenstone Lucene version 4.x Java classes ...
     %JAVAC% -d %JAVACLASSDIR4% -classpath %MYCLASSPATH4% %JAVACOPTIONS% -sourcepath src src\org\greenstone\LuceneWrapper4\*.java
-    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 ..
-    %JAR% cf LuceneWrapper4.jar -C %JAVACLASSDIR4% .
+    pushd %JAVACLASSDIR4% 
+    for %%G in (..\lib\lucene4\*%LUCENE_VER%.jar) do %JAR% xf %%G
+    popd
+    %JAR% cf LuceneWrapper4.jar -C %JAVACLASSDIR4% .    
     goto done