Changeset 27330 for main/trunk
- Timestamp:
- 2013-05-14T11:17:21+12:00 (11 years ago)
- Location:
- main/trunk/greenstone2/common-src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone2/common-src/Makefile.in
r26164 r27330 106 106 (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 107 107 done 108 if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper .jar; then \109 cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper .jar ../bin/java/.; \108 if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar; then \ 109 cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar ../bin/java/.; \ 110 110 fi 111 111 for idir in $(INSTALLDIRS); do \ … … 119 119 (cd $$odir && $(MAKE) $(MDEFINES) $@) || exit 1; \ 120 120 done 121 if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper .jar; then \122 cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper .jar ../bin/java/.; \121 if test -e $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar; then \ 122 cp $(INDEXERSDIR)/lucene-gs/LuceneWrapper3.jar ../bin/java/.; \ 123 123 fi 124 124 for odir in $(COMPILEDIRS) $(MODULEDIRS); do \ -
main/trunk/greenstone2/common-src/indexers/lucene-gs/Makefile.in
r24732 r27330 3 3 JAR = jar 4 4 5 LUCENE_JAR = ./lib/lucene-core-2.3.2.jar6 5 LUCENE3_JAR = ./lib/lucene-core-3.3.0.jar 7 8 9 LUCENE_WRAPPER_OBJECTS = \10 classes/org/greenstone/LuceneWrapper/GS2Analyzer.class \11 classes/org/greenstone/LuceneWrapper/GS2IndexModifier.class \12 classes/org/greenstone/LuceneWrapper/GS2LuceneDelete.class \13 classes/org/greenstone/LuceneWrapper/GS2LuceneEditor.class \14 classes/org/greenstone/LuceneWrapper/GS2LuceneIndexer.class \15 classes/org/greenstone/LuceneWrapper/GS2LuceneQuery.class \16 classes/org/greenstone/LuceneWrapper/LuceneQueryResult.class17 6 18 7 LUCENE3_WRAPPER_OBJECTS = \ … … 27 16 classes3/org/greenstone/LuceneWrapper3/SharedSoleneQueryResult.class 28 17 29 LUCENE_WRAPPER_JAR = LuceneWrapper.jar30 31 18 LUCENE3_WRAPPER_JAR = LuceneWrapper3.jar 32 33 34 classes/org/greenstone/LuceneWrapper/%.class: src/org/greenstone/LuceneWrapper/%.java35 mkdir -p classes && $(JAVAC) $(JAVACFLAGS) -classpath $(LUCENE_JAR):classes:. -d classes -sourcepath src/ src/org/greenstone/LuceneWrapper/$*.java36 19 37 20 # For now, drop using JAVACFLAGS in compile line, as it typically sets … … 40 23 mkdir -p classes3 && $(JAVAC) -classpath $(LUCENE3_JAR):classes3:. -d classes3 -sourcepath src/ src/org/greenstone/LuceneWrapper3/$*.java 41 24 42 LuceneWrapper.jar: $(LUCENE_WRAPPER_OBJECTS)43 cd classes && jar xf ../$(LUCENE_JAR)44 $(JAR) cf $(LUCENE_WRAPPER_JAR) -C classes .45 46 25 LuceneWrapper3.jar: $(LUCENE3_WRAPPER_OBJECTS) 47 26 cd classes3 && jar xf ../$(LUCENE3_JAR) 48 27 $(JAR) cf $(LUCENE3_WRAPPER_JAR) -C classes3 . 49 28 50 all: $(LUCENE_WRAPPER_JAR) $(LUCENE3_WRAPPER_JAR) 51 29 all: $(LUCENE3_WRAPPER_JAR) 52 30 install: all 53 31 54 32 clean: 55 /bin/rm -f $(LUCENE_WRAPPER_OBJECTS) $(LUCENE_WRAPPER_JAR)56 33 /bin/rm -f $(LUCENE3_WRAPPER_OBJECTS) $(LUCENE3_WRAPPER_JAR) 57 34 58 35 distclean: clean 59 if test -e classes; then /bin/rm -r classes; fi60 if test -e $(LUCENE_WRAPPER_JAR); then /bin/rm -r $(LUCENE_WRAPPER_JAR); fi61 36 if test -e classes3; then /bin/rm -r classes3; fi 62 37 if test -e $(LUCENE3_WRAPPER_JAR); then /bin/rm -r $(LUCENE3_WRAPPER_JAR); fi -
main/trunk/greenstone2/common-src/indexers/lucene-gs/winMake.bat
r24746 r27330 4 4 5 5 rem ---- Where to put class files ---- 6 set JAVACLASSDIR=classes7 6 set JAVACLASSDIR3=classes3 8 7 … … 15 14 16 15 set JAVACOPTIONS=-deprecation -g -O 17 18 set LUCENE_JAR=.\lib\lucene-core-2.3.2.jar19 set MYCLASSPATH=%LUCENE_JAR%;%JAVACLASSDIR%20 16 21 17 set LUCENE3_JAR=.\lib\lucene-core-3.3.0.jar … … 38 34 39 35 :all 40 if not exist %JAVACLASSDIR% mkdir %JAVACLASSDIR%41 echo Compiling Greenstone Lucene version 2.x Java classes ...42 %JAVAC% -d %JAVACLASSDIR% -classpath %MYCLASSPATH% %JAVACOPTIONS% -sourcepath src src\org\greenstone\LuceneWrapper\*.java43 cd %JAVACLASSDIR%44 %JAR% xf ..\%LUCENE_JAR%45 cd ..46 %JAR% cf LuceneWrapper.jar -C %JAVACLASSDIR% .47 48 36 if not exist %JAVACLASSDIR3% mkdir %JAVACLASSDIR3% 49 37 echo Compiling Greenstone Lucene version 3.x Java classes ... … … 60 48 :clean 61 49 echo Cleaning up Greenstone Lucene ... 62 if exist %JAVACLASSDIR% rmdir /S /Q %JAVACLASSDIR%63 if exist LuceneWrapper.jar del LuceneWrapper.jar64 50 if exist %JAVACLASSDIR3% rmdir /S /Q %JAVACLASSDIR3% 65 51 if exist LuceneWrapper3.jar del LuceneWrapper3.jar -
main/trunk/greenstone2/common-src/win32.mak
r24880 r27330 286 286 for %%i in (bin\*.exe) do \ 287 287 if exist %%i copy %%i "$(GSDLHOME)\bin\windows" 288 if EXIST "lucene-gs\LuceneWrapper .jar" copy "lucene-gs\LuceneWrapper.jar" "$(GSDLHOME)\bin\java"289 @if NOT EXIST "lucene-gs\LuceneWrapper .jar" echo Warning: Failed to find lucene-gs\LuceneWrapper.jar. Greenstone will not be able to use Lucene for indexing288 if EXIST "lucene-gs\LuceneWrapper3.jar" copy "lucene-gs\LuceneWrapper3.jar" "$(GSDLHOME)\bin\java" 289 @if NOT EXIST "lucene-gs\LuceneWrapper3.jar" echo Warning: Failed to find lucene-gs\LuceneWrapper3.jar. Greenstone will not be able to use Lucene for indexing 290 290 cd "$(GSDLHOME)" 291 291
Note:
See TracChangeset
for help on using the changeset viewer.