Menu
▾
▴
[Clucene-cvs] SF.net SVN: clucene:[3027] branches/lucene2_3_2
|
From: <ust...@us...> - 2010-08-24 15:01:10
|
Revision: 3027
http://clucene.svn.sourceforge.net/clucene/?rev=3027&view=rev
Author: ustramooner
Date: 2010-08-24 15:00:54 +0000 (Tue, 24 Aug 2010)
Log Message:
-----------
merged git master
Modified Paths:
--------------
branches/lucene2_3_2/CMakeLists.txt
branches/lucene2_3_2/COPYING
branches/lucene2_3_2/INSTALL
branches/lucene2_3_2/cmake/CreateClucenePackages.cmake
branches/lucene2_3_2/dist-test.sh
branches/lucene2_3_2/src/contribs/benchmarker/Benchmarker.cpp
branches/lucene2_3_2/src/contribs/benchmarker/Benchmarker.h
branches/lucene2_3_2/src/contribs/benchmarker/Main.cpp
branches/lucene2_3_2/src/contribs/benchmarker/TestCLString.cpp
branches/lucene2_3_2/src/contribs/benchmarker/TestCLString.h
branches/lucene2_3_2/src/contribs/benchmarker/Timer.h
branches/lucene2_3_2/src/contribs/benchmarker/Unit.cpp
branches/lucene2_3_2/src/contribs/benchmarker/Unit.h
branches/lucene2_3_2/src/contribs/benchmarker/stdafx.cpp
branches/lucene2_3_2/src/contribs/benchmarker/stdafx.h
branches/lucene2_3_2/src/contribs/contribs-lib-test/CMakeLists.txt
branches/lucene2_3_2/src/contribs/contribs-lib-test/TestAnalysis.cpp
branches/lucene2_3_2/src/contribs/contribs-lib-test/TestHighlight.cpp
branches/lucene2_3_2/src/contribs/contribs-lib-test/TestSnowball.cpp
branches/lucene2_3_2/src/contribs/contribs-lib-test/TestUtf8.cpp
branches/lucene2_3_2/src/contribs/contribs-lib-test/contribTests.cpp
branches/lucene2_3_2/src/contribs/contribs-lib-test/test.h
branches/lucene2_3_2/src/contribs/contribs-lib-test/testall.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.h
branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.h
branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/Highlighter.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/QueryTermExtractor.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/highlighter/TokenSources.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/Snowball.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/SnowballAnalyzer.h
branches/lucene2_3_2/src/contribs-lib/CLucene/snowball/SnowballFilter.h
branches/lucene2_3_2/src/contribs-lib/CMakeLists.txt
branches/lucene2_3_2/src/core/CLucene/CLConfig.h
branches/lucene2_3_2/src/core/CLucene/CLMonolithic.cpp
branches/lucene2_3_2/src/core/CLucene/StdHeader.cpp
branches/lucene2_3_2/src/core/CLucene/analysis/AnalysisHeader.cpp
branches/lucene2_3_2/src/core/CLucene/analysis/AnalysisHeader.h
branches/lucene2_3_2/src/core/CLucene/analysis/Analyzers.cpp
branches/lucene2_3_2/src/core/CLucene/analysis/standard/StandardAnalyzer.cpp
branches/lucene2_3_2/src/core/CLucene/analysis/standard/StandardAnalyzer.h
branches/lucene2_3_2/src/core/CLucene/analysis/standard/StandardTokenizer.cpp
branches/lucene2_3_2/src/core/CLucene/analysis/standard/StandardTokenizer.h
branches/lucene2_3_2/src/core/CLucene/debug/error.cpp
branches/lucene2_3_2/src/core/CLucene/debug/error.h
branches/lucene2_3_2/src/core/CLucene/debug/lucenebase.h
branches/lucene2_3_2/src/core/CLucene/debug/mem.h
branches/lucene2_3_2/src/core/CLucene/document/DateTools.cpp
branches/lucene2_3_2/src/core/CLucene/document/DateTools.h
branches/lucene2_3_2/src/core/CLucene/document/Document.h
branches/lucene2_3_2/src/core/CLucene/document/Field.cpp
branches/lucene2_3_2/src/core/CLucene/document/Field.h
branches/lucene2_3_2/src/core/CLucene/document/FieldSelector.cpp
branches/lucene2_3_2/src/core/CLucene/document/FieldSelector.h
branches/lucene2_3_2/src/core/CLucene/document/NumberTools.cpp
branches/lucene2_3_2/src/core/CLucene/document/NumberTools.h
branches/lucene2_3_2/src/core/CLucene/index/CompoundFile.cpp
branches/lucene2_3_2/src/core/CLucene/index/DirectoryIndexReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/DirectoryIndexReader.h
branches/lucene2_3_2/src/core/CLucene/index/DocumentsWriter.cpp
branches/lucene2_3_2/src/core/CLucene/index/DocumentsWriterThreadState.cpp
branches/lucene2_3_2/src/core/CLucene/index/FieldsReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexDeletionPolicy.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexDeletionPolicy.h
branches/lucene2_3_2/src/core/CLucene/index/IndexFileDeleter.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexFileNameFilter.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexFileNames.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexModifier.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexModifier.h
branches/lucene2_3_2/src/core/CLucene/index/IndexReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexReader.h
branches/lucene2_3_2/src/core/CLucene/index/IndexWriter.cpp
branches/lucene2_3_2/src/core/CLucene/index/IndexWriter.h
branches/lucene2_3_2/src/core/CLucene/index/MergePolicy.cpp
branches/lucene2_3_2/src/core/CLucene/index/MergePolicy.h
branches/lucene2_3_2/src/core/CLucene/index/MergeScheduler.h
branches/lucene2_3_2/src/core/CLucene/index/MultiReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/MultiReader.h
branches/lucene2_3_2/src/core/CLucene/index/MultiSegmentReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/MultipleTermPositions.cpp
branches/lucene2_3_2/src/core/CLucene/index/MultipleTermPositions.h
branches/lucene2_3_2/src/core/CLucene/index/SegmentInfos.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentMergeInfo.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentMergeQueue.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentMerger.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentTermDocs.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentTermEnum.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentTermPositions.cpp
branches/lucene2_3_2/src/core/CLucene/index/SegmentTermVector.cpp
branches/lucene2_3_2/src/core/CLucene/index/SkipListReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/Term.cpp
branches/lucene2_3_2/src/core/CLucene/index/Term.h
branches/lucene2_3_2/src/core/CLucene/index/TermInfosReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/TermInfosWriter.cpp
branches/lucene2_3_2/src/core/CLucene/index/TermVectorReader.cpp
branches/lucene2_3_2/src/core/CLucene/index/Terms.cpp
branches/lucene2_3_2/src/core/CLucene/index/Terms.h
branches/lucene2_3_2/src/core/CLucene/index/_CompoundFile.h
branches/lucene2_3_2/src/core/CLucene/index/_DocumentsWriter.h
branches/lucene2_3_2/src/core/CLucene/index/_FieldsReader.h
branches/lucene2_3_2/src/core/CLucene/index/_FieldsWriter.h
branches/lucene2_3_2/src/core/CLucene/index/_IndexFileNames.h
branches/lucene2_3_2/src/core/CLucene/index/_MultiSegmentReader.h
branches/lucene2_3_2/src/core/CLucene/index/_SegmentHeader.h
branches/lucene2_3_2/src/core/CLucene/index/_SegmentInfos.h
branches/lucene2_3_2/src/core/CLucene/index/_SegmentMergeInfo.h
branches/lucene2_3_2/src/core/CLucene/index/_SegmentTermEnum.h
branches/lucene2_3_2/src/core/CLucene/index/_Term.h
branches/lucene2_3_2/src/core/CLucene/index/_TermInfosReader.h
branches/lucene2_3_2/src/core/CLucene/index/_TermInfosWriter.h
branches/lucene2_3_2/src/core/CLucene/queryParser/FastCharStream.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/MultiFieldQueryParser.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParser.h
branches/lucene2_3_2/src/core/CLucene/queryParser/QueryParserTokenManager.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/QueryToken.cpp
branches/lucene2_3_2/src/core/CLucene/queryParser/legacy/QueryParserBase.cpp
branches/lucene2_3_2/src/core/CLucene/search/BooleanQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/BooleanQuery.h
branches/lucene2_3_2/src/core/CLucene/search/BooleanScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/BooleanScorer2.cpp
branches/lucene2_3_2/src/core/CLucene/search/CachingWrapperFilter.cpp
branches/lucene2_3_2/src/core/CLucene/search/CachingWrapperFilter.h
branches/lucene2_3_2/src/core/CLucene/search/ChainedFilter.cpp
branches/lucene2_3_2/src/core/CLucene/search/ConjunctionScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/ConstantScoreQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/ConstantScoreQuery.h
branches/lucene2_3_2/src/core/CLucene/search/DateFilter.cpp
branches/lucene2_3_2/src/core/CLucene/search/DateFilter.h
branches/lucene2_3_2/src/core/CLucene/search/DisjunctionSumScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/Explanation.cpp
branches/lucene2_3_2/src/core/CLucene/search/Explanation.h
branches/lucene2_3_2/src/core/CLucene/search/FieldCacheImpl.cpp
branches/lucene2_3_2/src/core/CLucene/search/FilteredTermEnum.cpp
branches/lucene2_3_2/src/core/CLucene/search/FilteredTermEnum.h
branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/FuzzyQuery.h
branches/lucene2_3_2/src/core/CLucene/search/Hits.h
branches/lucene2_3_2/src/core/CLucene/search/IndexSearcher.cpp
branches/lucene2_3_2/src/core/CLucene/search/IndexSearcher.h
branches/lucene2_3_2/src/core/CLucene/search/MatchAllDocsQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/MatchAllDocsQuery.h
branches/lucene2_3_2/src/core/CLucene/search/MultiPhraseQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/MultiPhraseQuery.h
branches/lucene2_3_2/src/core/CLucene/search/MultiSearcher.cpp
branches/lucene2_3_2/src/core/CLucene/search/MultiSearcher.h
branches/lucene2_3_2/src/core/CLucene/search/MultiTermQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/MultiTermQuery.h
branches/lucene2_3_2/src/core/CLucene/search/PhraseQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/PhraseQuery.h
branches/lucene2_3_2/src/core/CLucene/search/PhraseScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/PrefixQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/PrefixQuery.h
branches/lucene2_3_2/src/core/CLucene/search/Query.h
branches/lucene2_3_2/src/core/CLucene/search/QueryFilter.cpp
branches/lucene2_3_2/src/core/CLucene/search/RangeFilter.cpp
branches/lucene2_3_2/src/core/CLucene/search/RangeQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/RangeQuery.h
branches/lucene2_3_2/src/core/CLucene/search/Scorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/SearchHeader.cpp
branches/lucene2_3_2/src/core/CLucene/search/Searchable.h
branches/lucene2_3_2/src/core/CLucene/search/Similarity.cpp
branches/lucene2_3_2/src/core/CLucene/search/Similarity.h
branches/lucene2_3_2/src/core/CLucene/search/TermQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/TermQuery.h
branches/lucene2_3_2/src/core/CLucene/search/TermScorer.cpp
branches/lucene2_3_2/src/core/CLucene/search/WildcardQuery.cpp
branches/lucene2_3_2/src/core/CLucene/search/WildcardQuery.h
branches/lucene2_3_2/src/core/CLucene/search/WildcardTermEnum.cpp
branches/lucene2_3_2/src/core/CLucene/search/WildcardTermEnum.h
branches/lucene2_3_2/src/core/CLucene/search/_DisjunctionSumScorer.h
branches/lucene2_3_2/src/core/CLucene/store/Directory.cpp
branches/lucene2_3_2/src/core/CLucene/store/Directory.h
branches/lucene2_3_2/src/core/CLucene/store/FSDirectory.cpp
branches/lucene2_3_2/src/core/CLucene/store/FSDirectory.h
branches/lucene2_3_2/src/core/CLucene/store/IndexInput.cpp
branches/lucene2_3_2/src/core/CLucene/store/IndexInput.h
branches/lucene2_3_2/src/core/CLucene/store/IndexOutput.cpp
branches/lucene2_3_2/src/core/CLucene/store/IndexOutput.h
branches/lucene2_3_2/src/core/CLucene/store/Lock.cpp
branches/lucene2_3_2/src/core/CLucene/store/Lock.h
branches/lucene2_3_2/src/core/CLucene/store/LockFactory.cpp
branches/lucene2_3_2/src/core/CLucene/store/LockFactory.h
branches/lucene2_3_2/src/core/CLucene/store/MMapInput.cpp
branches/lucene2_3_2/src/core/CLucene/store/RAMDirectory.cpp
branches/lucene2_3_2/src/core/CLucene/store/_Lock.h
branches/lucene2_3_2/src/core/CLucene/store/_RAMDirectory.h
branches/lucene2_3_2/src/core/CLucene/util/Array.h
branches/lucene2_3_2/src/core/CLucene/util/BitSet.cpp
branches/lucene2_3_2/src/core/CLucene/util/CLStreams.h
branches/lucene2_3_2/src/core/CLucene/util/Equators.h
branches/lucene2_3_2/src/core/CLucene/util/PriorityQueue.h
branches/lucene2_3_2/src/core/CLucene/util/Reader.cpp
branches/lucene2_3_2/src/core/CLucene/util/StringIntern.cpp
branches/lucene2_3_2/src/core/CLucene/util/ThreadLocal.cpp
branches/lucene2_3_2/src/core/CLucene/util/VoidList.h
branches/lucene2_3_2/src/core/CLucene/util/_bufferedstream.h
branches/lucene2_3_2/src/core/CLucene/util/_streambase.h
branches/lucene2_3_2/src/core/CLucene/util/_streambuffer.h
branches/lucene2_3_2/src/core/CMakeLists.txt
branches/lucene2_3_2/src/core/files_list.txt
branches/lucene2_3_2/src/shared/CLucene/LuceneThreads.h
branches/lucene2_3_2/src/shared/CLucene/SharedHeader.cpp
branches/lucene2_3_2/src/shared/CLucene/SharedHeader.h
branches/lucene2_3_2/src/shared/CLucene/_SharedHeader.h
branches/lucene2_3_2/src/shared/CLucene/clucene-config.h.cmake
branches/lucene2_3_2/src/shared/CLucene/config/_threads.h
branches/lucene2_3_2/src/shared/CLucene/config/repl_tprintf.cpp
branches/lucene2_3_2/src/shared/CLucene/config/threads.cpp
branches/lucene2_3_2/src/shared/CLucene/config/utf8.cpp
branches/lucene2_3_2/src/shared/CLucene/util/Misc.cpp
branches/lucene2_3_2/src/shared/CLucene/util/Misc.h
branches/lucene2_3_2/src/shared/CLucene/util/StringBuffer.cpp
branches/lucene2_3_2/src/shared/CMakeLists.txt
branches/lucene2_3_2/src/shared/README
branches/lucene2_3_2/src/shared/cmake/MacroCheckGccVisibility.cmake
branches/lucene2_3_2/src/test/CLMonolithic_Test.cpp
branches/lucene2_3_2/src/test/CMakeLists.txt
branches/lucene2_3_2/src/test/analysis/TestAnalyzers.cpp
branches/lucene2_3_2/src/test/document/TestDateTools.cpp
branches/lucene2_3_2/src/test/index/TestHighFreqTerms.cpp
branches/lucene2_3_2/src/test/index/TestIndexModifier.cpp
branches/lucene2_3_2/src/test/index/TestIndexReader.cpp
branches/lucene2_3_2/src/test/index/TestIndexWriter.cpp
branches/lucene2_3_2/src/test/index/TestReuters.cpp
branches/lucene2_3_2/src/test/index/TestThreading.cpp
branches/lucene2_3_2/src/test/index/TestUtf8.cpp
branches/lucene2_3_2/src/test/queryParser/TestMultiFieldQueryParser.cpp
branches/lucene2_3_2/src/test/queryParser/TestQueryParser.cpp
branches/lucene2_3_2/src/test/search/TestBoolean.cpp
branches/lucene2_3_2/src/test/search/TestDateFilter.cpp
branches/lucene2_3_2/src/test/search/TestQueries.cpp
branches/lucene2_3_2/src/test/search/TestRangeFilter.cpp
branches/lucene2_3_2/src/test/search/TestSearch.cpp
branches/lucene2_3_2/src/test/search/TestSort.cpp
branches/lucene2_3_2/src/test/search/TestTermVector.cpp
branches/lucene2_3_2/src/test/search/TestWildcard.cpp
branches/lucene2_3_2/src/test/store/TestStore.cpp
branches/lucene2_3_2/src/test/test.h
branches/lucene2_3_2/src/test/testall.cpp
branches/lucene2_3_2/src/test/tests.cpp
Added Paths:
-----------
branches/lucene2_3_2/cmake/CLuceneBoost.cmake
branches/lucene2_3_2/src/core/CLucene/index/_IndexFileNameFilter.h
branches/lucene2_3_2/src/core/CLucene/store/BufferedIndexInput.cpp
branches/lucene2_3_2/src/core/CLucene/store/BufferedIndexInput.h
branches/lucene2_3_2/src/core/CLucene/store/BufferedIndexOutput.cpp
branches/lucene2_3_2/src/core/CLucene/store/BufferedIndexOutput.h
branches/lucene2_3_2/src/core/CLucene/store/MMapDirectory.cpp
branches/lucene2_3_2/src/core/CLucene/store/SharedHandle.cpp
branches/lucene2_3_2/src/core/CLucene/store/_FSDirectory.h
branches/lucene2_3_2/src/core/CLucene/store/_MMapDirectory.h
branches/lucene2_3_2/src/core/CLucene/store/_MMapIndexInput.h
branches/lucene2_3_2/src/core/CLucene/store/_SharedHandle.h
branches/lucene2_3_2/src/core/libclucene-core.pc.cmake
branches/lucene2_3_2/src/ext/
branches/lucene2_3_2/src/ext/CMakeLists.txt
branches/lucene2_3_2/src/ext/boost/
branches/lucene2_3_2/src/ext/boost/assert.hpp
branches/lucene2_3_2/src/ext/boost/checked_delete.hpp
branches/lucene2_3_2/src/ext/boost/config/
branches/lucene2_3_2/src/ext/boost/config/abi/
branches/lucene2_3_2/src/ext/boost/config/abi/borland_prefix.hpp
branches/lucene2_3_2/src/ext/boost/config/abi/borland_suffix.hpp
branches/lucene2_3_2/src/ext/boost/config/abi/msvc_prefix.hpp
branches/lucene2_3_2/src/ext/boost/config/abi/msvc_suffix.hpp
branches/lucene2_3_2/src/ext/boost/config/abi_prefix.hpp
branches/lucene2_3_2/src/ext/boost/config/abi_suffix.hpp
branches/lucene2_3_2/src/ext/boost/config/auto_link.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/
branches/lucene2_3_2/src/ext/boost/config/compiler/borland.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/codegear.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/comeau.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/common_edg.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/compaq_cxx.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/digitalmars.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/gcc.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/gcc_xml.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/greenhills.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/hp_acc.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/intel.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/kai.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/metrowerks.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/mpw.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/pgi.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/sgi_mipspro.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/sunpro_cc.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/vacpp.hpp
branches/lucene2_3_2/src/ext/boost/config/compiler/visualc.hpp
branches/lucene2_3_2/src/ext/boost/config/no_tr1/
branches/lucene2_3_2/src/ext/boost/config/no_tr1/cmath.hpp
branches/lucene2_3_2/src/ext/boost/config/no_tr1/complex.hpp
branches/lucene2_3_2/src/ext/boost/config/no_tr1/functional.hpp
branches/lucene2_3_2/src/ext/boost/config/no_tr1/memory.hpp
branches/lucene2_3_2/src/ext/boost/config/no_tr1/utility.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/
branches/lucene2_3_2/src/ext/boost/config/platform/aix.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/amigaos.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/beos.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/bsd.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/cygwin.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/hpux.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/irix.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/linux.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/macos.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/qnxnto.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/solaris.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/vxworks.hpp
branches/lucene2_3_2/src/ext/boost/config/platform/win32.hpp
branches/lucene2_3_2/src/ext/boost/config/posix_features.hpp
branches/lucene2_3_2/src/ext/boost/config/requires_threads.hpp
branches/lucene2_3_2/src/ext/boost/config/select_compiler_config.hpp
branches/lucene2_3_2/src/ext/boost/config/select_platform_config.hpp
branches/lucene2_3_2/src/ext/boost/config/select_stdlib_config.hpp
branches/lucene2_3_2/src/ext/boost/config/stdlib/
branches/lucene2_3_2/src/ext/boost/config/stdlib/dinkumware.hpp
branches/lucene2_3_2/src/ext/boost/config/stdlib/libcomo.hpp
branches/lucene2_3_2/src/ext/boost/config/stdlib/libstdcpp3.hpp
branches/lucene2_3_2/src/ext/boost/config/stdlib/modena.hpp
branches/lucene2_3_2/src/ext/boost/config/stdlib/msl.hpp
branches/lucene2_3_2/src/ext/boost/config/stdlib/roguewave.hpp
branches/lucene2_3_2/src/ext/boost/config/stdlib/sgi.hpp
branches/lucene2_3_2/src/ext/boost/config/stdlib/stlport.hpp
branches/lucene2_3_2/src/ext/boost/config/stdlib/vacpp.hpp
branches/lucene2_3_2/src/ext/boost/config/suffix.hpp
branches/lucene2_3_2/src/ext/boost/config/user.hpp
branches/lucene2_3_2/src/ext/boost/config/warning_disable.hpp
branches/lucene2_3_2/src/ext/boost/config.hpp
branches/lucene2_3_2/src/ext/boost/current_function.hpp
branches/lucene2_3_2/src/ext/boost/detail/
branches/lucene2_3_2/src/ext/boost/detail/algorithm.hpp
branches/lucene2_3_2/src/ext/boost/detail/allocator_utilities.hpp
branches/lucene2_3_2/src/ext/boost/detail/atomic_count.hpp
branches/lucene2_3_2/src/ext/boost/detail/binary_search.hpp
branches/lucene2_3_2/src/ext/boost/detail/call_traits.hpp
branches/lucene2_3_2/src/ext/boost/detail/catch_exceptions.hpp
branches/lucene2_3_2/src/ext/boost/detail/compressed_pair.hpp
branches/lucene2_3_2/src/ext/boost/detail/container_fwd.hpp
branches/lucene2_3_2/src/ext/boost/detail/dynamic_bitset.hpp
branches/lucene2_3_2/src/ext/boost/detail/endian.hpp
branches/lucene2_3_2/src/ext/boost/detail/has_default_constructor.hpp
branches/lucene2_3_2/src/ext/boost/detail/identifier.hpp
branches/lucene2_3_2/src/ext/boost/detail/indirect_traits.hpp
branches/lucene2_3_2/src/ext/boost/detail/interlocked.hpp
branches/lucene2_3_2/src/ext/boost/detail/is_function_ref_tester.hpp
branches/lucene2_3_2/src/ext/boost/detail/is_incrementable.hpp
branches/lucene2_3_2/src/ext/boost/detail/is_xxx.hpp
branches/lucene2_3_2/src/ext/boost/detail/iterator.hpp
branches/lucene2_3_2/src/ext/boost/detail/lcast_precision.hpp
branches/lucene2_3_2/src/ext/boost/detail/lightweight_mutex.hpp
branches/lucene2_3_2/src/ext/boost/detail/lightweight_test.hpp
branches/lucene2_3_2/src/ext/boost/detail/lightweight_thread.hpp
branches/lucene2_3_2/src/ext/boost/detail/limits.hpp
branches/lucene2_3_2/src/ext/boost/detail/named_template_params.hpp
branches/lucene2_3_2/src/ext/boost/detail/no_exceptions_support.hpp
branches/lucene2_3_2/src/ext/boost/detail/none_t.hpp
branches/lucene2_3_2/src/ext/boost/detail/numeric_traits.hpp
branches/lucene2_3_2/src/ext/boost/detail/ob_call_traits.hpp
branches/lucene2_3_2/src/ext/boost/detail/ob_compressed_pair.hpp
branches/lucene2_3_2/src/ext/boost/detail/quick_allocator.hpp
branches/lucene2_3_2/src/ext/boost/detail/reference_content.hpp
branches/lucene2_3_2/src/ext/boost/detail/scoped_enum_emulation.hpp
branches/lucene2_3_2/src/ext/boost/detail/select_type.hpp
branches/lucene2_3_2/src/ext/boost/detail/sp_typeinfo.hpp
branches/lucene2_3_2/src/ext/boost/detail/templated_streams.hpp
branches/lucene2_3_2/src/ext/boost/detail/utf8_codecvt_facet.hpp
branches/lucene2_3_2/src/ext/boost/detail/workaround.hpp
branches/lucene2_3_2/src/ext/boost/exception/
branches/lucene2_3_2/src/ext/boost/exception/all.hpp
branches/lucene2_3_2/src/ext/boost/exception/current_exception_cast.hpp
branches/lucene2_3_2/src/ext/boost/exception/detail/
branches/lucene2_3_2/src/ext/boost/exception/detail/attribute_noreturn.hpp
branches/lucene2_3_2/src/ext/boost/exception/detail/error_info_impl.hpp
branches/lucene2_3_2/src/ext/boost/exception/detail/exception_ptr.hpp
branches/lucene2_3_2/src/ext/boost/exception/detail/is_output_streamable.hpp
branches/lucene2_3_2/src/ext/boost/exception/detail/object_hex_dump.hpp
branches/lucene2_3_2/src/ext/boost/exception/detail/type_info.hpp
branches/lucene2_3_2/src/ext/boost/exception/diagnostic_information.hpp
branches/lucene2_3_2/src/ext/boost/exception/enable_current_exception.hpp
branches/lucene2_3_2/src/ext/boost/exception/enable_error_info.hpp
branches/lucene2_3_2/src/ext/boost/exception/errinfo_api_function.hpp
branches/lucene2_3_2/src/ext/boost/exception/errinfo_at_line.hpp
branches/lucene2_3_2/src/ext/boost/exception/errinfo_errno.hpp
branches/lucene2_3_2/src/ext/boost/exception/errinfo_file_handle.hpp
branches/lucene2_3_2/src/ext/boost/exception/errinfo_file_name.hpp
branches/lucene2_3_2/src/ext/boost/exception/errinfo_file_open_mode.hpp
branches/lucene2_3_2/src/ext/boost/exception/errinfo_nested_exception.hpp
branches/lucene2_3_2/src/ext/boost/exception/errinfo_type_info_name.hpp
branches/lucene2_3_2/src/ext/boost/exception/error_info.hpp
branches/lucene2_3_2/src/ext/boost/exception/exception.hpp
branches/lucene2_3_2/src/ext/boost/exception/get_error_info.hpp
branches/lucene2_3_2/src/ext/boost/exception/info.hpp
branches/lucene2_3_2/src/ext/boost/exception/info_tuple.hpp
branches/lucene2_3_2/src/ext/boost/exception/to_string.hpp
branches/lucene2_3_2/src/ext/boost/exception/to_string_stub.hpp
branches/lucene2_3_2/src/ext/boost/memory_order.hpp
branches/lucene2_3_2/src/ext/boost/shared_ptr.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/
branches/lucene2_3_2/src/ext/boost/smart_ptr/bad_weak_ptr.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/atomic_count.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/atomic_count_gcc.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/atomic_count_gcc_x86.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/atomic_count_pthreads.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/atomic_count_solaris.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/atomic_count_sync.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/atomic_count_win32.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/lightweight_mutex.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/lwm_nop.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/lwm_pthreads.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/lwm_win32_cs.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/operator_bool.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/quick_allocator.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/shared_array_nmt.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/shared_count.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/shared_ptr_nmt.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_convertible.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_acc_ia64.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_cw_ppc.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_cw_x86.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_gcc_ia64.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_gcc_mips.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_gcc_ppc.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_gcc_sparc.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_nt.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_pt.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_solaris.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_spin.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_sync.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_base_w32.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_counted_impl.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/sp_has_sync.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/spinlock.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/spinlock_nt.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/spinlock_pool.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/spinlock_pt.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/spinlock_sync.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/spinlock_w32.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/detail/yield_k.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/enable_shared_from_this.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/enable_shared_from_this2.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/intrusive_ptr.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/make_shared.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/scoped_array.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/scoped_ptr.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/shared_array.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/shared_ptr.hpp
branches/lucene2_3_2/src/ext/boost/smart_ptr/weak_ptr.hpp
branches/lucene2_3_2/src/ext/boost/throw_exception.hpp
branches/lucene2_3_2/src/ext/boost/version.hpp
branches/lucene2_3_2/src/ext/zlib/
branches/lucene2_3_2/src/ext/zlib/ChangeLog
branches/lucene2_3_2/src/ext/zlib/FAQ
branches/lucene2_3_2/src/ext/zlib/INDEX
branches/lucene2_3_2/src/ext/zlib/README
branches/lucene2_3_2/src/ext/zlib/adler32.c
branches/lucene2_3_2/src/ext/zlib/algorithm.txt
branches/lucene2_3_2/src/ext/zlib/compress.c
branches/lucene2_3_2/src/ext/zlib/crc32.c
branches/lucene2_3_2/src/ext/zlib/crc32.h
branches/lucene2_3_2/src/ext/zlib/deflate.c
branches/lucene2_3_2/src/ext/zlib/deflate.h
branches/lucene2_3_2/src/ext/zlib/gzio.c
branches/lucene2_3_2/src/ext/zlib/inffast.c
branches/lucene2_3_2/src/ext/zlib/inffast.h
branches/lucene2_3_2/src/ext/zlib/inffixed.h
branches/lucene2_3_2/src/ext/zlib/inflate.c
branches/lucene2_3_2/src/ext/zlib/inflate.h
branches/lucene2_3_2/src/ext/zlib/inftrees.c
branches/lucene2_3_2/src/ext/zlib/inftrees.h
branches/lucene2_3_2/src/ext/zlib/trees.c
branches/lucene2_3_2/src/ext/zlib/trees.h
branches/lucene2_3_2/src/ext/zlib/zconf.h
branches/lucene2_3_2/src/ext/zlib/zlib.h
branches/lucene2_3_2/src/ext/zlib/zutil.c
branches/lucene2_3_2/src/ext/zlib/zutil.h
branches/lucene2_3_2/src/htdocs/
branches/lucene2_3_2/src/htdocs/README
branches/lucene2_3_2/src/htdocs/_footer.html
branches/lucene2_3_2/src/htdocs/_header.html
branches/lucene2_3_2/src/htdocs/_index.php
branches/lucene2_3_2/src/htdocs/clucene.jpg
branches/lucene2_3_2/src/htdocs/contribute.shtml
branches/lucene2_3_2/src/htdocs/download.shtml
branches/lucene2_3_2/src/htdocs/images/
branches/lucene2_3_2/src/htdocs/images/disk.png
branches/lucene2_3_2/src/htdocs/images/img01.gif
branches/lucene2_3_2/src/htdocs/images/img02.gif
branches/lucene2_3_2/src/htdocs/images/img03.gif
branches/lucene2_3_2/src/htdocs/images/img04.jpg
branches/lucene2_3_2/src/htdocs/images/img05.jpg
branches/lucene2_3_2/src/htdocs/images/img06.jpg
branches/lucene2_3_2/src/htdocs/images/img07.gif
branches/lucene2_3_2/src/htdocs/images/img08.jpg
branches/lucene2_3_2/src/htdocs/images/img09.jpg
branches/lucene2_3_2/src/htdocs/images/img10.jpg
branches/lucene2_3_2/src/htdocs/images/img11.gif
branches/lucene2_3_2/src/htdocs/images/spacer.gif
branches/lucene2_3_2/src/htdocs/index.shtml
branches/lucene2_3_2/src/htdocs/style.css
branches/lucene2_3_2/src/shared/cmake/CheckAtomicFunctions.cmake
Removed Paths:
-------------
branches/lucene2_3_2/src/contribs/contribs-lib-test/TestStreams.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/util/gzipcompressstream.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/util/gzipcompressstream.h
branches/lucene2_3_2/src/contribs-lib/CLucene/util/gzipinputstream.cpp
branches/lucene2_3_2/src/contribs-lib/CLucene/util/gzipinputstream.h
branches/lucene2_3_2/src/core/CLucene/index/IndexFileNameFilter.h
branches/lucene2_3_2/src/core/CLucene/store/TransactionalRAMDirectory.cpp
branches/lucene2_3_2/src/core/CLucene/store/_MMap.h
branches/lucene2_3_2/src/core/CLucene/store/_TransactionalRAMDirectory.h
branches/lucene2_3_2/src/core/libclucene.pc.cmake
branches/lucene2_3_2/src/shared/CLucene/util/zlib/adler32.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/compress.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/crc32.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/crc32.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/deflate.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/deflate.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/gzio.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inffast.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inffast.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inffixed.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inflate.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inflate.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inftrees.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/inftrees.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/trees.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/trees.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/zconf.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/zlib.h
branches/lucene2_3_2/src/shared/CLucene/util/zlib/zutil.c
branches/lucene2_3_2/src/shared/CLucene/util/zlib/zutil.h
Modified: branches/lucene2_3_2/CMakeLists.txt
===================================================================
--- branches/lucene2_3_2/CMakeLists.txt 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/CMakeLists.txt 2010-08-24 15:00:54 UTC (rev 3027)
@@ -5,16 +5,17 @@
#REVISION version MUST be revised if the headers or compatibility change
#PATCH should be 0 unless a patch is made that doesn't affect the public signature (i.e. clients don't need to re-compile).
-SET(CLUCENE_VERSION_MAJOR "0")
-SET(CLUCENE_VERSION_MINOR "9")
-SET(CLUCENE_VERSION_REVISION "23")
+SET(CLUCENE_VERSION_MAJOR "1")
+SET(CLUCENE_VERSION_MINOR "0")
+SET(CLUCENE_VERSION_REVISION "0")
SET(CLUCENE_VERSION_PATCH "0")
-SET(CLUCENE_INT_VERSION 92300)
+SET(CLUCENE_INT_VERSION 1000000)
SET(CLUCENE_VERSION "${CLUCENE_VERSION_MAJOR}.${CLUCENE_VERSION_MINOR}.${CLUCENE_VERSION_REVISION}.${CLUCENE_VERSION_PATCH}")
SET(CLUCENE_SOVERSION "${CLUCENE_VERSION_MAJOR}.${CLUCENE_VERSION_MINOR}.${CLUCENE_VERSION_REVISION}")
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.2 FATAL_ERROR)
+#CMake 2.6+ is recommended to an improved Boost module
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0 FATAL_ERROR)
if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 NEW)
@@ -25,13 +26,13 @@
set(CMAKE_DEBUG_POSTFIX "d")
endif(WIN32)
-
# include specific modules
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
#define options...
Include (CLuceneDocs)
+Include (CLuceneBoost)
Include (FindThreads)
IF(NOT CMAKE_BUILD_TYPE)
@@ -57,6 +58,20 @@
OPTION(ENABLE_ASCII_MODE
"enable ascii support"
OFF)
+
+SET(ENABLE_ANSI_MODE OFF)
+IF(CMAKE_COMPILER_IS_GNUCXX)
+ SET(ENABLE_ANSI_MODE ON)
+
+ #exceptions:
+ IF(MINGW OR CYGWIN)
+ SET(ENABLE_ANSI_MODE OFF)
+ ENDIF(MINGW OR CYGWIN)
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+OPTION(ENABLE_ANSI_MODE
+ "compile with -ansi flag"
+ ${ENABLE_ANSI_MODE})
OPTION(LUCENE_USE_INTERNAL_CHAR_FUNCTIONS
"use internal character functions. required to run tests correctly"
ON)
@@ -107,10 +122,14 @@
ENDIF ( ENABLE_GPROF )
ENDIF ( GccFlagPg )
- IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
- ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+ #cmake should handle this automatically
+ # IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+ # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC" )
+ # ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
+ IF( ENABLE_ANSI_MODE )
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ansi")
+ ENDIF ( ENABLE_ANSI_MODE )
ENDIF(CMAKE_COMPILER_IS_GNUCC)
@@ -127,7 +146,13 @@
INCLUDE_DIRECTORIES( ${clucene_BINARY_DIR}/src/shared )
INCLUDE_DIRECTORIES( ${clucene_SOURCE_DIR}/src/core )
+#set boost path. we need src/ext to be defined before this works...
+Include (CLuceneBoost)
+GET_BOOST_INCLUDE_PATH(_CL_BOOST_INCLUDE_PATH)
+INCLUDE_DIRECTORIES( ${_CL_BOOST_INCLUDE_PATH} )
+
#include the projects
+ADD_SUBDIRECTORY (src/ext)
ADD_SUBDIRECTORY (src/shared)
ADD_SUBDIRECTORY (src/core)
ADD_SUBDIRECTORY (src/test)
@@ -140,6 +165,7 @@
ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
ENDIF ( BUILD_CONTRIBS_LIB )
+
#add uninstall command
CONFIGURE_FILE(
"${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
Modified: branches/lucene2_3_2/COPYING
===================================================================
--- branches/lucene2_3_2/COPYING 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/COPYING 2010-08-24 15:00:54 UTC (rev 3027)
@@ -124,7 +124,3 @@
PorterStemmer code: couldn't find license. This component is deprecated and will be removed very soon.
Snowball code: needs to be researched.
-
-Jstreams: needs to be researched
-
-All code needs to be clearly marked with license headers...
Modified: branches/lucene2_3_2/INSTALL
===================================================================
--- branches/lucene2_3_2/INSTALL 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/INSTALL 2010-08-24 15:00:54 UTC (rev 3027)
@@ -9,7 +9,8 @@
--------------------
Dependencies:
-* CMake version 2.4.2 or later.
+* CMake version 2.4.2 or later (2.6 or later recommended due to an improved FindBoost module)
+* Boost libs (http://www.boost.org/), latest version recommended
* A functioning and fairly new C++ compiler. We test mostly on GCC and Visual Studio 6+.
Anything other than that may not work.
* Something to unzip/untar the source code.
@@ -28,6 +29,13 @@
create different types of builds in the same source-tree.]
# mkdir <clucene>/build-name
# cd <clucene>/build-name
+5*.) Windows users: make sure Boost environment variables are defined at least for the current
+ command prompt session. You can check this by typing "set" (no quotes). If you have any doubts,
+ just type the following 3 commands to set those variables, as follows (boost_1_40_0 being the current
+ Boost version):
+ set BOOST_BUILD_PATH=C:\{parent directory for boost}\boost_1_40_0\tools\build\v2
+ set BOOST_PATH=C:\{parent directory for boost}
+ set BOOST_ROOT=C:\{parent directory for boost}\boost_1_40_0
6.) Configure using cmake. This can be done many different ways, but the basic syntax is
# cmake [-G "Script name"] ..
[Where "Script name" is the name of the scripts to build (e.g. Visual Studio 8 2005).
Added: branches/lucene2_3_2/cmake/CLuceneBoost.cmake
===================================================================
--- branches/lucene2_3_2/cmake/CLuceneBoost.cmake (rev 0)
+++ branches/lucene2_3_2/cmake/CLuceneBoost.cmake 2010-08-24 15:00:54 UTC (rev 3027)
@@ -0,0 +1,22 @@
+#Locate Boost libs. Windows users: make sure BOOST_ROOT and BOOST_PATH are set correctly on your environment.
+#See the site FAQ for more details.
+
+MACRO (GET_BOOST_INCLUDE_PATH path)
+ #todo: allow this to fall back on a local distributed copy, so user doesn't have to d/l Boost seperately
+ SET(Boost_USE_MULTITHREAD ON)
+ FIND_PACKAGE( Boost )
+
+ #todo: limit Boost version?
+ #todo: use COMPONENTS threads to locate boost_threads without breaking the current support
+ IF(Boost_FOUND)
+ IF (NOT _boost_IN_CACHE)
+ MESSAGE( "Boost found" )
+ message(STATUS "Boost_INCLUDE_DIR : ${Boost_INCLUDE_DIR}")
+ ENDIF (NOT _boost_IN_CACHE)
+ SET(${path} ${Boost_INCLUDE_DIRS} )
+ ELSE()
+ MESSAGE( "Boost not found, using local: ${clucene_SOURCE_DIR}/src/ext" )
+ SET(${path} ${clucene_SOURCE_DIR}/src/ext )
+ ENDIF()
+ENDMACRO (GET_BOOST_INCLUDE_PATH path)
+
Modified: branches/lucene2_3_2/cmake/CreateClucenePackages.cmake
===================================================================
--- branches/lucene2_3_2/cmake/CreateClucenePackages.cmake 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/cmake/CreateClucenePackages.cmake 2010-08-24 15:00:54 UTC (rev 3027)
@@ -13,17 +13,16 @@
SET(CPACK_PACKAGE_VERSION ${CLUCENE_VERSION})
SET(CPACK_PACKAGE_SOVERSION ${CLUCENE_SOVERSION})
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "library for full-featured text search engine (runtime)")
SET(CPACK_PACKAGE_VENDOR "Ben van Klinken")
SET(CPACK_PACKAGE_CONTACT "clu...@li...")
-SET(CPACK_PACKAGE_NAME "libclucene1")
+SET(CPACK_PACKAGE_NAME "libclucene2")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CLucene - a C++ search engine, ported from the popular Apache Lucene")
SET(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.PACKAGE")
+#SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README.PACKAGE")
#so, what are we going to install?
SET(CPACK_INSTALL_CMAKE_PROJECTS
@@ -42,8 +41,8 @@
#specific packaging requirements:
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libc6 (>= 2.4), libgcc1 (>= 1:4.1.1-21), libstdc++6 (>= 4.1.1-21)")
+SET(CPACK_DEBIAN_PACKAGE_SECTION "libs")
-
#don't include the current binary dir.
get_filename_component(clucene_BINARY_DIR_name ${clucene_BINARY_DIR} NAME)
SET(CPACK_SOURCE_IGNORE_FILES
Modified: branches/lucene2_3_2/dist-test.sh
===================================================================
--- branches/lucene2_3_2/dist-test.sh 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/dist-test.sh 2010-08-24 15:00:54 UTC (rev 3027)
@@ -71,11 +71,10 @@
#check to see that no #ifdefs exist in headers that don't belong
function checkForIfdefs {
I=0
- grep "#if" $1| grep -v "_UCS2" |grep -v "_CL_HAVE_" |grep -v "_ASCII" |grep -v "_WIN32" |grep -v "_WIN64" | while read line; do
+ grep "#if" $1| grep -v "_UCS2" |grep -v "_CL_HAVE_" |grep -v "_ASCII" |grep -v "_WIN32"|grep -v "_MSC_"|grep -v "__MINGW32__" |grep -v "_WIN64" | while read line; do
I=`expr $I + 1`
if [ $I -gt 1 ]; then
- echo $1 has invalid ifdef: $line
- FAIL=1
+ echo $1 might have invalid ifdef: $line
fi
done
}
@@ -95,12 +94,12 @@
if [ "${BH:0:1}" != "_" ]; then
DH=`dirname "${H:3}"`
- #move headers somewhere to compile
- mkdir -p "$TMP/$DH" 2>/dev/null
- ln -s "`cd "$DN" && pwd`/$BH" "$TMP/${H:3}" 2>/dev/null
-
- #create pub-headers.cpp
if [ "${H:7}" != "core/CLucene/util/Reader.h" ]; then
+ #move headers somewhere to compile
+ mkdir -p "$TMP/$DH" 2>/dev/null
+ ln -s "`cd "$DN" && pwd`/$BH" "$TMP/${H:3}" 2>/dev/null
+
+ #create pub-headers.cpp
echo "#include \"${H:7}\"" >>$TMP/pub-headers.cpp
fi
fi
@@ -130,7 +129,7 @@
#internal headers... none must be exported
XX=`awk '/^[ \t]*(class|struct)/ { print $line }' $H| grep -v ";$"| grep -v CLUCENE_EXPORT| grep -v CLUCENE_INLINE_EXPORT| grep -v CLUCENE_SHARED_EXPORT| grep -v CLUCENE_SHARED_INLINE_EXPORT`
if [ "$XX" == "" ]; then
- echo "$H has exported class: $XX"
+ echo "$H is internal but has exported class: $XX"
echo ""
FAIL=1
fi
@@ -146,15 +145,33 @@
fi
#test that each header compiles independently...
- if [ $t_c_h -eq 1 ] && [ "${H:7}" != "disttest/src/core/CLucene/util/Reader.h" ]; then
- echo "Test that $H compiles seperately..."
+ if [ $t_c_h -eq 1 ]; then
echo "#include \"CLucene/StdHeader.h"\" >$TMP/pub-header.cpp
echo "#include \"$H"\" >>$TMP/pub-header.cpp
echo "int main(){ return 0; }" >>"$TMP/pub-header.cpp"
- g++ -I. -I$TMP/src/shared -I./src/shared -I$TMP/src/core $TMP/pub-header.cpp
- if [ $? -ne 0 ]; then FAIL=1; fi
+ ERROR=`g++ -I. -I$TMP/src/shared -I./src/shared -I../src/ext -I$TMP/src/core $TMP/pub-header.cpp`
+ if [ $? -ne 0 ]; then
+ echo ""
+ echo "$H doesn't compile seperately..."
+ echo $ERROR
+ FAIL=1;
+ fi
fi
done
+
+
+ if [ $t_ifdefs -eq 1 ]; then
+ echo "Not all ifdefs are invalid, you have to figure it out for yourself :-)"
+ echo "If defs in classes which change depending on a user setting can cause big problems due to offset changes"
+ echo "for example:"
+ echo "class X {"
+ echo " #ifdef _DEBUG"
+ echo " int x;"
+ echo " #endif"
+ echo " int y;"
+ echo "}"
+ echo "If the library is compiled with _DEBUG, and then a user calls y without _DEBUG defined, unexpected behaviour will occur"
+ fi
fi
#iterate all our code...
@@ -164,25 +181,38 @@
BH_len=${#BH}
if [ "${BH:BH_len-2}" == ".h" ] || [ "${BH:BH_len-2}" == ".c" ] || [ "${BH:BH_len-4}" == ".cpp" ]; then
+
+ #snowball has its own license...
+ if [ "echo $H|grep 'snowball/src_c'" != "" ]; then
+ continue
+ fi
+ #snowball has its own license...
+ if [ "echo $H|grep 'libstemmer'" != "" ]; then
+ continue
+ fi
+ #zlib has its own license...
+ if [ "echo $H|grep 'CLucene/util/zlib'" != "" ]; then
+ continue
+ fi
+
if [ "`awk '/\* Copyright \(C\) [0-9]*-[0-9]* .*$/ { print $line }' $H`" == "" ]; then
if [ "`awk '/\* Copyright [0-9]*-[0-9]* .*$/ { print $line }' $H`" == "" ]; then
- echo "$H has invalid license"
+ echo "$H ($BH) has invalid license"
FAIL=1
fi
fi
fi
done
-
fi
#test if headers can compile together by themselves:
if [ $t_c_all -eq 1 ]; then
- g++ -I$TMP/src -I$TMP/src/shared -I$TMP/src/core $TMP/pub-headers.cpp -I./src/shared
+ g++ -I$TMP/src -I../src/ext -I$TMP/src/shared -I$TMP/src/core $TMP/pub-headers.cpp -I./src/shared
fi
if [ $t_inline -eq 1 ]; then
- if [ ! -f "./doc" ]; then
+ if [ ! -d "./doc" ]; then
echo "Couldn't find docs, run:"
echo "# cmake -DENABLE_CLDOCS:BOOLEAN=TRUE ."
echo "# make doc"
@@ -197,7 +227,13 @@
if [ "doc/html/classlucene_1_1index_1_1Term.html:1" == $line ]; then
continue;
fi
-
+ if [ "doc/html/classlucene_1_1search_1_1Similarity.html:1" == $line ]; then
+ continue;
+ fi
+ if [ "doc/html/classlucene_1_1store_1_1BufferedIndexInput.html:1" == $line ]; then
+ continue;
+ fi
+
if [ $INLINES -eq 0 ]; then
echo "These files report inline code:"
INLINES=1
@@ -214,11 +250,18 @@
FAIL=1;
fi
+ echo "Undefines for shared lib:"
+ nm -u --demangle bin/libclucene-shared.so |grep -E "lucene::"
+ echo "Undefines for core lib:"
+ nm -u --demangle bin/libclucene-core.so |grep -E "lucene::"|grep -v "lucene::util::Misc" |grep -v "lucene::util::mutex" |grep -v "lucene::util::StringBuffer"|grep -v "lucene::util::shared_condition"
+
#compile together
make test-all
if [ $? -ne 0 ]; then
FAIL=1;
fi
+
+
fi
Modified: branches/lucene2_3_2/src/contribs/benchmarker/Benchmarker.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs/benchmarker/Benchmarker.cpp 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/benchmarker/Benchmarker.cpp 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
#include "stdafx.h"
#include "Benchmarker.h"
#include "Unit.h"
Modified: branches/lucene2_3_2/src/contribs/benchmarker/Benchmarker.h
===================================================================
--- branches/lucene2_3_2/src/contribs/benchmarker/Benchmarker.h 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/benchmarker/Benchmarker.h 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
#pragma once
class Benchmarker
Modified: branches/lucene2_3_2/src/contribs/benchmarker/Main.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs/benchmarker/Main.cpp 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/benchmarker/Main.cpp 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
#include "stdafx.h"
#include "TestCLString.h"
Modified: branches/lucene2_3_2/src/contribs/benchmarker/TestCLString.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs/benchmarker/TestCLString.cpp 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/benchmarker/TestCLString.cpp 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
#include "stdafx.h"
using namespace lucene::util;
Modified: branches/lucene2_3_2/src/contribs/benchmarker/TestCLString.h
===================================================================
--- branches/lucene2_3_2/src/contribs/benchmarker/TestCLString.h 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/benchmarker/TestCLString.h 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
#pragma once
int BenchmarkDocumentWriter(Timer*);
Modified: branches/lucene2_3_2/src/contribs/benchmarker/Timer.h
===================================================================
--- branches/lucene2_3_2/src/contribs/benchmarker/Timer.h 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/benchmarker/Timer.h 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
#pragma once
class Timer{
Modified: branches/lucene2_3_2/src/contribs/benchmarker/Unit.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs/benchmarker/Unit.cpp 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/benchmarker/Unit.cpp 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
#include "stdafx.h"
#include "Unit.h"
Modified: branches/lucene2_3_2/src/contribs/benchmarker/Unit.h
===================================================================
--- branches/lucene2_3_2/src/contribs/benchmarker/Unit.h 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/benchmarker/Unit.h 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
#pragma once
#include "CLucene/util/Misc.h"
Modified: branches/lucene2_3_2/src/contribs/benchmarker/stdafx.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs/benchmarker/stdafx.cpp 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/benchmarker/stdafx.cpp 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
// stdafx.cpp : source file that includes just the standard includes
// demo.pch will be the pre-compiled header
// stdafx.obj will contain the pre-compiled type information
Modified: branches/lucene2_3_2/src/contribs/benchmarker/stdafx.h
===================================================================
--- branches/lucene2_3_2/src/contribs/benchmarker/stdafx.h 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/benchmarker/stdafx.h 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,3 +1,9 @@
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
// stdafx.h : include file for standard system include files,
// or project specific include files that are used frequently, but
// are changed infrequently
Modified: branches/lucene2_3_2/src/contribs/contribs-lib-test/CMakeLists.txt
===================================================================
--- branches/lucene2_3_2/src/contribs/contribs-lib-test/CMakeLists.txt 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/contribs-lib-test/CMakeLists.txt 2010-08-24 15:00:54 UTC (rev 3027)
@@ -4,6 +4,7 @@
DEFINE_OPTIONS(EXTRA_OPTIONS EXTRA_LIBS)
ADD_DEFINITIONS(${EXTRA_OPTIONS})
+INCLUDE_DIRECTORIES( ${_CL_BOOST_INCLUDE_PATH} )
INCLUDE_DIRECTORIES( ${clucene-contribs-lib-test_SOURCE_DIR} )
INCLUDE_DIRECTORIES( ${clucene-contribs-lib_SOURCE_DIR} )
@@ -13,7 +14,6 @@
./contribTests.cpp
./TestHighlight.cpp
./TestSnowball.cpp
- ./TestStreams.cpp
./TestUtf8.cpp
./TestAnalysis.cpp
./CuTest.cpp
Modified: branches/lucene2_3_2/src/contribs/contribs-lib-test/TestAnalysis.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs/contribs-lib-test/TestAnalysis.cpp 2010-08-24 13:42:35 UTC (rev 3026)
+++ branches/lucene2_3_2/src/contribs/contribs-lib-test/TestAnalysis.cpp 2010-08-24 15:00:54 UTC (rev 3027)
@@ -1,18 +1,9 @@
-/**
- * Copyright 2003-2006 The Apache Software Foundation
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+/*------------------------------------------------------------------------------
+* Copyright (C) 2003-2006 Ben van Klinken and the CLucene Team
+*
+* Distributable under the terms of either the Apache License (Version 2.0) or
+* the GNU Lesser General Public License, as specified in the COPYING file.
+------------------------------------------------------------------------------*/
#include "test.h"
#include "CLucene/analysis/cjk/CJKAnalyzer.h"
#include "CLucene/analysis/LanguageBasedAnalyzer.h"
@@ -128,7 +119,7 @@
TCHAR tres[LUCENE_MAX_WORD_LEN];
while (results[pos] != NULL) {
- CLUCENE_ASSERT(tokenizer->next(&tok) == true);
+ CLUCENE_ASSERT(tokenizer->next(&tok) != NULL);
lucene_utf8towcs(tres, results[pos], LUCENE_MAX_WORD_LEN);
CuAssertStrEquals(tc, _T("unexpected token value"), tres, tok.termBuffer());
@@ -166,9 +157,9 @@
a.setStem(false);
ts = a.tokenStream(_T("contents"), &reader);
- CLUCENE_ASSERT(ts->next(&t));
+ CLUCENE_ASSERT(ts->next(&t) != NULL);
CLUCENE_ASSERT(_tcscmp(t.termBuffer(), _T("he")) == 0);
- CLUCENE_ASSERT(ts->next(&t));
+ CLUCENE_ASSERT(ts->next(&t) != NULL);
CLUCENE_ASSERT(_tcscmp(t.termBuffer(), _T("abhorred")) == 0);
_CLDELETE(ts);
@@ -178,11 +169,11 @@
a.setStem(true);
ts = a.tokenStream(_T("contents"), &reader);
- CLUCENE_ASSERT(ts->next(&t));
+ CLUCENE_ASSERT(ts->next(&t) != NULL);
CLUCENE_ASSERT(_tcscmp(t.termBuffer(), _T("he")) == 0);
- CLUCENE_ASSERT(ts->next(&t));
+ CLUCENE_ASSERT(ts->next(&t) != NULL);
CLUCENE_ASSERT(_tcscmp(t.termBuffer(), _T("abhorred")) == 0);
- CLUCENE_ASSERT(ts->next(&t));
+ CLUCENE_ASSERT(ts->next(&t) != NULL);
CLUCENE_ASSERT(_tcscmp(t.termBuffer(), _T("accentuer")) == 0);
_CLDELETE(ts);
}
Modified: branches/lucene2_3_2/src/contribs/contribs-lib-test/TestHighlight.cpp
===================================================================
--- branches/lucene2_3_2/src/contribs/contribs-lib-test/Tes...
[truncated message content] |
