beagle r4561 - in branches/beagle-win32-branch: . old-code/Beagle.Daemon.WebInterface old-code/UiUtil src src/Beagle src/Beagle.Daemon/Beagle.Daemon.WebInterface src/Beagle.Engine src/Beagle.Engine/Beagle.Engine src/Beagle.Util src/Beagle.Util/Beagle.Util

From: llipka svn gnome org
To: svn-commits-list gnome org
Subject: beagle r4561 - in branches/beagle-win32-branch: . old-code/Beagle.Daemon.WebInterface old-code/UiUtil src src/Beagle src/Beagle.Daemon/Beagle.Daemon.WebInterface src/Beagle.Engine src/Beagle.Engine/Beagle.Engine src/Beagle.Util src/Beagle.Util/Beagle.Util
Date: Fri, 29 Feb 2008 00:21:16 +0000 (GMT)
Author: llipka
Date: Fri Feb 29 00:21:16 2008
New Revision: 4561
URL: http://svn.gnome.org/viewvc/beagle?rev=4561&view=rev

Log:
Nice - get libbeagleglue, Beagle.Util, Beagle building.

Added:
   branches/beagle-win32-branch/old-code/Beagle.Daemon.WebInterface/
      - copied from r4559, /branches/beagle-win32-branch/src/Beagle.Daemon/Beagle.Daemon.WebInterface/
   branches/beagle-win32-branch/old-code/UiUtil/
   branches/beagle-win32-branch/old-code/UiUtil/CompatFileChooser.cs
      - copied unchanged from r4559, /branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/CompatFileChooser.cs
   branches/beagle-win32-branch/old-code/UiUtil/GnomeFu.cs
      - copied unchanged from r4559, /branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/GnomeFu.cs
   branches/beagle-win32-branch/old-code/UiUtil/GtkUtils.cs
      - copied unchanged from r4559, /branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/GtkUtils.cs
   branches/beagle-win32-branch/old-code/UiUtil/HigMessageDialog.cs
      - copied unchanged from r4559, /branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/HigMessageDialog.cs
   branches/beagle-win32-branch/old-code/UiUtil/XKeybinder.cs
      - copied unchanged from r4559, /branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/XKeybinder.cs
Removed:
   branches/beagle-win32-branch/src/Beagle.Daemon/Beagle.Daemon.WebInterface/
   branches/beagle-win32-branch/src/Beagle.Engine/Beagle.Engine/AssemblyInfo.cs
   branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/CompatFileChooser.cs
   branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/GnomeFu.cs
   branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/GtkUtils.cs
   branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/HigMessageDialog.cs
   branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/XKeybinder.cs
   branches/beagle-win32-branch/src/Beagle.Util/inotify-test
Modified:
   branches/beagle-win32-branch/configure.in
   branches/beagle-win32-branch/src/Beagle.Engine/Makefile.am
   branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/ExceptionHandlingThread.cs
   branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/SafeProcess.cs
   branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/StringFu.cs
   branches/beagle-win32-branch/src/Beagle.Util/Makefile.am
   branches/beagle-win32-branch/src/Beagle/Makefile.am
   branches/beagle-win32-branch/src/Makefile.am

Modified: branches/beagle-win32-branch/configure.in
==============================================================================
--- branches/beagle-win32-branch/configure.in	(original)
+++ branches/beagle-win32-branch/configure.in	Fri Feb 29 00:21:16 2008
@@ -617,6 +617,8 @@
 src/Beagle.Util/Beagle.Util.dll.config
 src/Beagle/Makefile
 src/Beagle/AssemblyInfo.cs
+src/Beagle.Engine/Makefile
+src/Beagle.Engine/AssemblyInfo.cs
 src/Beagle.Daemon/Makefile
 src/Beagle.Daemon/AssemblyInfo.cs
 src/Beagle.Filters/Makefile

Modified: branches/beagle-win32-branch/src/Beagle.Engine/Makefile.am
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Engine/Makefile.am	(original)
+++ branches/beagle-win32-branch/src/Beagle.Engine/Makefile.am	Fri Feb 29 00:21:16 2008
@@ -48,217 +48,217 @@
 	Beagle.Engine/TextCache.cs \
 	Beagle.Engine/WebServer.cs \
 	Lucene.Net/Analysis/Analyzer.cs \
