Changeset 24732
- Timestamp:
- 2011-10-07T14:40:20+13:00 (13 years ago)
- Location:
- main/trunk/greenstone2/common-src/indexers/lucene-gs
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/indexers/lucene-gs/Makefile.in
r23356 r24732 4 4 5 5 LUCENE_JAR = ./lib/lucene-core-2.3.2.jar 6 LUCENE3_JAR = ./lib/lucene-core-3.3.0.jar 6 7 7 8 … … 13 14 classes/org/greenstone/LuceneWrapper/GS2LuceneIndexer.class \ 14 15 classes/org/greenstone/LuceneWrapper/GS2LuceneQuery.class \ 15 classes/org/greenstone/LuceneWrapper/LuceneQueryResult.class \ 16 classes/org/greenstone/LuceneWrapper/LuceneQueryResult.class 17 18 LUCENE3_WRAPPER_OBJECTS = \ 19 classes3/org/greenstone/LuceneWrapper3/GS2Analyzer.class \ 20 classes3/org/greenstone/LuceneWrapper3/GS2IndexModifier.class \ 21 classes3/org/greenstone/LuceneWrapper3/GS2LuceneDelete.class \ 22 classes3/org/greenstone/LuceneWrapper3/GS2LuceneEditor.class \ 23 classes3/org/greenstone/LuceneWrapper3/GS2LuceneIndexer.class \ 24 classes3/org/greenstone/LuceneWrapper3/GS2LuceneQuery.class \ 25 classes3/org/greenstone/LuceneWrapper3/LuceneQueryResult.class \ 26 classes3/org/greenstone/LuceneWrapper3/SharedSoleneQuery.class \ 27 classes3/org/greenstone/LuceneWrapper3/SharedSoleneQueryResult.class 16 28 17 29 LUCENE_WRAPPER_JAR = LuceneWrapper.jar 18 30 31 LUCENE3_WRAPPER_JAR = LuceneWrapper3.jar 19 32 20 classes/%.class: src/%.java 21 mkdir -p classes && $(JAVAC) $(JAVACFLAGS) -classpath $(LUCENE_JAR):classes:. -d classes -sourcepath src/ src/$*.java 33 34 classes/org/greenstone/LuceneWrapper/%.class: src/org/greenstone/LuceneWrapper/%.java 35 mkdir -p classes && $(JAVAC) $(JAVACFLAGS) -classpath $(LUCENE_JAR):classes:. -d classes -sourcepath src/ src/org/greenstone/LuceneWrapper/$*.java 36 37 # For now, drop using JAVACFLAGS in compile line, as it typically sets 38 # source and target to 1.4, only Lucene 3.x needsd version 1.5 or higher 39 classes3/org/greenstone/LuceneWrapper3/%.class: src/org/greenstone/LuceneWrapper3/%.java 40 mkdir -p classes3 && $(JAVAC) -classpath $(LUCENE3_JAR):classes3:. -d classes3 -sourcepath src/ src/org/greenstone/LuceneWrapper3/$*.java 22 41 23 42 LuceneWrapper.jar: $(LUCENE_WRAPPER_OBJECTS) … … 25 44 $(JAR) cf $(LUCENE_WRAPPER_JAR) -C classes . 26 45 27 all: $(LUCENE_WRAPPER_JAR) 46 LuceneWrapper3.jar: $(LUCENE3_WRAPPER_OBJECTS) 47 cd classes3 && jar xf ../$(LUCENE3_JAR) 48 $(JAR) cf $(LUCENE3_WRAPPER_JAR) -C classes3 . 28 49 29 install: $(LUCENE_WRAPPER_JAR) 50 all: $(LUCENE_WRAPPER_JAR) $(LUCENE3_WRAPPER_JAR) 51 52 install: all 30 53 31 54 clean: 32 55 /bin/rm -f $(LUCENE_WRAPPER_OBJECTS) $(LUCENE_WRAPPER_JAR) 56 /bin/rm -f $(LUCENE3_WRAPPER_OBJECTS) $(LUCENE3_WRAPPER_JAR) 33 57 34 58 distclean: clean 35 59 if test -e classes; then /bin/rm -r classes; fi 36 60 if test -e $(LUCENE_WRAPPER_JAR); then /bin/rm -r $(LUCENE_WRAPPER_JAR); fi 61 if test -e classes3; then /bin/rm -r classes3; fi 62 if test -e $(LUCENE3_WRAPPER_JAR); then /bin/rm -r $(LUCENE3_WRAPPER_JAR); fi -
main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper3/GS2LuceneQuery.java
r24726 r24732 41 41 import org.apache.lucene.search.BooleanQuery.TooManyClauses; 42 42 import org.apache.lucene.search.Filter; 43 import org.apache.lucene.search.Hit;44 import org.apache.lucene.search.Hits;45 43 import org.apache.lucene.search.IndexSearcher; 46 44 import org.apache.lucene.search.Query; -
main/trunk/greenstone2/common-src/indexers/lucene-gs/winMake.bat
r19524 r24732 5 5 rem ---- Where to put class files ---- 6 6 set JAVACLASSDIR=classes 7 set JAVACLASSDIR3=classes3 7 8 8 9 rem ---- Name and location of java programs ---- … … 17 18 set LUCENE_JAR=.\lib\lucene-core-2.3.2.jar 18 19 set MYCLASSPATH=%LUCENE_JAR%;%JAVACLASSDIR% 20 21 set LUCENE3_JAR=.\lib\lucene-core-3.3.0.jar 22 set MYCLASSPATH3=%LUCENE3_JAR%;%JAVACLASSDIR3% 19 23 20 24 if "%DEBUG%" == "" ( … … 35 39 :all 36 40 if not exist %JAVACLASSDIR% mkdir %JAVACLASSDIR% 37 echo Compiling Greenstone Lucene Java classes ...41 echo Compiling Greenstone Lucene version 2.x Java classes ... 38 42 %JAVAC% -d %JAVACLASSDIR% -classpath %MYCLASSPATH% %JAVACOPTIONS% -sourcepath src src\org\greenstone\LuceneWrapper\*.java 39 43 cd %JAVACLASSDIR% … … 41 45 cd .. 42 46 %JAR% cf LuceneWrapper.jar -C %JAVACLASSDIR% . 47 echo Compiling Greenstone Lucene version 3.x Java classes ... 48 %JAVAC% -d %JAVACLASSDIR3% -classpath %MYCLASSPATH3% %JAVACOPTIONS% -sourcepath src src\org\greenstone\LuceneWrapper3\*.java 49 cd %JAVACLASSDIR3% 50 %JAR% xf ..\%LUCENE3_JAR% 51 cd .. 52 %JAR% cf LuceneWrapper3.jar -C %JAVACLASSDIR3% . 43 53 goto done 44 54 … … 50 60 if exist %JAVACLASSDIR% rmdir /S /Q %JAVACLASSDIR% 51 61 if exist LuceneWrapper.jar del LuceneWrapper.jar 62 if exist %JAVACLASSDIR3% rmdir /S /Q %JAVACLASSDIR3% 63 if exist LuceneWrapper3.jar del LuceneWrapper3.jar 52 64 goto done 53 65
Note:
See TracChangeset
for help on using the changeset viewer.