Changeset 29154

Timestamp:

2014-07-17T18:27:08+12:00 (10 years ago)

Author:

ak19

Message:

Changes to get winMake.bat to compile lucene_gs, before further improgvements to this windows makefile

File:

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

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

@@ -14 +14 @@
 set JAR="%JAVA_HOME%\bin\jar"
 
-set JAVACOPTIONS=-deprecation -g -O
+::set JAVACOPTIONS=-deprecation -g -O
+set JAVACOPTIONS=
 
 :: 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 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
@@ -51 +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%
-    %UNJAR_LUCENE4_JAR%
-    cd ..
+    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% .
     goto done