-	Lucene.Net/Analysis/CharTokenizer.cs				\
-	Lucene.Net/Analysis/ISOLatin1AccentFilter.cs			\
-	Lucene.Net/Analysis/KeywordAnalyzer.cs			\
-	Lucene.Net/Analysis/KeywordTokenizer.cs			\
-	Lucene.Net/Analysis/LengthFilter.cs				\
-	Lucene.Net/Analysis/LetterTokenizer.cs			\
-	Lucene.Net/Analysis/LowerCaseFilter.cs			\
-	Lucene.Net/Analysis/LowerCaseTokenizer.cs			\
-	Lucene.Net/Analysis/PerFieldAnalyzerWrapper.cs		\
-	Lucene.Net/Analysis/PorterStemFilter.cs			\
-	Lucene.Net/Analysis/PorterStemmer.cs				\
-	Lucene.Net/Analysis/SimpleAnalyzer.cs				\
-	Lucene.Net/Analysis/Standard/CharStream.cs			\
-	Lucene.Net/Analysis/Standard/FastCharStream.cs		\
-	Lucene.Net/Analysis/Standard/ParseException.cs		\
-	Lucene.Net/Analysis/Standard/StandardAnalyzer.cs		\
-	Lucene.Net/Analysis/Standard/StandardFilter.cs		\
-	Lucene.Net/Analysis/Standard/StandardTokenizer.cs		\
-	Lucene.Net/Analysis/Standard/StandardTokenizerConstants.cs	\
-	Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs	\
-	Lucene.Net/Analysis/Standard/Token.cs				\
-	Lucene.Net/Analysis/Standard/TokenMgrError.cs			\
-	Lucene.Net/Analysis/StopAnalyzer.cs				\
-	Lucene.Net/Analysis/StopFilter.cs				\
-	Lucene.Net/Analysis/Token.cs					\
-	Lucene.Net/Analysis/TokenFilter.cs				\
-	Lucene.Net/Analysis/TokenStream.cs				\
-	Lucene.Net/Analysis/Tokenizer.cs				\
-	Lucene.Net/Analysis/WhitespaceAnalyzer.cs			\
-	Lucene.Net/Analysis/WhitespaceTokenizer.cs			\
-	Lucene.Net/Analysis/WordlistLoader.cs				\
-	Lucene.Net/Document/DateField.cs				\
-	Lucene.Net/Document/DateTools.cs				\
-	Lucene.Net/Document/Document.cs				\
-	Lucene.Net/Document/Field.cs					\
-	Lucene.Net/Document/NumberTools.cs				\
-	Lucene.Net/Index/CompoundFileReader.cs			\
-	Lucene.Net/Index/CompoundFileWriter.cs			\
-	Lucene.Net/Index/DocumentWriter.cs				\
-	Lucene.Net/Index/FieldInfo.cs					\
-	Lucene.Net/Index/FieldInfos.cs				\
-	Lucene.Net/Index/FieldsReader.cs				\
-	Lucene.Net/Index/FieldsWriter.cs				\
-	Lucene.Net/Index/FilterIndexReader.cs				\
-	Lucene.Net/Index/IndexFileNameFilter.cs			\
-	Lucene.Net/Index/IndexFileNames.cs				\
-	Lucene.Net/Index/IndexModifier.cs				\
-	Lucene.Net/Index/IndexReader.cs				\
-	Lucene.Net/Index/IndexWriter.cs				\
-	Lucene.Net/Index/MultiReader.cs				\
-	Lucene.Net/Index/MultipleTermPositions.cs			\
-	Lucene.Net/Index/ParallelReader.cs				\
-	Lucene.Net/Index/SegmentInfo.cs				\
-	Lucene.Net/Index/SegmentInfos.cs				\
-	Lucene.Net/Index/SegmentMergeInfo.cs				\
-	Lucene.Net/Index/SegmentMergeQueue.cs				\
-	Lucene.Net/Index/SegmentMerger.cs				\
-	Lucene.Net/Index/SegmentReader.cs				\
-	Lucene.Net/Index/SegmentTermDocs.cs				\
-	Lucene.Net/Index/SegmentTermEnum.cs				\
-	Lucene.Net/Index/SegmentTermPositionVector.cs			\
-	Lucene.Net/Index/SegmentTermPositions.cs			\
-	Lucene.Net/Index/SegmentTermVector.cs				\
-	Lucene.Net/Index/Term.cs					\
-	Lucene.Net/Index/TermBuffer.cs				\
-	Lucene.Net/Index/TermDocs.cs					\
-	Lucene.Net/Index/TermEnum.cs					\
-	Lucene.Net/Index/TermFreqVector.cs				\
-	Lucene.Net/Index/TermInfo.cs					\
-	Lucene.Net/Index/TermInfosReader.cs				\
-	Lucene.Net/Index/TermInfosWriter.cs				\
-	Lucene.Net/Index/TermPositionVector.cs			\
-	Lucene.Net/Index/TermPositions.cs				\
-	Lucene.Net/Index/TermVectorOffsetInfo.cs			\
-	Lucene.Net/Index/TermVectorsReader.cs				\
-	Lucene.Net/Index/TermVectorsWriter.cs				\
-	Lucene.Net/LucenePackage.cs					\
-	Lucene.Net/QueryParser/CharStream.cs				\
-	Lucene.Net/QueryParser/FastCharStream.cs			\
-	Lucene.Net/QueryParser/MultiFieldQueryParser.cs		\
-	Lucene.Net/QueryParser/ParseException.cs			\
-	Lucene.Net/QueryParser/QueryParser.cs				\
-	Lucene.Net/QueryParser/QueryParserConstants.cs		\
-	Lucene.Net/QueryParser/QueryParserTokenManager.cs		\
-	Lucene.Net/QueryParser/Token.cs				\
-	Lucene.Net/QueryParser/TokenMgrError.cs			\
-	Lucene.Net/Search/BooleanClause.cs				\
-	Lucene.Net/Search/BooleanQuery.cs				\
-	Lucene.Net/Search/BooleanScorer.cs				\
-	Lucene.Net/Search/BooleanScorer2.cs				\
-	Lucene.Net/Search/CachingWrapperFilter.cs			\
-	Lucene.Net/Search/ConjunctionScorer.cs			\
-	Lucene.Net/Search/ConstantScoreQuery.cs			\
-	Lucene.Net/Search/ConstantScoreRangeQuery.cs			\
-	Lucene.Net/Search/DateFilter.cs				\
-	Lucene.Net/Search/DefaultSimilarity.cs			\
-	Lucene.Net/Search/DisjunctionMaxQuery.cs			\
-	Lucene.Net/Search/DisjunctionMaxScorer.cs			\
-	Lucene.Net/Search/DisjunctionSumScorer.cs			\
-	Lucene.Net/Search/ExactPhraseScorer.cs			\
-	Lucene.Net/Search/Explanation.cs				\
-	Lucene.Net/Search/FieldCache.cs				\
-	Lucene.Net/Search/FieldCacheImpl.cs				\
-	Lucene.Net/Search/FieldDoc.cs					\
-	Lucene.Net/Search/FieldDocSortedHitQueue.cs			\
-	Lucene.Net/Search/FieldSortedHitQueue.cs			\
-	Lucene.Net/Search/Filter.cs					\
-	Lucene.Net/Search/FilteredQuery.cs				\
-	Lucene.Net/Search/FilteredTermEnum.cs				\
-	Lucene.Net/Search/FuzzyQuery.cs				\
-	Lucene.Net/Search/FuzzyTermEnum.cs				\
-	Lucene.Net/Search/Hit.cs					\
-	Lucene.Net/Search/HitCollector.cs				\
-	Lucene.Net/Search/HitIterator.cs				\
-	Lucene.Net/Search/HitQueue.cs					\
-	Lucene.Net/Search/Hits.cs					\
-	Lucene.Net/Search/IndexSearcher.cs				\
-	Lucene.Net/Search/MatchAllDocsQuery.cs			\
-	Lucene.Net/Search/MultiPhraseQuery.cs				\
-	Lucene.Net/Search/MultiSearcher.cs				\
-	Lucene.Net/Search/MultiTermQuery.cs				\
-	Lucene.Net/Search/NonMatchingScorer.cs			\
-	Lucene.Net/Search/ParallelMultiSearcher.cs			\
-	Lucene.Net/Search/PhrasePositions.cs				\
-	Lucene.Net/Search/PhrasePrefixQuery.cs			\
-	Lucene.Net/Search/PhraseQuery.cs				\
-	Lucene.Net/Search/PhraseQueue.cs				\
-	Lucene.Net/Search/PhraseScorer.cs				\
-	Lucene.Net/Search/PrefixQuery.cs				\
-	Lucene.Net/Search/Query.cs					\
-	Lucene.Net/Search/QueryFilter.cs				\
-	Lucene.Net/Search/QueryTermVector.cs				\
-	Lucene.Net/Search/RangeFilter.cs				\
-	Lucene.Net/Search/RangeQuery.cs				\
-	Lucene.Net/Search/Regex/RegexQuery.cs				\
-	Lucene.Net/Search/Regex/RegexTermEnum.cs			\
-	Lucene.Net/Search/Regex/SpanRegexQuery.cs			\
-	Lucene.Net/Search/ReqExclScorer.cs				\
-	Lucene.Net/Search/ReqOptSumScorer.cs				\
-	Lucene.Net/Search/ScoreDoc.cs					\
-	Lucene.Net/Search/ScoreDocComparator.cs			\
-	Lucene.Net/Search/Scorer.cs					\
-	Lucene.Net/Search/Searchable.cs				\
-	Lucene.Net/Search/Searcher.cs					\
-	Lucene.Net/Search/Similarity.cs				\
-	Lucene.Net/Search/SimilarityDelegator.cs			\
-	Lucene.Net/Search/SloppyPhraseScorer.cs			\
-	Lucene.Net/Search/Sort.cs					\
-	Lucene.Net/Search/SortComparator.cs				\
-	Lucene.Net/Search/SortComparatorSource.cs			\
-	Lucene.Net/Search/SortField.cs				\
-	Lucene.Net/Search/Spans/NearSpans.cs				\
-	Lucene.Net/Search/Spans/SpanFirstQuery.cs			\
-	Lucene.Net/Search/Spans/SpanNearQuery.cs			\
-	Lucene.Net/Search/Spans/SpanNotQuery.cs			\
-	Lucene.Net/Search/Spans/SpanOrQuery.cs			\
-	Lucene.Net/Search/Spans/SpanQuery.cs				\
-	Lucene.Net/Search/Spans/SpanScorer.cs				\
-	Lucene.Net/Search/Spans/SpanTermQuery.cs			\
-	Lucene.Net/Search/Spans/SpanWeight.cs				\
-	Lucene.Net/Search/Spans/Spans.cs				\
-	Lucene.Net/Search/TermQuery.cs				\
-	Lucene.Net/Search/TermScorer.cs				\
-	Lucene.Net/Search/TopDocs.cs					\
-	Lucene.Net/Search/TopFieldDocs.cs				\
-	Lucene.Net/Search/Weight.cs					\
-	Lucene.Net/Search/WildcardQuery.cs				\
-	Lucene.Net/Search/WildcardTermEnum.cs				\
-	Lucene.Net/SharpZipLibAdapter.cs				\
-	Lucene.Net/Store/BufferedIndexInput.cs			\
-	Lucene.Net/Store/BufferedIndexOutput.cs			\
-	Lucene.Net/Store/Directory.cs					\
-	Lucene.Net/Store/FSDirectory.cs				\
-	Lucene.Net/Store/IndexInput.cs				\
-	Lucene.Net/Store/IndexOutput.cs				\
-	Lucene.Net/Store/InputStream.cs				\
-	Lucene.Net/Store/Lock.cs					\
-	Lucene.Net/Store/MMapDirectory.cs				\
-	Lucene.Net/Store/OutputStream.cs				\
-	Lucene.Net/Store/RAMDirectory.cs				\
-	Lucene.Net/Store/RAMFile.cs					\
-	Lucene.Net/Store/RAMInputStream.cs				\
-	Lucene.Net/Store/RAMOutputStream.cs				\
+	Lucene.Net/Analysis/CharTokenizer.cs \
+	Lucene.Net/Analysis/ISOLatin1AccentFilter.cs \
+	Lucene.Net/Analysis/KeywordAnalyzer.cs \
+	Lucene.Net/Analysis/KeywordTokenizer.cs \
+	Lucene.Net/Analysis/LengthFilter.cs \
+	Lucene.Net/Analysis/LetterTokenizer.cs \
+	Lucene.Net/Analysis/LowerCaseFilter.cs \
+	Lucene.Net/Analysis/LowerCaseTokenizer.cs \
+	Lucene.Net/Analysis/PerFieldAnalyzerWrapper.cs \
+	Lucene.Net/Analysis/PorterStemFilter.cs \
+	Lucene.Net/Analysis/PorterStemmer.cs \
+	Lucene.Net/Analysis/SimpleAnalyzer.cs \
+	Lucene.Net/Analysis/Standard/CharStream.cs \
+	Lucene.Net/Analysis/Standard/FastCharStream.cs \
+	Lucene.Net/Analysis/Standard/ParseException.cs \
+	Lucene.Net/Analysis/Standard/StandardAnalyzer.cs \
+	Lucene.Net/Analysis/Standard/StandardFilter.cs \
+	Lucene.Net/Analysis/Standard/StandardTokenizer.cs \
+	Lucene.Net/Analysis/Standard/StandardTokenizerConstants.cs \
+	Lucene.Net/Analysis/Standard/StandardTokenizerTokenManager.cs \
+	Lucene.Net/Analysis/Standard/Token.cs \
+	Lucene.Net/Analysis/Standard/TokenMgrError.cs \
+	Lucene.Net/Analysis/StopAnalyzer.cs \
+	Lucene.Net/Analysis/StopFilter.cs \
+	Lucene.Net/Analysis/Token.cs \
+	Lucene.Net/Analysis/TokenFilter.cs \
+	Lucene.Net/Analysis/TokenStream.cs \
+	Lucene.Net/Analysis/Tokenizer.cs \
+	Lucene.Net/Analysis/WhitespaceAnalyzer.cs \
+	Lucene.Net/Analysis/WhitespaceTokenizer.cs \
+	Lucene.Net/Analysis/WordlistLoader.cs \
+	Lucene.Net/Document/DateField.cs \
+	Lucene.Net/Document/DateTools.cs \
+	Lucene.Net/Document/Document.cs \
+	Lucene.Net/Document/Field.cs \
+	Lucene.Net/Document/NumberTools.cs \
+	Lucene.Net/Index/CompoundFileReader.cs \
+	Lucene.Net/Index/CompoundFileWriter.cs \
+	Lucene.Net/Index/DocumentWriter.cs \
+	Lucene.Net/Index/FieldInfo.cs \
+	Lucene.Net/Index/FieldInfos.cs \
+	Lucene.Net/Index/FieldsReader.cs \
+	Lucene.Net/Index/FieldsWriter.cs \
+	Lucene.Net/Index/FilterIndexReader.cs \
+	Lucene.Net/Index/IndexFileNameFilter.cs \
+	Lucene.Net/Index/IndexFileNames.cs \
+	Lucene.Net/Index/IndexModifier.cs \
+	Lucene.Net/Index/IndexReader.cs \
+	Lucene.Net/Index/IndexWriter.cs \
+	Lucene.Net/Index/MultiReader.cs \
+	Lucene.Net/Index/MultipleTermPositions.cs \
+	Lucene.Net/Index/ParallelReader.cs \
+	Lucene.Net/Index/SegmentInfo.cs \
+	Lucene.Net/Index/SegmentInfos.cs \
+	Lucene.Net/Index/SegmentMergeInfo.cs \
+	Lucene.Net/Index/SegmentMergeQueue.cs \
+	Lucene.Net/Index/SegmentMerger.cs \
+	Lucene.Net/Index/SegmentReader.cs \
+	Lucene.Net/Index/SegmentTermDocs.cs \
+	Lucene.Net/Index/SegmentTermEnum.cs \
+	Lucene.Net/Index/SegmentTermPositionVector.cs \
+	Lucene.Net/Index/SegmentTermPositions.cs \
+	Lucene.Net/Index/SegmentTermVector.cs \
+	Lucene.Net/Index/Term.cs \
+	Lucene.Net/Index/TermBuffer.cs \
+	Lucene.Net/Index/TermDocs.cs \
+	Lucene.Net/Index/TermEnum.cs \
+	Lucene.Net/Index/TermFreqVector.cs \
+	Lucene.Net/Index/TermInfo.cs \
+	Lucene.Net/Index/TermInfosReader.cs \
+	Lucene.Net/Index/TermInfosWriter.cs \
+	Lucene.Net/Index/TermPositionVector.cs \
+	Lucene.Net/Index/TermPositions.cs \
+	Lucene.Net/Index/TermVectorOffsetInfo.cs \
+	Lucene.Net/Index/TermVectorsReader.cs \
+	Lucene.Net/Index/TermVectorsWriter.cs \
+	Lucene.Net/QueryParser/CharStream.cs \
+	Lucene.Net/QueryParser/FastCharStream.cs \
+	Lucene.Net/QueryParser/MultiFieldQueryParser.cs \
+	Lucene.Net/QueryParser/ParseException.cs \
+	Lucene.Net/QueryParser/QueryParser.cs \
+	Lucene.Net/QueryParser/QueryParserConstants.cs \
+	Lucene.Net/QueryParser/QueryParserTokenManager.cs \
+	Lucene.Net/QueryParser/Token.cs \
+	Lucene.Net/QueryParser/TokenMgrError.cs \
+	Lucene.Net/Search/BooleanClause.cs \
+	Lucene.Net/Search/BooleanQuery.cs \
+	Lucene.Net/Search/BooleanScorer.cs \
+	Lucene.Net/Search/BooleanScorer2.cs \
+	Lucene.Net/Search/CachingWrapperFilter.cs \
+	Lucene.Net/Search/ConjunctionScorer.cs \
+	Lucene.Net/Search/ConstantScoreQuery.cs \
+	Lucene.Net/Search/ConstantScoreRangeQuery.cs \
+	Lucene.Net/Search/DateFilter.cs \
+	Lucene.Net/Search/DefaultSimilarity.cs \
+	Lucene.Net/Search/DisjunctionMaxQuery.cs \
+	Lucene.Net/Search/DisjunctionMaxScorer.cs \
+	Lucene.Net/Search/DisjunctionSumScorer.cs \
+	Lucene.Net/Search/ExactPhraseScorer.cs \
+	Lucene.Net/Search/Explanation.cs \
+	Lucene.Net/Search/FieldCache.cs	\
+	Lucene.Net/Search/FieldCacheImpl.cs \
+	Lucene.Net/Search/FieldDoc.cs \
+	Lucene.Net/Search/FieldDocSortedHitQueue.cs \
+	Lucene.Net/Search/FieldSortedHitQueue.cs \
+	Lucene.Net/Search/Filter.cs \
+	Lucene.Net/Search/FilteredQuery.cs \
+	Lucene.Net/Search/FilteredTermEnum.cs \
+	Lucene.Net/Search/FuzzyQuery.cs \
+	Lucene.Net/Search/FuzzyTermEnum.cs \
+	Lucene.Net/Search/Hit.cs \
+	Lucene.Net/Search/HitCollector.cs \
+	Lucene.Net/Search/HitIterator.cs \
+	Lucene.Net/Search/HitQueue.cs \
+	Lucene.Net/Search/Hits.cs \
+	Lucene.Net/Search/IndexSearcher.cs \
+	Lucene.Net/Search/MatchAllDocsQuery.cs \
+	Lucene.Net/Search/MultiPhraseQuery.cs \
+	Lucene.Net/Search/MultiSearcher.cs \
+	Lucene.Net/Search/MultiTermQuery.cs \
+	Lucene.Net/Search/NonMatchingScorer.cs \
+	Lucene.Net/Search/ParallelMultiSearcher.cs \
+	Lucene.Net/Search/PhrasePositions.cs \
+	Lucene.Net/Search/PhrasePrefixQuery.cs \
+	Lucene.Net/Search/PhraseQuery.cs \
+	Lucene.Net/Search/PhraseQueue.cs \
+	Lucene.Net/Search/PhraseScorer.cs \
+	Lucene.Net/Search/PrefixQuery.cs \
+	Lucene.Net/Search/Query.cs \
+	Lucene.Net/Search/QueryFilter.cs \
+	Lucene.Net/Search/QueryTermVector.cs \
+	Lucene.Net/Search/RangeFilter.cs \
+	Lucene.Net/Search/RangeQuery.cs \
+	Lucene.Net/Search/Regex/RegexQuery.cs \
+	Lucene.Net/Search/Regex/RegexTermEnum.cs \
+	Lucene.Net/Search/Regex/SpanRegexQuery.cs \
+	Lucene.Net/Search/ReqExclScorer.cs \
+	Lucene.Net/Search/ReqOptSumScorer.cs \
+	Lucene.Net/Search/ScoreDoc.cs \
+	Lucene.Net/Search/ScoreDocComparator.cs \
+	Lucene.Net/Search/Scorer.cs \
+	Lucene.Net/Search/Searchable.cs	\
+	Lucene.Net/Search/Searcher.cs \
+	Lucene.Net/Search/Similarity.cs	\
+	Lucene.Net/Search/SimilarityDelegator.cs \
+	Lucene.Net/Search/SloppyPhraseScorer.cs \
+	Lucene.Net/Search/Sort.cs \
+	Lucene.Net/Search/SortComparator.cs \
+	Lucene.Net/Search/SortComparatorSource.cs \
+	Lucene.Net/Search/SortField.cs \
+	Lucene.Net/Search/Spans/NearSpans.cs \
+	Lucene.Net/Search/Spans/SpanFirstQuery.cs \
+	Lucene.Net/Search/Spans/SpanNearQuery.cs \
+	Lucene.Net/Search/Spans/SpanNotQuery.cs \
+	Lucene.Net/Search/Spans/SpanOrQuery.cs \
+	Lucene.Net/Search/Spans/SpanQuery.cs \
+	Lucene.Net/Search/Spans/SpanScorer.cs \
+	Lucene.Net/Search/Spans/SpanTermQuery.cs \
+	Lucene.Net/Search/Spans/SpanWeight.cs \
+	Lucene.Net/Search/Spans/Spans.cs \
+	Lucene.Net/Search/TermQuery.cs \
+	Lucene.Net/Search/TermScorer.cs \
+	Lucene.Net/Search/TopDocs.cs \
+	Lucene.Net/Search/TopFieldDocs.cs \
+	Lucene.Net/Search/Weight.cs \
+	Lucene.Net/Search/WildcardQuery.cs \
+	Lucene.Net/Search/WildcardTermEnum.cs \
+	Lucene.Net/Store/BufferedIndexInput.cs \
+	Lucene.Net/Store/BufferedIndexOutput.cs \
+	Lucene.Net/Store/Directory.cs \
+	Lucene.Net/Store/FSDirectory.cs \
+	Lucene.Net/Store/IndexInput.cs \
+	Lucene.Net/Store/IndexOutput.cs \
+	Lucene.Net/Store/InputStream.cs \
+	Lucene.Net/Store/Lock.cs \
+	Lucene.Net/Store/MMapDirectory.cs \
+	Lucene.Net/Store/OutputStream.cs \
+	Lucene.Net/Store/RAMDirectory.cs \
+	Lucene.Net/Store/RAMFile.cs \
+	Lucene.Net/Store/RAMInputStream.cs \
+	Lucene.Net/Store/RAMOutputStream.cs \
+	Lucene.Net/Util/BitVector.cs \
+	Lucene.Net/Util/Constants.cs \
+	Lucene.Net/Util/Parameter.cs \
+	Lucene.Net/Util/PriorityQueue.cs \
+	Lucene.Net/Util/SmallFloat.cs \
+	Lucene.Net/Util/StringHelper.cs	\
+	Lucene.Net/Util/ToStringUtils.cs \
+	Lucene.Net/LucenePackage.cs \
+	Lucene.Net/SharpZipLibAdapter.cs \
 	Lucene.Net/SupportClass.cs \
