Changeset 29215

Timestamp:

2014-08-18T14:26:31+12:00 (10 years ago)

Author:

ak19

Message:

Correction to changes in previous commit. The first time around, the META-INF folder does not yet exist. Tested.

File:

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

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

@@ -52 +52 @@
        goto done
 
+       
+rem http://stackoverflow.com/questions/138981/how-do-i-test-if-a-file-is-a-directory-in-a-batch-script
 :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
+    pushd %JAVACLASSDIR4% 
+    for %%G in (..\lib\lucene4\*%LUCENE_VER%.jar) do %JAR% xf %%G
+    popd    
     copy LICENSE.txt %JAVACLASSDIR4%\META-INF\LICENSE-LUCENE_WRAPPER.txt
     copy LICENSE-GPLv2.txt %JAVACLASSDIR4%\META-INF\.
     copy LICENSE-GPLv3.txt %JAVACLASSDIR4%\META-INF\.
-    pushd %JAVACLASSDIR4% 
-    for %%G in (..\lib\lucene4\*%LUCENE_VER%.jar) do %JAR% xf %%G
-    popd
     %JAR% cf LuceneWrapper4.jar -C %JAVACLASSDIR4% .    
     goto done