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

Timestamp:

2014-07-16T21:53:44+12:00 (10 years ago)

Author:

ak19

Message:

Part of port from lucene3.3.0 to lucene4.7.2. Related to LuceneWrapper. 1. Updating the lucene-gs makefiles to allow compiling up Lucene4Wrapper.jar or Lucene3Wrapper.jar. Only the Linux Makefile.in has been tested so far. 2. Adding in the jar files necessary for Lucene4Wrapper into the lib folder's new lucene4 subfolder. 3. Updating the Lucene src code to use lucene4.7.2 instead of lucene3.3.0.

File:

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

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

@@ -4 +4 @@
 
 rem ---- Where to put class files ----
+set JAVACLASSDIR4=classes4
 set JAVACLASSDIR3=classes3
 
@@ -15 +16 @@
 set JAVACOPTIONS=-deprecation -g -O
 
+:: Note that both jar file lists need to be modified simultaneously when the jar dependencies are changed
+set LUCENE4_JAR=.\lib\lucene-core-4.7.2.jar;.\lib\lucene-analyzers-common-4.7.2.jar;.\lib\lucene-analyzers-kuromoji-4.7.2.jar;.\lib\lucene-queryparser-4.7.2.jar
+set UNJAR_LUCENE4_JAR=%JAR% xf ..\lib\lucene-core-4.7.2.jar && %JAR% xf ..\lib\lucene-lucene-analyzers-common-4.7.2.jar && %JAR% xf ..\lib\lucene-analyzers-kuromoji-4.7.2.jar %JAR% xf ..\lib\lucene-queryparser-4.7.2.jar
+
 set LUCENE3_JAR=.\lib\lucene-core-3.3.0.jar
 set MYCLASSPATH3=%LUCENE3_JAR%;%JAVACLASSDIR3%
+
+
+set MYCLASSPATH4=%LUCENE4_JAR%;%JAVACLASSDIR4%
 
 if "%DEBUG%" == "" (
@@ -33 +41 @@
     goto done
 
+:lucene3
+       if not exist %JAVACLASSDIR3% mkdir %JAVACLASSDIR3%
+       echo Compiling Greenstone Lucene version 3.x Java classes ...
+       %JAVAC% -d %JAVACLASSDIR3% -classpath %MYCLASSPATH3% %JAVACOPTIONS% -sourcepath src src\org\greenstone\LuceneWrapper3\*.java
+       cd %JAVACLASSDIR3%
+       %JAR% xf ..\%LUCENE3_JAR%
+       cd ..
+       %JAR% cf LuceneWrapper3.jar -C %JAVACLASSDIR3% .
+       goto done
+
+
 :all
-    if not exist %JAVACLASSDIR3% mkdir %JAVACLASSDIR3%
-    echo Compiling Greenstone Lucene version 3.x Java classes ...
-    %JAVAC% -d %JAVACLASSDIR3% -classpath %MYCLASSPATH3% %JAVACOPTIONS% -sourcepath src src\org\greenstone\LuceneWrapper3\*.java
-    cd %JAVACLASSDIR3%
-    %JAR% xf ..\%LUCENE3_JAR%
+    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%
+    %UNJAR_LUCENE4_JAR%
     cd ..
-    %JAR% cf LuceneWrapper3.jar -C %JAVACLASSDIR3% .
+    %JAR% cf LuceneWrapper4.jar -C %JAVACLASSDIR4% .
     goto done
 
@@ -48 +67 @@
 :clean
     echo Cleaning up Greenstone Lucene ...
+    if exist %JAVACLASSDIR4% rmdir /S /Q %JAVACLASSDIR4%
+        if exist LuceneWrapper4.jar del LuceneWrapper4.jar
     if exist %JAVACLASSDIR3% rmdir /S /Q %JAVACLASSDIR3%
         if exist LuceneWrapper3.jar del LuceneWrapper3.jar