-	Lucene.Net/Util/BitVector.cs					\
-	Lucene.Net/Util/Constants.cs					\
-	Lucene.Net/Util/Parameter.cs					\
-	Lucene.Net/Util/PriorityQueue.cs				\
-	Lucene.Net/Util/SmallFloat.cs					\
-	Lucene.Net/Util/StringHelper.cs				\
-	Lucene.Net/Util/ToStringUtils.cs				\
-	Snowball.Net/Lucene.Net/Analysis/Snowball/SnowballAnalyzer.cs	\
-	Snowball.Net/Lucene.Net/Analysis/Snowball/SnowballFilter.cs	\
-	Snowball.Net/SF/Snowball/Among.cs				\
-	Snowball.Net/SF/Snowball/Ext/DanishStemmer.cs			\
-	Snowball.Net/SF/Snowball/Ext/DutchStemmer.cs			\
-	Snowball.Net/SF/Snowball/Ext/EnglishStemmer.cs		\
-	Snowball.Net/SF/Snowball/Ext/FinnishStemmer.cs		\
-	Snowball.Net/SF/Snowball/Ext/FrenchStemmer.cs			\
-	Snowball.Net/SF/Snowball/Ext/German2Stemmer.cs		\
-	Snowball.Net/SF/Snowball/Ext/GermanStemmer.cs			\
-	Snowball.Net/SF/Snowball/Ext/ItalianStemmer.cs		\
-	Snowball.Net/SF/Snowball/Ext/KpStemmer.cs			\
-	Snowball.Net/SF/Snowball/Ext/LovinsStemmer.cs			\
-	Snowball.Net/SF/Snowball/Ext/NorwegianStemmer.cs		\
-	Snowball.Net/SF/Snowball/Ext/PorterStemmer.cs			\
-	Snowball.Net/SF/Snowball/Ext/PortugueseStemmer.cs		\
-	Snowball.Net/SF/Snowball/Ext/RussianStemmer.cs		\
-	Snowball.Net/SF/Snowball/Ext/SpanishStemmer.cs		\
-	Snowball.Net/SF/Snowball/Ext/SwedishStemmer.cs		\
-	Snowball.Net/SF/Snowball/SnowballProgram.cs \
+	Snowball.Net/Lucene.Net/Analysis/Snowball/SnowballAnalyzer.cs \
+	Snowball.Net/Lucene.Net/Analysis/Snowball/SnowballFilter.cs \
+	Snowball.Net/SF/Snowball/Among.cs \
+	Snowball.Net/SF/Snowball/Ext/DanishStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/DutchStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/EnglishStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/FinnishStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/FrenchStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/German2Stemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/GermanStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/ItalianStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/KpStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/LovinsStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/NorwegianStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/PorterStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/PortugueseStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/RussianStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/SpanishStemmer.cs \
+	Snowball.Net/SF/Snowball/Ext/SwedishStemmer.cs \
+	Snowball.Net/SF/Snowball/SnowballProgram.cs
 
 ASSEMBLY_REFERENCES = \
 	-r:../Beagle.Util/Beagle.Util.dll \

