[Libreoffice-commits] .: 2 commits - clucene/Library_clucene.mk clucene/Module_clucene.mk clucene/Package_inc.mk clucene/Package_source.mk clucene/source slideshow/source
David Tardon
dtardon at kemper.freedesktop.org
Fri Feb 17 06:00:54 PST 2012
clucene/Library_clucene.mk | 397 ++++------
clucene/Module_clucene.mk | 2
clucene/Package_inc.mk | 97 --
clucene/Package_source.mk | 110 ++
clucene/source/Makefile | 49 +
slideshow/source/engine/transitions/shapetransitionfactory.cxx | 4
6 files changed, 352 insertions(+), 307 deletions(-)
New commits:
commit 314c2d3e0cab5f5e72fbd09585f344368125e1d1
Author: David Tardon <dtardon at redhat.com>
Date: Fri Feb 17 14:34:34 2012 +0100
use custom target for preparing sources
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 7c8f0d5..53da705 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -31,14 +31,14 @@ $(eval $(call gb_Library_Library,clucene))
$(eval $(call gb_Library_use_external,clucene,zlib))
-$(eval $(call gb_Library_add_package_headers,clucene,clucene_inc))
+$(eval $(call gb_Library_add_package_headers,clucene,clucene_source))
$(eval $(call gb_Library_set_include,clucene,\
- -I$(WORKDIR)/clucene/src/core \
- -I$(WORKDIR)/clucene/src/shared \
- -I$(WORKDIR)/clucene/src/contribs-lib \
- -I$(WORKDIR)/clucene/inc/internal \
- $$(INCLUDE) \
+ -I$(WORKDIR)/CustomTarget/clucene/source/inc/internal \
+ -I$(WORKDIR)/CustomTarget/clucene/source/src/core \
+ -I$(WORKDIR)/CustomTarget/clucene/source/src/contribs-lib \
+ -I$(WORKDIR)/CustomTarget/clucene/source/src/shared \
+ $$(INCLUDE) \
))
$(eval $(call gb_Library_add_defs,clucene,\
@@ -60,208 +60,195 @@ $(eval $(call gb_Library_add_linked_libs,clucene,\
endif
$(eval $(call gb_Library_add_generated_exception_objects,clucene,\
- clucene/src/shared/CLucene/SharedHeader \
- clucene/src/shared/CLucene/config/gunichartables \
- clucene/src/shared/CLucene/config/repl_tcslwr \
- clucene/src/shared/CLucene/config/repl_tcstoll \
- clucene/src/shared/CLucene/config/repl_tcscasecmp \
- clucene/src/shared/CLucene/config/repl_tprintf \
- clucene/src/shared/CLucene/config/repl_lltot \
- clucene/src/shared/CLucene/config/repl_tcstod \
- clucene/src/shared/CLucene/config/utf8 \
- clucene/src/shared/CLucene/config/threads \
- clucene/src/shared/CLucene/debug/condition \
- clucene/src/shared/CLucene/util/StringBuffer \
- clucene/src/shared/CLucene/util/Misc \
- clucene/src/shared/CLucene/util/dirent \
- clucene/src/core/CLucene/StdHeader \
- clucene/src/core/CLucene/debug/error \
- clucene/src/core/CLucene/util/ThreadLocal \
- clucene/src/core/CLucene/util/Reader \
- clucene/src/core/CLucene/util/Equators \
- clucene/src/core/CLucene/util/FastCharStream \
- clucene/src/core/CLucene/util/MD5Digester \
- clucene/src/core/CLucene/util/StringIntern \
- clucene/src/core/CLucene/util/BitSet \
- clucene/src/core/CLucene/queryParser/FastCharStream \
- clucene/src/core/CLucene/queryParser/MultiFieldQueryParser \
- clucene/src/core/CLucene/queryParser/QueryParser \
- clucene/src/core/CLucene/queryParser/QueryParserTokenManager \
- clucene/src/core/CLucene/queryParser/QueryToken \
- clucene/src/core/CLucene/queryParser/legacy/Lexer \
- clucene/src/core/CLucene/queryParser/legacy/MultiFieldQueryParser \
- clucene/src/core/CLucene/queryParser/legacy/QueryParser \
- clucene/src/core/CLucene/queryParser/legacy/QueryParserBase \
- clucene/src/core/CLucene/queryParser/legacy/QueryToken \
- clucene/src/core/CLucene/queryParser/legacy/TokenList \
- clucene/src/core/CLucene/analysis/standard/StandardAnalyzer \
- clucene/src/core/CLucene/analysis/standard/StandardFilter \
- clucene/src/core/CLucene/analysis/standard/StandardTokenizer \
- clucene/src/core/CLucene/analysis/Analyzers \
- clucene/src/core/CLucene/analysis/AnalysisHeader \
- clucene/src/core/CLucene/store/MMapInput \
- clucene/src/core/CLucene/store/IndexInput \
- clucene/src/core/CLucene/store/Lock \
- clucene/src/core/CLucene/store/LockFactory \
- clucene/src/core/CLucene/store/IndexOutput \
- clucene/src/core/CLucene/store/Directory \
- clucene/src/core/CLucene/store/FSDirectory \
- clucene/src/core/CLucene/store/RAMDirectory \
- clucene/src/core/CLucene/document/Document \
- clucene/src/core/CLucene/document/DateField \
- clucene/src/core/CLucene/document/DateTools \
- clucene/src/core/CLucene/document/Field \
- clucene/src/core/CLucene/document/FieldSelector \
- clucene/src/core/CLucene/document/NumberTools \
- clucene/src/core/CLucene/index/IndexFileNames \
- clucene/src/core/CLucene/index/IndexFileNameFilter \
- clucene/src/core/CLucene/index/IndexDeletionPolicy \
- clucene/src/core/CLucene/index/SegmentMergeInfo \
- clucene/src/core/CLucene/index/SegmentInfos \
- clucene/src/core/CLucene/index/MergeScheduler \
- clucene/src/core/CLucene/index/SegmentTermDocs \
- clucene/src/core/CLucene/index/FieldsWriter \
- clucene/src/core/CLucene/index/TermInfosWriter \
- clucene/src/core/CLucene/index/Term \
- clucene/src/core/CLucene/index/Terms \
- clucene/src/core/CLucene/index/MergePolicy \
- clucene/src/core/CLucene/index/DocumentsWriter \
- clucene/src/core/CLucene/index/DocumentsWriterThreadState \
- clucene/src/core/CLucene/index/SegmentTermVector \
- clucene/src/core/CLucene/index/TermVectorReader \
- clucene/src/core/CLucene/index/FieldInfos \
- clucene/src/core/CLucene/index/CompoundFile \
- clucene/src/core/CLucene/index/SkipListReader \
- clucene/src/core/CLucene/index/SkipListWriter \
- clucene/src/core/CLucene/index/IndexFileDeleter \
- clucene/src/core/CLucene/index/SegmentReader \
- clucene/src/core/CLucene/index/DirectoryIndexReader \
- clucene/src/core/CLucene/index/TermVectorWriter \
- clucene/src/core/CLucene/index/IndexReader \
- clucene/src/core/CLucene/index/SegmentTermPositions \
- clucene/src/core/CLucene/index/SegmentMerger \
- clucene/src/core/CLucene/index/IndexWriter \
- clucene/src/core/CLucene/index/MultiReader \
- clucene/src/core/CLucene/index/MultiSegmentReader \
- clucene/src/core/CLucene/index/Payload \
- clucene/src/core/CLucene/index/SegmentTermEnum \
- clucene/src/core/CLucene/index/TermInfo \
- clucene/src/core/CLucene/index/IndexModifier \
- clucene/src/core/CLucene/index/SegmentMergeQueue \
- clucene/src/core/CLucene/index/FieldsReader \
- clucene/src/core/CLucene/index/TermInfosReader \
- clucene/src/core/CLucene/index/MultipleTermPositions \
- clucene/src/core/CLucene/search/Compare \
- clucene/src/core/CLucene/search/Scorer \
- clucene/src/core/CLucene/search/ScorerDocQueue \
- clucene/src/core/CLucene/search/PhraseScorer \
- clucene/src/core/CLucene/search/SloppyPhraseScorer \
- clucene/src/core/CLucene/search/DisjunctionSumScorer \
- clucene/src/core/CLucene/search/ConjunctionScorer \
- clucene/src/core/CLucene/search/PhraseQuery \
- clucene/src/core/CLucene/search/PrefixQuery \
- clucene/src/core/CLucene/search/ExactPhraseScorer \
- clucene/src/core/CLucene/search/TermScorer \
- clucene/src/core/CLucene/search/Similarity \
- clucene/src/core/CLucene/search/BooleanScorer \
- clucene/src/core/CLucene/search/BooleanScorer2 \
- clucene/src/core/CLucene/search/HitQueue \
- clucene/src/core/CLucene/search/FieldCacheImpl \
- clucene/src/core/CLucene/search/ChainedFilter \
- clucene/src/core/CLucene/search/RangeFilter \
- clucene/src/core/CLucene/search/CachingWrapperFilter \
- clucene/src/core/CLucene/search/QueryFilter \
- clucene/src/core/CLucene/search/TermQuery \
- clucene/src/core/CLucene/search/FuzzyQuery \
- clucene/src/core/CLucene/search/SearchHeader \
- clucene/src/core/CLucene/search/RangeQuery \
- clucene/src/core/CLucene/search/IndexSearcher \
- clucene/src/core/CLucene/search/Sort \
- clucene/src/core/CLucene/search/PhrasePositions \
- clucene/src/core/CLucene/search/FieldDocSortedHitQueue \
- clucene/src/core/CLucene/search/WildcardTermEnum \
- clucene/src/core/CLucene/search/MultiSearcher \
- clucene/src/core/CLucene/search/Hits \
- clucene/src/core/CLucene/search/MultiTermQuery \
- clucene/src/core/CLucene/search/FilteredTermEnum \
- clucene/src/core/CLucene/search/FieldSortedHitQueue \
- clucene/src/core/CLucene/search/WildcardQuery \
- clucene/src/core/CLucene/search/Explanation \
- clucene/src/core/CLucene/search/BooleanQuery \
- clucene/src/core/CLucene/search/FieldCache \
- clucene/src/core/CLucene/search/DateFilter \
- clucene/src/core/CLucene/search/MatchAllDocsQuery \
- clucene/src/core/CLucene/search/MultiPhraseQuery \
- clucene/src/core/CLucene/search/ConstantScoreQuery \
- clucene/src/core/CLucene/search/CachingSpanFilter \
- clucene/src/core/CLucene/search/SpanQueryFilter \
- clucene/src/core/CLucene/search/spans/NearSpansOrdered \
- clucene/src/core/CLucene/search/spans/NearSpansUnordered \
- clucene/src/core/CLucene/search/spans/SpanFirstQuery \
- clucene/src/core/CLucene/search/spans/SpanNearQuery \
- clucene/src/core/CLucene/search/spans/SpanNotQuery \
- clucene/src/core/CLucene/search/spans/SpanOrQuery \
- clucene/src/core/CLucene/search/spans/SpanScorer \
- clucene/src/core/CLucene/search/spans/SpanTermQuery \
- clucene/src/core/CLucene/search/spans/SpanWeight \
- clucene/src/core/CLucene/search/spans/TermSpans \
- clucene/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer \
- clucene/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer \
- clucene/src/contribs-lib/CLucene/analysis/PorterStemmer \
- clucene/src/contribs-lib/CLucene/snowball/Snowball \
+ CustomTarget/clucene/source/src/shared/CLucene/SharedHeader \
+ CustomTarget/clucene/source/src/shared/CLucene/config/gunichartables \
+ CustomTarget/clucene/source/src/shared/CLucene/config/repl_tcslwr \
+ CustomTarget/clucene/source/src/shared/CLucene/config/repl_tcstoll \
+ CustomTarget/clucene/source/src/shared/CLucene/config/repl_tcscasecmp \
+ CustomTarget/clucene/source/src/shared/CLucene/config/repl_tprintf \
+ CustomTarget/clucene/source/src/shared/CLucene/config/repl_lltot \
+ CustomTarget/clucene/source/src/shared/CLucene/config/repl_tcstod \
+ CustomTarget/clucene/source/src/shared/CLucene/config/utf8 \
+ CustomTarget/clucene/source/src/shared/CLucene/config/threads \
+ CustomTarget/clucene/source/src/shared/CLucene/debug/condition \
+ CustomTarget/clucene/source/src/shared/CLucene/util/StringBuffer \
+ CustomTarget/clucene/source/src/shared/CLucene/util/Misc \
+ CustomTarget/clucene/source/src/shared/CLucene/util/dirent \
+ CustomTarget/clucene/source/src/core/CLucene/StdHeader \
+ CustomTarget/clucene/source/src/core/CLucene/debug/error \
+ CustomTarget/clucene/source/src/core/CLucene/util/ThreadLocal \
+ CustomTarget/clucene/source/src/core/CLucene/util/Reader \
+ CustomTarget/clucene/source/src/core/CLucene/util/Equators \
+ CustomTarget/clucene/source/src/core/CLucene/util/FastCharStream \
+ CustomTarget/clucene/source/src/core/CLucene/util/MD5Digester \
+ CustomTarget/clucene/source/src/core/CLucene/util/StringIntern \
+ CustomTarget/clucene/source/src/core/CLucene/util/BitSet \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/FastCharStream \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/MultiFieldQueryParser \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/QueryParser \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/QueryParserTokenManager \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/QueryToken \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/Lexer \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/MultiFieldQueryParser \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/QueryParser \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/QueryParserBase \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/QueryToken \
+ CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/TokenList \
+ CustomTarget/clucene/source/src/core/CLucene/analysis/standard/StandardAnalyzer \
+ CustomTarget/clucene/source/src/core/CLucene/analysis/standard/StandardFilter \
+ CustomTarget/clucene/source/src/core/CLucene/analysis/standard/StandardTokenizer \
+ CustomTarget/clucene/source/src/core/CLucene/analysis/Analyzers \
+ CustomTarget/clucene/source/src/core/CLucene/analysis/AnalysisHeader \
+ CustomTarget/clucene/source/src/core/CLucene/store/MMapInput \
+ CustomTarget/clucene/source/src/core/CLucene/store/IndexInput \
+ CustomTarget/clucene/source/src/core/CLucene/store/Lock \
+ CustomTarget/clucene/source/src/core/CLucene/store/LockFactory \
+ CustomTarget/clucene/source/src/core/CLucene/store/IndexOutput \
+ CustomTarget/clucene/source/src/core/CLucene/store/Directory \
+ CustomTarget/clucene/source/src/core/CLucene/store/FSDirectory \
+ CustomTarget/clucene/source/src/core/CLucene/store/RAMDirectory \
+ CustomTarget/clucene/source/src/core/CLucene/document/Document \
+ CustomTarget/clucene/source/src/core/CLucene/document/DateField \
+ CustomTarget/clucene/source/src/core/CLucene/document/DateTools \
+ CustomTarget/clucene/source/src/core/CLucene/document/Field \
+ CustomTarget/clucene/source/src/core/CLucene/document/FieldSelector \
+ CustomTarget/clucene/source/src/core/CLucene/document/NumberTools \
+ CustomTarget/clucene/source/src/core/CLucene/index/IndexFileNames \
+ CustomTarget/clucene/source/src/core/CLucene/index/IndexFileNameFilter \
+ CustomTarget/clucene/source/src/core/CLucene/index/IndexDeletionPolicy \
+ CustomTarget/clucene/source/src/core/CLucene/index/SegmentMergeInfo \
+ CustomTarget/clucene/source/src/core/CLucene/index/SegmentInfos \
+ CustomTarget/clucene/source/src/core/CLucene/index/MergeScheduler \
+ CustomTarget/clucene/source/src/core/CLucene/index/SegmentTermDocs \
+ CustomTarget/clucene/source/src/core/CLucene/index/FieldsWriter \
+ CustomTarget/clucene/source/src/core/CLucene/index/TermInfosWriter \
+ CustomTarget/clucene/source/src/core/CLucene/index/Term \
+ CustomTarget/clucene/source/src/core/CLucene/index/Terms \
+ CustomTarget/clucene/source/src/core/CLucene/index/MergePolicy \
+ CustomTarget/clucene/source/src/core/CLucene/index/DocumentsWriter \
+ CustomTarget/clucene/source/src/core/CLucene/index/DocumentsWriterThreadState \
+ CustomTarget/clucene/source/src/core/CLucene/index/SegmentTermVector \
+ CustomTarget/clucene/source/src/core/CLucene/index/TermVectorReader \
+ CustomTarget/clucene/source/src/core/CLucene/index/FieldInfos \
+ CustomTarget/clucene/source/src/core/CLucene/index/CompoundFile \
+ CustomTarget/clucene/source/src/core/CLucene/index/SkipListReader \
+ CustomTarget/clucene/source/src/core/CLucene/index/SkipListWriter \
+ CustomTarget/clucene/source/src/core/CLucene/index/IndexFileDeleter \
+ CustomTarget/clucene/source/src/core/CLucene/index/SegmentReader \
+ CustomTarget/clucene/source/src/core/CLucene/index/DirectoryIndexReader \
+ CustomTarget/clucene/source/src/core/CLucene/index/TermVectorWriter \
+ CustomTarget/clucene/source/src/core/CLucene/index/IndexReader \
+ CustomTarget/clucene/source/src/core/CLucene/index/SegmentTermPositions \
+ CustomTarget/clucene/source/src/core/CLucene/index/SegmentMerger \
+ CustomTarget/clucene/source/src/core/CLucene/index/IndexWriter \
+ CustomTarget/clucene/source/src/core/CLucene/index/MultiReader \
+ CustomTarget/clucene/source/src/core/CLucene/index/MultiSegmentReader \
+ CustomTarget/clucene/source/src/core/CLucene/index/Payload \
+ CustomTarget/clucene/source/src/core/CLucene/index/SegmentTermEnum \
+ CustomTarget/clucene/source/src/core/CLucene/index/TermInfo \
+ CustomTarget/clucene/source/src/core/CLucene/index/IndexModifier \
+ CustomTarget/clucene/source/src/core/CLucene/index/SegmentMergeQueue \
+ CustomTarget/clucene/source/src/core/CLucene/index/FieldsReader \
+ CustomTarget/clucene/source/src/core/CLucene/index/TermInfosReader \
+ CustomTarget/clucene/source/src/core/CLucene/index/MultipleTermPositions \
+ CustomTarget/clucene/source/src/core/CLucene/search/Compare \
+ CustomTarget/clucene/source/src/core/CLucene/search/Scorer \
+ CustomTarget/clucene/source/src/core/CLucene/search/ScorerDocQueue \
+ CustomTarget/clucene/source/src/core/CLucene/search/PhraseScorer \
+ CustomTarget/clucene/source/src/core/CLucene/search/SloppyPhraseScorer \
+ CustomTarget/clucene/source/src/core/CLucene/search/DisjunctionSumScorer \
+ CustomTarget/clucene/source/src/core/CLucene/search/ConjunctionScorer \
+ CustomTarget/clucene/source/src/core/CLucene/search/PhraseQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/PrefixQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/ExactPhraseScorer \
+ CustomTarget/clucene/source/src/core/CLucene/search/TermScorer \
+ CustomTarget/clucene/source/src/core/CLucene/search/Similarity \
+ CustomTarget/clucene/source/src/core/CLucene/search/BooleanScorer \
+ CustomTarget/clucene/source/src/core/CLucene/search/BooleanScorer2 \
+ CustomTarget/clucene/source/src/core/CLucene/search/HitQueue \
+ CustomTarget/clucene/source/src/core/CLucene/search/FieldCacheImpl \
+ CustomTarget/clucene/source/src/core/CLucene/search/ChainedFilter \
+ CustomTarget/clucene/source/src/core/CLucene/search/RangeFilter \
+ CustomTarget/clucene/source/src/core/CLucene/search/CachingWrapperFilter \
+ CustomTarget/clucene/source/src/core/CLucene/search/QueryFilter \
+ CustomTarget/clucene/source/src/core/CLucene/search/TermQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/FuzzyQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/SearchHeader \
+ CustomTarget/clucene/source/src/core/CLucene/search/RangeQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/IndexSearcher \
+ CustomTarget/clucene/source/src/core/CLucene/search/Sort \
+ CustomTarget/clucene/source/src/core/CLucene/search/PhrasePositions \
+ CustomTarget/clucene/source/src/core/CLucene/search/FieldDocSortedHitQueue \
+ CustomTarget/clucene/source/src/core/CLucene/search/WildcardTermEnum \
+ CustomTarget/clucene/source/src/core/CLucene/search/MultiSearcher \
+ CustomTarget/clucene/source/src/core/CLucene/search/Hits \
+ CustomTarget/clucene/source/src/core/CLucene/search/MultiTermQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/FilteredTermEnum \
+ CustomTarget/clucene/source/src/core/CLucene/search/FieldSortedHitQueue \
+ CustomTarget/clucene/source/src/core/CLucene/search/WildcardQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/Explanation \
+ CustomTarget/clucene/source/src/core/CLucene/search/BooleanQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/FieldCache \
+ CustomTarget/clucene/source/src/core/CLucene/search/DateFilter \
+ CustomTarget/clucene/source/src/core/CLucene/search/MatchAllDocsQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/MultiPhraseQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/ConstantScoreQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/CachingSpanFilter \
+ CustomTarget/clucene/source/src/core/CLucene/search/SpanQueryFilter \
+ CustomTarget/clucene/source/src/core/CLucene/search/spans/NearSpansOrdered \
+ CustomTarget/clucene/source/src/core/CLucene/search/spans/NearSpansUnordered \
+ CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanFirstQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanNearQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanNotQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanOrQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanScorer \
+ CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanTermQuery \
+ CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanWeight \
+ CustomTarget/clucene/source/src/core/CLucene/search/spans/TermSpans \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/analysis/PorterStemmer \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/Snowball \
+ ,$(if $(filter TRUE,$(EXTERNAL_WARNINGS_NOT_ERRORS)),\
+ $(filter-out $(gb_CXXFLAGS_WERROR),$(CXXFLAGS)),\
+ $(CXXFLAGS)) \
+ $(gb_COMPILEROPTFLAGS) \
))
$(eval $(call gb_Library_add_generated_cobjects,clucene,\
- clucene/src/contribs-lib/CLucene/snowball/libstemmer/libstemmer \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish \
- clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish \
- clucene/src/contribs-lib/CLucene/snowball/runtime/utilities \
- clucene/src/contribs-lib/CLucene/snowball/runtime/api \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/libstemmer/libstemmer \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/runtime/utilities \
+ CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/runtime/api \
+ ,$(if $(filter TRUE,$(EXTERNAL_WARNINGS_NOT_ERRORS)),\
+ $(filter-out $(gb_CFLAGS_WERROR),$(CFLAGS)),\
+ $(CFLAGS)) \
+ $(gb_COMPILEROPTFLAGS) \
))
-#FIXME, correct dependency
-$(call gb_Package_get_target,clucene_inc) : $(WORKDIR)/clucene/src/shared/CLucene/clucene-config.h
-
-$(WORKDIR)/clucene/src/shared/CLucene/clucene-config.h : $(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
- mkdir -p $(dir $@)
- $(GNUTAR) -x -C $(WORKDIR)/clucene --strip-component=1 -f $(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
- #FIXME ?, our rules expect .cxx
- for i in `find $(WORKDIR)/clucene -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done
- #dirent.h is a problem, move it around
- mkdir -p $(WORKDIR)/clucene/inc/internal/CLucene/util
- mv $(WORKDIR)/clucene/src/shared/CLucene/util/dirent.h $(WORKDIR)/clucene/inc/internal/CLucene/util
- #To generate these, run cmake for each sufficiently different platform, customize and stick into configs
- cp configs/_clucene-config-generic.h $(WORKDIR)/clucene/src/shared/CLucene/_clucene-config.h
- cp configs/clucene-config-generic.h $(WORKDIR)/clucene/src/shared/CLucene/clucene-config.h
-
-$(call gb_Library_get_clean_target,clucene) : clucene_clean
-
-clucene_clean :
- rm -rf $(WORKDIR)/clucene
-.PHONY: clucene_clean
-
# vim: set noet sw=4 ts=4:
diff --git a/clucene/Module_clucene.mk b/clucene/Module_clucene.mk
index e104d01..0eb7992 100644
--- a/clucene/Module_clucene.mk
+++ b/clucene/Module_clucene.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Module_Module,clucene))
$(eval $(call gb_Module_add_targets,clucene,\
Library_clucene \
- Package_inc \
+ Package_source \
))
# vim: set noet sw=4 ts=4:
diff --git a/clucene/Package_inc.mk b/clucene/Package_inc.mk
deleted file mode 100644
index 1bc5903..0000000
--- a/clucene/Package_inc.mk
+++ /dev/null
@@ -1,97 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,clucene_inc,$(WORKDIR)/clucene))
-
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/SharedHeader.h,src/shared/CLucene/SharedHeader.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/DirectoryIndexReader.h,src/core/CLucene/index/DirectoryIndexReader.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/Terms.h,src/core/CLucene/index/Terms.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/IndexDeletionPolicy.h,src/core/CLucene/index/IndexDeletionPolicy.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/MultipleTermPositions.h,src/core/CLucene/index/MultipleTermPositions.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/Term.h,src/core/CLucene/index/Term.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/IndexModifier.h,src/core/CLucene/index/IndexModifier.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/Payload.h,src/core/CLucene/index/Payload.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/MultiReader.h,src/core/CLucene/index/MultiReader.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/MergeScheduler.h,src/core/CLucene/index/MergeScheduler.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/TermVector.h,src/core/CLucene/index/TermVector.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/MergePolicy.h,src/core/CLucene/index/MergePolicy.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/IndexReader.h,src/core/CLucene/index/IndexReader.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/index/IndexWriter.h,src/core/CLucene/index/IndexWriter.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/MultiTermQuery.h,src/core/CLucene/search/MultiTermQuery.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/spans/SpanTermQuery.h,src/core/CLucene/search/spans/SpanTermQuery.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/spans/SpanQuery.h,src/core/CLucene/search/spans/SpanQuery.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/spans/SpanNotQuery.h,src/core/CLucene/search/spans/SpanNotQuery.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/spans/SpanScorer.h,src/core/CLucene/search/spans/SpanScorer.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/spans/SpanFirstQuery.h,src/core/CLucene/search/spans/SpanFirstQuery.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/spans/SpanNearQuery.h,src/core/CLucene/search/spans/SpanNearQuery.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/spans/SpanOrQuery.h,src/core/CLucene/search/spans/SpanOrQuery.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/spans/Spans.h,src/core/CLucene/search/spans/Spans.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/spans/SpanWeight.h,src/core/CLucene/search/spans/SpanWeight.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/Filter.h,src/core/CLucene/search/Filter.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/FieldSortedHitQueue.h,src/core/CLucene/search/FieldSortedHitQueue.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/SpanQueryFilter.h,src/core/CLucene/search/SpanQueryFilter.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/TermQuery.h,src/core/CLucene/search/TermQuery.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/search/MultiPhraseQuery.h,src/core/CLucene/search/MultiPhraseQuery.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/CLConfig.h,src/core/CLucene/CLConfig.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/CLucene/util/VoidList.h,src/core/CLucene/util/VoidList.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/CLucene/util/Reader.h,src/core/CLucene/util/Reader.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/CLucene/util/VoidMap.h,src/core/CLucene/util/VoidMap.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/CLucene/util/CLStreams.h,src/core/CLucene/util/CLStreams.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/CLucene/util/Array.h,src/core/CLucene/util/Array.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/CLucene/util/PriorityQueue.h,src/core/CLucene/util/PriorityQueue.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/CLucene/util/BitSet.h,src/core/CLucene/util/BitSet.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/CLucene/util/Equators.h,src/core/CLucene/util/Equators.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/queryParser/QueryParserConstants.h,src/core/CLucene/queryParser/QueryParserConstants.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/queryParser/QueryToken.h,src/core/CLucene/queryParser/QueryToken.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/queryParser/legacy/QueryToken.h,src/core/CLucene/queryParser/legacy/QueryToken.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/queryParser/legacy/MultiFieldQueryParser.h,src/core/CLucene/queryParser/legacy/MultiFieldQueryParser.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/queryParser/legacy/QueryParser.h,src/core/CLucene/queryParser/legacy/QueryParser.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/queryParser/MultiFieldQueryParser.h,src/core/CLucene/queryParser/MultiFieldQueryParser.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/queryParser/QueryParserTokenManager.h,src/core/CLucene/queryParser/QueryParserTokenManager.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/queryParser/QueryParser.h,src/core/CLucene/queryParser/QueryParser.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/LuceneThreads.h,src/shared/CLucene/LuceneThreads.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/store/LockFactory.h,src/core/CLucene/store/LockFactory.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/store/Lock.h,src/core/CLucene/store/Lock.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/store/Directory.h,src/core/CLucene/store/Directory.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/store/RAMDirectory.h,src/core/CLucene/store/RAMDirectory.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/store/IndexInput.h,src/core/CLucene/store/IndexInput.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/store/FSDirectory.h,src/core/CLucene/store/FSDirectory.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/store/IndexOutput.h,src/core/CLucene/store/IndexOutput.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/StdHeader.h,src/core/CLucene/StdHeader.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/debug/error.h,src/core/CLucene/debug/error.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/debug/mem.h,src/core/CLucene/debug/mem.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/debug/lucenebase.h,src/core/CLucene/debug/lucenebase.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/analysis/CachingTokenFilter.h,src/core/CLucene/analysis/CachingTokenFilter.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/analysis/AnalysisHeader.h,src/core/CLucene/analysis/AnalysisHeader.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/analysis/Analyzers.h,src/core/CLucene/analysis/Analyzers.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/analysis/standard/StandardTokenizer.h,src/core/CLucene/analysis/standard/StandardTokenizer.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/analysis/standard/StandardFilter.h,src/core/CLucene/analysis/standard/StandardFilter.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/analysis/standard/StandardTokenizerConstants.h,src/core/CLucene/analysis/standard/StandardTokenizerConstants.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/analysis/standard/StandardAnalyzer.h,src/core/CLucene/analysis/standard/StandardAnalyzer.h))
-$(eval $(call gb_Package_add_file,clucene_inc,inc/CLucene/analysis/LanguageBasedAnalyzer.h,src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.h))
-
-# vim: set noet sw=4 ts=4:
diff --git a/clucene/Package_source.mk b/clucene/Package_source.mk
new file mode 100644
index 0000000..b8a774e
--- /dev/null
+++ b/clucene/Package_source.mk
@@ -0,0 +1,110 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+# (initial developer)
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,clucene_source,$(WORKDIR)/CustomTarget/clucene/source))
+
+$(eval $(call gb_Package_add_customtarget,clucene_source,clucene/source))
+
+$(eval $(call gb_CustomTarget_add_dependencies,clucene/source,\
+ clucene/configs/_clucene-config-generic.h \
+ clucene/configs/clucene-config-generic.h \
+))
+
+# FIXME: do not hardcode the path here
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,clucene/source,\
+ $(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz \
+))
+
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/SharedHeader.h,src/shared/CLucene/SharedHeader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/DirectoryIndexReader.h,src/core/CLucene/index/DirectoryIndexReader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/Terms.h,src/core/CLucene/index/Terms.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/IndexDeletionPolicy.h,src/core/CLucene/index/IndexDeletionPolicy.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/MultipleTermPositions.h,src/core/CLucene/index/MultipleTermPositions.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/Term.h,src/core/CLucene/index/Term.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/IndexModifier.h,src/core/CLucene/index/IndexModifier.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/Payload.h,src/core/CLucene/index/Payload.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/MultiReader.h,src/core/CLucene/index/MultiReader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/MergeScheduler.h,src/core/CLucene/index/MergeScheduler.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/TermVector.h,src/core/CLucene/index/TermVector.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/MergePolicy.h,src/core/CLucene/index/MergePolicy.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/IndexReader.h,src/core/CLucene/index/IndexReader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/index/IndexWriter.h,src/core/CLucene/index/IndexWriter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/MultiTermQuery.h,src/core/CLucene/search/MultiTermQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanTermQuery.h,src/core/CLucene/search/spans/SpanTermQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanQuery.h,src/core/CLucene/search/spans/SpanQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanNotQuery.h,src/core/CLucene/search/spans/SpanNotQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanScorer.h,src/core/CLucene/search/spans/SpanScorer.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanFirstQuery.h,src/core/CLucene/search/spans/SpanFirstQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanNearQuery.h,src/core/CLucene/search/spans/SpanNearQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanOrQuery.h,src/core/CLucene/search/spans/SpanOrQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/Spans.h,src/core/CLucene/search/spans/Spans.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/spans/SpanWeight.h,src/core/CLucene/search/spans/SpanWeight.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/Filter.h,src/core/CLucene/search/Filter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/FieldSortedHitQueue.h,src/core/CLucene/search/FieldSortedHitQueue.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/SpanQueryFilter.h,src/core/CLucene/search/SpanQueryFilter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/TermQuery.h,src/core/CLucene/search/TermQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/search/MultiPhraseQuery.h,src/core/CLucene/search/MultiPhraseQuery.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/CLConfig.h,src/core/CLucene/CLConfig.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/CLucene/util/VoidList.h,src/core/CLucene/util/VoidList.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/CLucene/util/Reader.h,src/core/CLucene/util/Reader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/CLucene/util/VoidMap.h,src/core/CLucene/util/VoidMap.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/CLucene/util/CLStreams.h,src/core/CLucene/util/CLStreams.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/CLucene/util/Array.h,src/core/CLucene/util/Array.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/CLucene/util/PriorityQueue.h,src/core/CLucene/util/PriorityQueue.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/CLucene/util/BitSet.h,src/core/CLucene/util/BitSet.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/CLucene/util/Equators.h,src/core/CLucene/util/Equators.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/QueryParserConstants.h,src/core/CLucene/queryParser/QueryParserConstants.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/QueryToken.h,src/core/CLucene/queryParser/QueryToken.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/legacy/QueryToken.h,src/core/CLucene/queryParser/legacy/QueryToken.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/legacy/MultiFieldQueryParser.h,src/core/CLucene/queryParser/legacy/MultiFieldQueryParser.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/legacy/QueryParser.h,src/core/CLucene/queryParser/legacy/QueryParser.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/MultiFieldQueryParser.h,src/core/CLucene/queryParser/MultiFieldQueryParser.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/QueryParserTokenManager.h,src/core/CLucene/queryParser/QueryParserTokenManager.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/queryParser/QueryParser.h,src/core/CLucene/queryParser/QueryParser.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/LuceneThreads.h,src/shared/CLucene/LuceneThreads.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/LockFactory.h,src/core/CLucene/store/LockFactory.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/Lock.h,src/core/CLucene/store/Lock.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/Directory.h,src/core/CLucene/store/Directory.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/RAMDirectory.h,src/core/CLucene/store/RAMDirectory.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/IndexInput.h,src/core/CLucene/store/IndexInput.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/FSDirectory.h,src/core/CLucene/store/FSDirectory.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/store/IndexOutput.h,src/core/CLucene/store/IndexOutput.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/StdHeader.h,src/core/CLucene/StdHeader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/debug/error.h,src/core/CLucene/debug/error.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/debug/mem.h,src/core/CLucene/debug/mem.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/debug/lucenebase.h,src/core/CLucene/debug/lucenebase.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/CachingTokenFilter.h,src/core/CLucene/analysis/CachingTokenFilter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/AnalysisHeader.h,src/core/CLucene/analysis/AnalysisHeader.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/Analyzers.h,src/core/CLucene/analysis/Analyzers.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/standard/StandardTokenizer.h,src/core/CLucene/analysis/standard/StandardTokenizer.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/standard/StandardFilter.h,src/core/CLucene/analysis/standard/StandardFilter.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/standard/StandardTokenizerConstants.h,src/core/CLucene/analysis/standard/StandardTokenizerConstants.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/standard/StandardAnalyzer.h,src/core/CLucene/analysis/standard/StandardAnalyzer.h))
+$(eval $(call gb_Package_add_file,clucene_source,inc/CLucene/analysis/LanguageBasedAnalyzer.h,src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer.h))
+
+# vim: set noet sw=4 ts=4:
diff --git a/clucene/source/Makefile b/clucene/source/Makefile
new file mode 100644
index 0000000..9a274c1
--- /dev/null
+++ b/clucene/source/Makefile
@@ -0,0 +1,49 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara <caolanm at redhat.com>
+# (initial developer)
+# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+gb_PARTIALBUILD := T
+include $(GBUILDDIR)/gbuild_simple.mk
+
+done :
+ mkdir -p $(dir $@)
+ # FIXME: do not hardcode the path here
+ $(GNUTAR) -x --strip-component=1 -f $(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+ #FIXME ?, our rules expect .cxx
+ for i in `find . -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done
+ #dirent.h is a problem, move it around
+ mkdir -p inc/internal/CLucene/util
+ mv src/shared/CLucene/util/dirent.h inc/internal/CLucene/util
+ #To generate these, run cmake for each sufficiently different platform, customize and stick into configs
+ cp $(SRCDIR)/clucene/configs/_clucene-config-generic.h src/shared/CLucene/_clucene-config.h
+ cp $(SRCDIR)/clucene/configs/clucene-config-generic.h src/shared/CLucene/clucene-config.h
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : done
+
+# vim: set noet sw=4 ts=4:
commit 9b3963ce53c2c4467dfdf085f07d76b4234e272f
Author: David Tardon <dtardon at redhat.com>
Date: Thu Feb 16 06:11:52 2012 +0100
remove duplicated assignment
diff --git a/slideshow/source/engine/transitions/shapetransitionfactory.cxx b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
index 0079f00..4185b37 100644
--- a/slideshow/source/engine/transitions/shapetransitionfactory.cxx
+++ b/slideshow/source/engine/transitions/shapetransitionfactory.cxx
@@ -143,10 +143,6 @@ void ClippingAnimation::start( const AnimatableShapeSharedPtr& rShape,
"ClippingAnimation::start(): Shape already set" );
OSL_ENSURE( !mpAttrLayer,
"ClippingAnimation::start(): Attribute layer already set" );
-
- mpShape = rShape;
- mpAttrLayer = rAttrLayer;
-
ENSURE_OR_THROW( rShape,
"ClippingAnimation::start(): Invalid shape" );
ENSURE_OR_THROW( rAttrLayer,
More information about the Libreoffice-commits
mailing list