Modified: branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/ExceptionHandlingThread.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/ExceptionHandlingThread.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/ExceptionHandlingThread.cs	Fri Feb 29 00:21:16 2008
@@ -67,12 +67,11 @@
 			lock (live_threads)
 				live_threads.Remove (this.thread);
 
+			//Log.Debug ("Finished thread {0}", thread.Name);
+
 			// Reset variables to help the GC
 			this.method = null;
-			string thread_name = this.thread.Name;
 			this.thread = null;
-
-			//Log.Debug ("Finished thread {0}", thread_name);
 		}
 
 		public static Thread Start (ThreadStart method)

Modified: branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/SafeProcess.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/SafeProcess.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/SafeProcess.cs	Fri Feb 29 00:21:16 2008
@@ -128,7 +128,7 @@
 				env = new string [env_dict.Count + 2];
 				int count = 0;
 				foreach (DictionaryEntry entry in env_dict)
-					if (entry.Key != "LANG")
+					if ((string)entry.Key != "LANG")
 						env [count ++] = String.Concat (entry.Key, "=", entry.Value);
 
 				env [count ++] = "LANG=C";

Modified: branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/StringFu.cs
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/StringFu.cs	(original)
+++ branches/beagle-win32-branch/src/Beagle.Util/Beagle.Util/StringFu.cs	Fri Feb 29 00:21:16 2008
@@ -912,7 +912,7 @@
 
 			StringBuilder sb = new StringBuilder ();
 			bool first = true;
-			Regex tmp_regex = null;
+
 			foreach (string pattern in patterns) {
 				try {
 					string regex_pattern;
@@ -923,7 +923,9 @@
 						regex_pattern = pattern.Replace (".", @"\.");
 						regex_pattern = regex_pattern.Replace ("*", ".*");
 					}
-					tmp_regex = new Regex (regex_pattern);
+
+					new Regex (regex_pattern);
+
 					sb.Append (String.Format (@"{0}^(?:{1})$", first ? String.Empty : "|", regex_pattern));
 				} catch (System.ArgumentException) {
 					Log.Warn ("Ignoring invalid regex: [{0}]", pattern);

Modified: branches/beagle-win32-branch/src/Beagle.Util/Makefile.am
==============================================================================
--- branches/beagle-win32-branch/src/Beagle.Util/Makefile.am	(original)
+++ branches/beagle-win32-branch/src/Beagle.Util/Makefile.am	Fri Feb 29 00:21:16 2008
@@ -20,8 +20,8 @@
 CSFLAGS += -define:OS_FREEBSD
 endif
 
-EXTSTR = ExternalStringsHack.cs
-EXTSTR_IN = $(srcdir)/$(EXTSTR).in
+EXTSTR = Beagle.Util/ExternalStringsHack.cs
+EXTSTR_IN = $(EXTSTR).in
 $(EXTSTR): $(EXTSTR_IN)
 	sed	-e "s|\ prefix\@|$(prefix)|g"			\
 		-e "s|\ sysconfdir\@|$(sysconfdir)|g"		\
@@ -36,224 +36,170 @@
 		< $(EXTSTR_IN) > $@
 
 ASSEMBLY_SOURCES = \
-	$(srcdir)/ArrayFu.cs \
-	$(srcdir)/Battery.cs \
-	$(srcdir)/BetterBitArray.cs \
-	$(srcdir)/Camel.cs \
-	$(srcdir)/Config.cs \
-	$(srcdir)/DateTimeUtil.cs \
-	$(srcdir)/DelayedTextWriter.cs \
-	$(srcdir)/DigikamTags.cs \
-	$(srcdir)/DirectoryWalker.cs \
-	$(srcdir)/Evolution.cs \
-	$(srcdir)/ExceptionHandlingThread.cs \
-	$(srcdir)/ExtendedAttribute.cs \
-	$(srcdir)/FileAdvise.cs \
-	$(srcdir)/FileSystem.cs \
-	$(srcdir)/FrequencyStatistics.cs \
-	$(srcdir)/FSpotTools.cs \
-	$(srcdir)/GuidFu.cs \
-	$(srcdir)/HtmlRemovingReader.cs \
-	$(srcdir)/ICalParser.cs \
-	$(srcdir)/ImBuddy.cs \
-	$(srcdir)/Inotify.cs \
-	$(srcdir)/KdeUtils.cs \
-	$(srcdir)/KonqHistoryUtil.cs \
-	$(srcdir)/LineReader.cs \
-	$(srcdir)/Log.cs \
-	$(srcdir)/Logger.cs \
-	$(srcdir)/MultiReader.cs \
-	$(srcdir)/NautilusTools.cs \
-	$(srcdir)/NetworkService.cs \
-	$(srcdir)/Note.cs \
-	$(srcdir)/OperaHistory.cs \
-	$(srcdir)/Password.cs \
-	$(srcdir)/PathFinder.cs \
-	$(srcdir)/PullingReader.cs \
-	$(srcdir)/ReflectionFu.cs \
-	$(srcdir)/SafeProcess.cs \
-	$(srcdir)/Scheduler.cs \
-	$(srcdir)/SmallIntArray.cs \
-	$(srcdir)/Stopwatch.cs \
-	$(srcdir)/StringFu.cs \
-	$(srcdir)/StringMatcher.cs \
-	$(srcdir)/SystemInformation.cs \
-	$(srcdir)/SystemPriorities.cs \
-	$(srcdir)/TeeTextWriter.cs \
-	$(srcdir)/ThreadPond.cs	\
-	$(srcdir)/Timeline.cs \
-	$(srcdir)/TopScores.cs \
-	$(srcdir)/TypeCacheAttribute.cs \
-	$(srcdir)/UnclosableStream.cs \
-	$(srcdir)/UriFu.cs \
-	$(srcdir)/VersionFu.cs \
-	$(srcdir)/XdgMime.cs \
-	$(srcdir)/XmlFu.cs \
-	$(srcdir)/F-Spot/Bim.cs \
-	$(srcdir)/F-Spot/BitConverter.cs \
-	$(srcdir)/F-Spot/Exif.cs \
-	$(srcdir)/F-Spot/IptcFile.cs \
-	$(srcdir)/F-Spot/JpegHeader.cs \
-	$(srcdir)/F-Spot/MetadataStore.cs \
-	$(srcdir)/F-Spot/PngFile.cs \
-	$(srcdir)/F-Spot/PixbufUtils.cs \
-	$(srcdir)/F-Spot/Tiff.cs \
-	$(srcdir)/F-Spot/XmpFile.cs \
-	$(srcdir)/Hal/AccessControl.cs \
-	$(srcdir)/Hal/CPUFreq.cs \
-	$(srcdir)/Hal/Context.cs \
-	$(srcdir)/Hal/Device.cs \
-	$(srcdir)/Hal/IAccessControl.cs \
-	$(srcdir)/Hal/ICPUFreq.cs \
-	$(srcdir)/Hal/IDevice.cs \
-	$(srcdir)/Hal/IKillSwitch.cs \
-	$(srcdir)/Hal/ILaptopPanel.cs \
-	$(srcdir)/Hal/ILightSensor.cs \
-	$(srcdir)/Hal/IManager.cs \
-	$(srcdir)/Hal/IStorage.cs \
-	$(srcdir)/Hal/ISystemPowerManagement.cs \
-	$(srcdir)/Hal/IVolume.cs \
-	$(srcdir)/Hal/IVolumeCrypto.cs \
-	$(srcdir)/Hal/KillSwitch.cs \
-	$(srcdir)/Hal/LaptopPanel.cs \
-	$(srcdir)/Hal/LightSensor.cs \
-	$(srcdir)/Hal/Manager.cs \
-	$(srcdir)/Hal/PropertyModification.cs \
-	$(srcdir)/Hal/Storage.cs \
-	$(srcdir)/Hal/SystemPowerManagement.cs \
-	$(srcdir)/Hal/Volume.cs \
-	$(srcdir)/Hal/VolumeCrypto.cs \
-	$(srcdir)/SemWeb/AssemblyInfo.cs \
-	$(srcdir)/SemWeb/NamespaceManager.cs \
-	$(srcdir)/SemWeb/Util.cs \
-	$(srcdir)/SemWeb/UriMap.cs \
-	$(srcdir)/SemWeb/Resource.cs \
-	$(srcdir)/SemWeb/Statement.cs \
-	$(srcdir)/SemWeb/Store.cs \
-	$(srcdir)/SemWeb/MemoryStore.cs \
-	$(srcdir)/SemWeb/SQLStore.cs \
-	$(srcdir)/SemWeb/RdfReader.cs \
-	$(srcdir)/SemWeb/RdfXmlReader.cs \
-	$(srcdir)/SemWeb/N3Reader.cs \
-	$(srcdir)/SemWeb/RdfWriter.cs \
-	$(srcdir)/SemWeb/RdfXmlWriter.cs \
-	$(srcdir)/SemWeb/N3Writer.cs \
-	$(srcdir)/SemWeb/RSquary.cs \
-	$(srcdir)/SemWeb/LiteralFilters.cs \
-	$(srcdir)/SemWeb/Query.cs \
-	$(srcdir)/SemWeb/Inference.cs \
-	$(srcdir)/SemWeb/RDFS.cs \
-	$(srcdir)/SemWeb/Algos.cs \
-	$(srcdir)/SemWeb/Remote.cs \
-	$(srcdir)/SemWeb/XPathSemWebNavigator.cs \
-	$(srcdir)/QueryKeywordMapping.cs
-
-if ENABLE_THUNDERBIRD
-ASSEMBLY_SOURCES += \
-	$(srcdir)/Thunderbird.cs
-endif
+	Beagle.Util/ArrayFu.cs \
+	Beagle.Util/Battery.cs \
+	Beagle.Util/BetterBitArray.cs \
+	Beagle.Util/Camel.cs \
+	Beagle.Util/Config.cs \
+	Beagle.Util/DateTimeUtil.cs \
+	Beagle.Util/DelayedTextWriter.cs \
+	Beagle.Util/DigikamTags.cs \
+	Beagle.Util/DirectoryWalker.cs \
+	Beagle.Util/Evolution.cs \
+	Beagle.Util/ExceptionHandlingThread.cs \
+	Beagle.Util/ExtendedAttribute.cs \
+	Beagle.Util/FileAdvise.cs \
+	Beagle.Util/FileSystem.cs \
+	Beagle.Util/FrequencyStatistics.cs \
+	Beagle.Util/FSpotTools.cs \
+	Beagle.Util/GuidFu.cs \
+	Beagle.Util/HtmlRemovingReader.cs \
+	Beagle.Util/ICalParser.cs \
+	Beagle.Util/ImBuddy.cs \
+	Beagle.Util/Inotify.cs \
+	Beagle.Util/KdeUtils.cs \
+	Beagle.Util/KonqHistoryUtil.cs \
+	Beagle.Util/LineReader.cs \
+	Beagle.Util/Log.cs \
+	Beagle.Util/Logger.cs \
+	Beagle.Util/MultiReader.cs \
+	Beagle.Util/NautilusTools.cs \
+	Beagle.Util/NetworkService.cs \
+	Beagle.Util/Note.cs \
+	Beagle.Util/OperaHistory.cs \
+	Beagle.Util/Password.cs \
+	Beagle.Util/PathFinder.cs \
+	Beagle.Util/PullingReader.cs \
+	Beagle.Util/ReflectionFu.cs \
+	Beagle.Util/QueryKeywordMapping.cs \
+	Beagle.Util/SafeProcess.cs \
+	Beagle.Util/Scheduler.cs \
+	Beagle.Util/SmallIntArray.cs \
+	Beagle.Util/Stopwatch.cs \
+	Beagle.Util/StringFu.cs \
+	Beagle.Util/StringMatcher.cs \
+	Beagle.Util/SystemInformation.cs \
+	Beagle.Util/SystemPriorities.cs \
+	Beagle.Util/TeeTextWriter.cs \
+	Beagle.Util/ThreadPond.cs	\
+	Beagle.Util/Timeline.cs \
+	Beagle.Util/TopScores.cs \
+	Beagle.Util/TypeCacheAttribute.cs \
+	Beagle.Util/UnclosableStream.cs \
+	Beagle.Util/UriFu.cs \
+	Beagle.Util/VersionFu.cs \
+	Beagle.Util/XdgMime.cs \
+	Beagle.Util/XmlFu.cs \
+	F-Spot/Bim.cs \
+	F-Spot/BitConverter.cs \
+	F-Spot/Exif.cs \
+	F-Spot/IptcFile.cs \
+	F-Spot/JpegHeader.cs \
+	F-Spot/MetadataStore.cs \
+	F-Spot/PngFile.cs \
+	F-Spot/PixbufUtils.cs \
+	F-Spot/Tiff.cs \
+	F-Spot/XmpFile.cs \
+	Hal/AccessControl.cs \
+	Hal/CPUFreq.cs \
+	Hal/Context.cs \
+	Hal/Device.cs \
+	Hal/IAccessControl.cs \
+	Hal/ICPUFreq.cs \
+	Hal/IDevice.cs \
+	Hal/IKillSwitch.cs \
+	Hal/ILaptopPanel.cs \
+	Hal/ILightSensor.cs \
+	Hal/IManager.cs \
+	Hal/IStorage.cs \
+	Hal/ISystemPowerManagement.cs \
+	Hal/IVolume.cs \
+	Hal/IVolumeCrypto.cs \
+	Hal/KillSwitch.cs \
+	Hal/LaptopPanel.cs \
+	Hal/LightSensor.cs \
+	Hal/Manager.cs \
+	Hal/PropertyModification.cs \
+	Hal/Storage.cs \
+	Hal/SystemPowerManagement.cs \
+	Hal/Volume.cs \
+	Hal/VolumeCrypto.cs \
+	SemWeb/NamespaceManager.cs \
+	SemWeb/Util.cs \
+	SemWeb/UriMap.cs \
+	SemWeb/Resource.cs \
+	SemWeb/Statement.cs \
+	SemWeb/Store.cs \
+	SemWeb/MemoryStore.cs \
+	SemWeb/SQLStore.cs \
+	SemWeb/RdfReader.cs \
+	SemWeb/RdfXmlReader.cs \
+	SemWeb/N3Reader.cs \
+	SemWeb/RdfWriter.cs \
+	SemWeb/RdfXmlWriter.cs \
+	SemWeb/N3Writer.cs \
+	SemWeb/RSquary.cs \
+	SemWeb/LiteralFilters.cs \
+	SemWeb/Query.cs \
+	SemWeb/Inference.cs \
+	SemWeb/RDFS.cs \
+	SemWeb/Algos.cs \
+	SemWeb/Remote.cs \
+	SemWeb/XPathSemWebNavigator.cs
 
 ASSEMBLY_REFERENCES = \
-	$(BEAGLED_LIBS) \
-	$(NDESK_DBUS_GLIB_LIBS) \
 	-r:System.Data \
 	-r:Mono.Data.Sqlite \
 	-r:Mono.Posix \
 	-r:System.Web \
-	-r:ICSharpCode.SharpZipLib
+	-r:ICSharpCode.SharpZipLib \
+	$(BEAGLED_LIBS) \
+	$(NDESK_DBUS_GLIB_LIBS)
+
+if ENABLE_THUNDERBIRD
+ASSEMBLY_SOURCES += Beagle.Util/Thunderbird.cs
+endif
 
 if ENABLE_AVAHI
 CSFLAGS += -define:ENABLE_AVAHI
-UTIL_CSFILES += 				\
-	$(srcdir)/AvahiBrowser.cs
-UTIL_ASSEMBLIES += $(AVAHI_SHARP_LIBS)
+ASSEMBLY_SOURCES += Beagle.Util/AvahiBrowser.cs
+ASSEMBLY_REFERENCES += $(AVAHI_SHARP_LIBS)
 endif
 
 if HAS_LIBCHM 
-UTIL_CSFILES +=					\
-	$(srcdir)/ChmFile.cs
+ASSEMBLY_SOURCES += Beagle.Util/ChmFile.cs
 endif
 
 if ENABLE_INOTIFY
-INOTIFY_EXE = Inotify.exe
 CSFLAGS += -define:ENABLE_INOTIFY
-else
-INOTIFY_EXE =
 endif
 
-UTIL_TARGET_FILES = $(UTIL_CSFILES) $(EXTSTR)
+$(ASSEMBLY): $(ASSEMBLY_SOURCES) $(EXTSTR)
+	$(CSC) -unsafe -out:$@ $(CSFLAGS) $(ASSEMBLY_SOURCES) $(EXTSTR) $(ASSEMBLY_REFERENCES)
 
-$(UTIL_TARGET): $(UTIL_TARGET_FILES)
-	$(CSC) -unsafe -out:$@ $(CSFLAGS) $^ $(UTIL_ASSEMBLIES)
+all: $(ASSEMBLY)
 
-UI_UTIL_CSFILES =				\
-	$(srcdir)/CompatFileChooser.cs		\
-	$(srcdir)/GnomeFu.cs              	\
-	$(srcdir)/GtkUtils.cs			\
-	$(srcdir)/HigMessageDialog.cs		\
-	$(srcdir)/XKeybinder.cs
-
-UI_UTIL_ASSEMBLIES =				\
-	$(BEAGLE_UI_LIBS)			\
-	-r:Util.dll
-
-if ENABLE_GALAGO
-UI_UTIL_CSFILES +=				\
-	$(srcdir)/Galago.cs
-
-UI_UTIL_ASSEMBLIES += 				\
-	$(GALAGO_LIBS)
-endif
-
-$(UI_UTIL_TARGET): $(UI_UTIL_CSFILES) $(UTIL_TARGET)
-	$(CSC) -unsafe -out:$@ $(CSFLAGS) $(UI_UTIL_CSFILES) $(UI_UTIL_ASSEMBLIES)
-
-Inotify.exe: $(INOTIFY_TEST_CSFILES)
-	$(CSC) -unsafe -out:$@ $^ -r:Mono.Posix -define:INOTIFY_TEST -define:ENABLE_INOTIFY
-
-ALL_TARGETS =			\
-	$(UTIL_TARGET)
-
-if ENABLE_GUI
-ALL_TARGETS += $(UI_UTIL_TARGET)
-endif
-
-all: $(ALL_TARGETS)
-
-install-data-local: $(ALL_TARGETS)
+install-data-local: $(ASSEMBLY)
 	$(mkinstalldirs) $(DESTDIR)$(pkglibdir)
-	$(INSTALL_DATA) $(UTIL_TARGET) $(UTIL_TARGET).mdb $(UTIL_TARGET_CONFIG) $(DESTDIR)$(pkglibdir)
-if ENABLE_GUI
-	$(INSTALL_DATA) $(UI_UTIL_TARGET) $(UI_UTIL_TARGET).mdb $(srcdir)/$(UI_UTIL_TARGET_CONFIG) $(DESTDIR)$(pkglibdir)
-endif
+	$(INSTALL_DATA) $(ASSEMBLY) $(ASSEMBLY).mdb $(ASSEBMLY_CONFIG) $(DESTDIR)$(pkglibdir)
 
 uninstall-local:
-	rm -f $(DESTDIR)$(pkglibdir)/$(UTIL_TARGET) $(DESTDIR)$(pkglibdir)/$(UTIL_TARGET).mdb $(DESTDIR)$(pkglibdir)/$(UTIL_TARGET_CONFIG)
-	rm -f $(DESTDIR)$(pkglibdir)/$(UI_UTIL_TARGET) $(DESTDIR)$(pkglibdir)/$(UI_UTIL_TARGET).mdb $(DESTDIR)$(pkglibdir)/$(UI_UTIL_TARGET_CONFIG)
-
+	rm -f $(DESTDIR)$(pkglibdir)/$(ASSEMBLY) $(DESTDIR)$(pkglibdir)/$(ASSEMBLY).mdb $(DESTDIR)$(pkglibdir)/$(ASSEMBLY_CONFIG)
 
 COND_CS_FILES =				\
-	$(srcdir)/AvahiBrowser.cs	\
-	$(srcdir)/ChmFile.cs		\
-	$(srcdir)/Galago.cs		\
-	$(srcdir)/Thunderbird.cs
+	AvahiBrowser.cs	\
+	ChmFile.cs		\
+	Thunderbird.cs
 
-EXTRA_DIST =			\
+EXTRA_DIST = \
 	AssemblyInfo.cs.in \
-	$(EXTSTR_IN)		\
-	$(ASSEMBLY_SOURCES)	\
-	$(UI_UTIL_CSFILES)	\
-	$(COND_CS_FILES)	\
-	UiUtil.dll.config	\
-	Util.dll.config.in	\
-	inotify-test
-
-CLEANFILES =			\
-	$(EXTSTR)		\
-	$(UTIL_TARGET)		\
-	$(UTIL_TARGET).mdb	\
-	$(UI_UTIL_TARGET)	\
-	$(UI_UTIL_TARGET).mdb	\
-	Inotify.exe		\
-	Inotify.exe.mdb
+	$(EXTSTR_IN) \
+	$(ASSEMBLY_SOURCES) \
+	$(COND_CS_FILES) \
+	Util.dll.config.in
+
+CLEANFILES = \
+	$(EXTSTR) \
+	$(UTIL_TARGET) \
+	$(UTIL_TARGET).mdb
 

Modified: branches/beagle-win32-branch/src/Beagle/Makefile.am
==============================================================================
--- branches/beagle-win32-branch/src/Beagle/Makefile.am	(original)
+++ branches/beagle-win32-branch/src/Beagle/Makefile.am	Fri Feb 29 00:21:16 2008
@@ -3,14 +3,14 @@
 ASSEMBLY_NAME = Beagle
 ASSEMBLY = $(ASSEMBLY_NAME).dll
 
-CSFLAGS = -ASSEMBLY:library $(BEAGLE_DEFINES)
+CSFLAGS = -target:library $(BEAGLE_DEFINES)
 
 if ENABLE_AVAHI
 CSFLAGS += -define:ENABLE_AVAHI
 endif
 
 ASSEMBLY_SOURCES = \
-	Beagle/AssemblyInfo.cs \
+	AssemblyInfo.cs \
 	Beagle/Hit.cs \
 	Beagle/IIndexableGenerator.cs \
 	Beagle/Indexable.cs \
@@ -25,6 +25,7 @@
 	Beagle/QueryableStatus.cs \
 	Beagle/RemoteControl.cs \
 	Beagle/Snippet.cs \
+	Beagle/TcpTransport.cs \
 	Beagle/Transport.cs \
 	Beagle/UnixTransport.cs \
 	Beagle/Versioned.cs
@@ -53,3 +54,4 @@
 CLEANFILES = \
 	$(ASSEMBLY) \
 	$(ASSEMBLY).mdb
+

Modified: branches/beagle-win32-branch/src/Makefile.am
==============================================================================
--- branches/beagle-win32-branch/src/Makefile.am	(original)
+++ branches/beagle-win32-branch/src/Makefile.am	Fri Feb 29 00:21:16 2008
@@ -1 +1 @@
-SUBDIRS = libbeagleglue Beagle.Util Beagle Beagle.Filters Beagle.Daemon
+SUBDIRS = libbeagleglue Beagle.Util Beagle Beagle.Engine Beagle.Filters Beagle.Daemon
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]