[sword-svn] r424 - in trunk: . clucene clucene/src

chrislit at crosswire.org chrislit at crosswire.org
Wed May 31 21:56:13 MST 2006 

Author: chrislit
Date: 2006-05-31 21:55:56 -0700 (Wed, 31 May 2006)
New Revision: 424

Removed:
   trunk/clucene/src/do_nothing.cc
Modified:
   trunk/clucene/clucene.bpf
   trunk/clucene/clucene.bpr
   trunk/sword.bpr
Log:
CLucene update to 0.9.11 (with a couple of BCB-related fixes)

Modified: trunk/clucene/clucene.bpf
===================================================================
--- trunk/clucene/clucene.bpf	2006-06-01 04:40:52 UTC (rev 423)
+++ trunk/clucene/clucene.bpf	2006-06-01 04:55:56 UTC (rev 424)
@@ -2,76 +2,7 @@
 
 #include <vcl.h>
 #pragma hdrstop
-USE("src\do_nothing.cc", File);
-USEUNIT("src\CLucene\StdHeader.cpp");
-USEUNIT("src\CLucene\LuceneUTF8.cpp");
-USEUNIT("src\CLucene\analysis\Analyzers.cpp");
-USEUNIT("src\CLucene\analysis\standard\StandardTokenizer.cpp");
-USEUNIT("src\CLucene\analysis\standard\StandardFilter.cpp");
-USEUNIT("src\CLucene\analysis\standard\StandardAnalyzer.cpp");
-USEUNIT("src\CLucene\debug\condition.c");
-USEUNIT("src\CLucene\document\Field.cpp");
-USEUNIT("src\CLucene\document\Document.cpp");
-USEUNIT("src\CLucene\document\DateField.cpp");
-USEUNIT("src\CLucene\index\SegmentInfos.cpp");
-USEUNIT("src\CLucene\index\FieldInfos.cpp");
-USEUNIT("src\CLucene\index\FieldsReader.cpp");
-USEUNIT("src\CLucene\index\FieldsWriter.cpp");
-USEUNIT("src\CLucene\index\IndexReader.cpp");
-USEUNIT("src\CLucene\index\IndexWriter.cpp");
-USEUNIT("src\CLucene\index\DocumentWriter.cpp");
-USEUNIT("src\CLucene\index\TermInfo.cpp");
-USEUNIT("src\CLucene\index\SegmentMergeQueue.cpp");
-USEUNIT("src\CLucene\index\SegmentMerger.cpp");
-USEUNIT("src\CLucene\index\SegmentReader.cpp");
-USEUNIT("src\CLucene\index\SegmentsReader.cpp");
-USEUNIT("src\CLucene\index\SegmentTermDocs.cpp");
-USEUNIT("src\CLucene\index\SegmentTermEnum.cpp");
-USEUNIT("src\CLucene\index\SegmentTermPositions.cpp");
-USEUNIT("src\CLucene\index\Term.cpp");
-USEUNIT("src\CLucene\index\SegmentMergeInfo.cpp");
-USEUNIT("src\CLucene\index\TermInfosReader.cpp");
-USEUNIT("src\CLucene\index\TermInfosWriter.cpp");
-USEUNIT("src\CLucene\queryParser\TokenList.cpp");
-USEUNIT("src\CLucene\queryParser\MultiFieldQueryParser.cpp");
-USEUNIT("src\CLucene\queryParser\QueryParser.cpp");
-USEUNIT("src\CLucene\queryParser\QueryParserBase.cpp");
-USEUNIT("src\CLucene\queryParser\QueryToken.cpp");
-USEUNIT("src\CLucene\queryParser\Lexer.cpp");
-USEUNIT("src\CLucene\search\WildcardTermEnum.cpp");
-USEUNIT("src\CLucene\search\BooleanScorer.cpp");
-USEUNIT("src\CLucene\search\DateFilter.cpp");
-USEUNIT("src\CLucene\search\ExactPhraseScorer.cpp");
-USEUNIT("src\CLucene\search\FilteredTermEnum.cpp");
-USEUNIT("src\CLucene\search\FuzzyQuery.cpp");
-USEUNIT("src\CLucene\search\HitQueue.cpp");
-USEUNIT("src\CLucene\search\Hits.cpp");
-USEUNIT("src\CLucene\search\IndexSearcher.cpp");
-USEUNIT("src\CLucene\search\MultiSearcher.cpp");
-USEUNIT("src\CLucene\search\MultiTermQuery.cpp");
-USEUNIT("src\CLucene\search\PhrasePositions.cpp");
-USEUNIT("src\CLucene\search\PhraseQuery.cpp");
-USEUNIT("src\CLucene\search\PhraseScorer.cpp");
-USEUNIT("src\CLucene\search\PrefixQuery.cpp");
-USEUNIT("src\CLucene\search\RangeQuery.cpp");
-USEUNIT("src\CLucene\search\Similarity.cpp");
-USEUNIT("src\CLucene\search\SloppyPhraseScorer.cpp");
-USEUNIT("src\CLucene\search\TermQuery.cpp");
-USEUNIT("src\CLucene\search\TermScorer.cpp");
-USEUNIT("src\CLucene\search\TopDocs.cpp");
-USEUNIT("src\CLucene\search\WildcardQuery.cpp");
-USEUNIT("src\CLucene\search\BooleanQuery.cpp");
-USEUNIT("src\CLucene\store\RAMDirectory.cpp");
-USEUNIT("src\CLucene\store\InputStream.cpp");
-USEUNIT("src\CLucene\store\Lock.cpp");
-USEUNIT("src\CLucene\store\OutputStream.cpp");
-USEUNIT("src\CLucene\store\FSDirectory.cpp");
-USEUNIT("src\CLucene\util\StringBuffer.cpp");
-USEUNIT("src\CLucene\util\BitVector.cpp");
-USEUNIT("src\CLucene\util\FastCharStream.cpp");
-USEUNIT("src\CLucene\util\Misc.cpp");
-USEUNIT("src\CLucene\util\Reader.cpp");
-USEUNIT("src\CLucene\util\Arrays.cpp");
+USEUNIT("src\CLucene\CLMonolithic.cpp");
 //---------------------------------------------------------------------------
 #define Library
 

Modified: trunk/clucene/clucene.bpr
===================================================================
--- trunk/clucene/clucene.bpr	2006-06-01 04:40:52 UTC (rev 423)
+++ trunk/clucene/clucene.bpr	2006-06-01 04:55:56 UTC (rev 424)
@@ -4,72 +4,34 @@
   <MACROS>
     <VERSION value="BCB.05.03"/>
     <PROJECT value="clucene.lib"/>
-    <OBJFILES value="src\CLucene\StdHeader.obj src\CLucene\LuceneUTF8.obj 
-      src\CLucene\analysis\Analyzers.obj 
-      src\CLucene\analysis\standard\StandardTokenizer.obj 
-      src\CLucene\analysis\standard\StandardFilter.obj 
-      src\CLucene\analysis\standard\StandardAnalyzer.obj 
-      src\CLucene\debug\condition.obj src\CLucene\document\Field.obj 
-      src\CLucene\document\Document.obj src\CLucene\document\DateField.obj 
-      src\CLucene\index\SegmentInfos.obj src\CLucene\index\FieldInfos.obj 
-      src\CLucene\index\FieldsReader.obj src\CLucene\index\FieldsWriter.obj 
-      src\CLucene\index\IndexReader.obj src\CLucene\index\IndexWriter.obj 
-      src\CLucene\index\DocumentWriter.obj src\CLucene\index\TermInfo.obj 
-      src\CLucene\index\SegmentMergeQueue.obj 
-      src\CLucene\index\SegmentMerger.obj src\CLucene\index\SegmentReader.obj 
-      src\CLucene\index\SegmentsReader.obj src\CLucene\index\SegmentTermDocs.obj 
-      src\CLucene\index\SegmentTermEnum.obj 
-      src\CLucene\index\SegmentTermPositions.obj src\CLucene\index\Term.obj 
-      src\CLucene\index\SegmentMergeInfo.obj 
-      src\CLucene\index\TermInfosReader.obj 
-      src\CLucene\index\TermInfosWriter.obj src\CLucene\queryParser\TokenList.obj 
-      src\CLucene\queryParser\MultiFieldQueryParser.obj 
-      src\CLucene\queryParser\QueryParser.obj 
-      src\CLucene\queryParser\QueryParserBase.obj 
-      src\CLucene\queryParser\QueryToken.obj src\CLucene\queryParser\Lexer.obj 
-      src\CLucene\search\WildcardTermEnum.obj 
-      src\CLucene\search\BooleanScorer.obj src\CLucene\search\DateFilter.obj 
-      src\CLucene\search\ExactPhraseScorer.obj 
-      src\CLucene\search\FilteredTermEnum.obj src\CLucene\search\FuzzyQuery.obj 
-      src\CLucene\search\HitQueue.obj src\CLucene\search\Hits.obj 
-      src\CLucene\search\IndexSearcher.obj src\CLucene\search\MultiSearcher.obj 
-      src\CLucene\search\MultiTermQuery.obj 
-      src\CLucene\search\PhrasePositions.obj src\CLucene\search\PhraseQuery.obj 
-      src\CLucene\search\PhraseScorer.obj src\CLucene\search\PrefixQuery.obj 
-      src\CLucene\search\RangeQuery.obj src\CLucene\search\Similarity.obj 
-      src\CLucene\search\SloppyPhraseScorer.obj src\CLucene\search\TermQuery.obj 
-      src\CLucene\search\TermScorer.obj src\CLucene\search\TopDocs.obj 
-      src\CLucene\search\WildcardQuery.obj src\CLucene\search\BooleanQuery.obj 
-      src\CLucene\store\RAMDirectory.obj src\CLucene\store\InputStream.obj 
-      src\CLucene\store\Lock.obj src\CLucene\store\OutputStream.obj 
-      src\CLucene\store\FSDirectory.obj src\CLucene\util\StringBuffer.obj 
-      src\CLucene\util\BitVector.obj src\CLucene\util\FastCharStream.obj 
-      src\CLucene\util\Misc.obj src\CLucene\util\Reader.obj 
-      src\CLucene\util\Arrays.obj"/>
+    <OBJFILES value="src\CLucene\CLMonolithic.obj"/>
     <RESFILES value=""/>
+    <IDLFILES value=""/>
+    <IDLGENFILES value=""/>
     <DEFFILE value=""/>
     <RESDEPEN value="$(RESFILES)"/>
     <LIBFILES value=""/>
     <LIBRARIES value=""/>
     <PACKAGES value=""/>
-    <PATHCPP value=".;src\CLucene;src\CLucene\analysis;src\CLucene\analysis\standard;src\CLucene\debug;src\CLucene\document;src\CLucene\index;src\CLucene\queryParser;src\CLucene\search;src\CLucene\store;src\CLucene\util"/>
+    <PATHCPP value=".;src\CLucene"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
     <LINKER value="TLib"/>
-    <USERDEFINES value="LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG"/>
+    <USERDEFINES value="UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING"/>
     <SYSDEFINES value="_RTLDLL;NO_STRICT"/>
     <MAINSOURCE value="clucene.bpf"/>
-    <INCLUDEPATH value="src\CLucene\util;src\CLucene\store;src\CLucene\search;src\CLucene\queryParser;src\CLucene\index;src\CLucene\document;src\CLucene\debug;src\CLucene\analysis\standard;src\CLucene\analysis;src\CLucene;$(BCB)\include;$(BCB)\include\vcl;src"/>
-    <LIBPATH value="src\CLucene\util;src\CLucene\store;src\CLucene\search;src\CLucene\queryParser;src\CLucene\index;src\CLucene\document;src\CLucene\debug;src\CLucene\analysis\standard;src\CLucene\analysis;src\CLucene;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="src\CLucene;src;$(BCB)\include;$(BCB)\include\vcl"/>
+    <LIBPATH value="src\CLucene;src;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par"/>
     <LISTFILE value=""/>
   </MACROS>
   <OPTIONS>
-    <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k 
-      -y -v -vi- -c -tW -tWM"/>
-    <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
-    <AFLAGS value="/mx /w2 /zi"/>
+    <IDLCFLAGS value="-Isrc\CLucene -Isrc -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp 
+      -DUNICODE -D_WIN32 -D_CL_DISABLE_MULTITHREADING -boa"/>
+    <CFLAG1 value="-O2 -Q -w- -Vx -VF -X- -a8 -b- -k- -vi -c -tW -tWM"/>
+    <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+    <AFLAGS value="/mx /w2 /zn"/>
     <LFLAGS value="/P256"/>
   </OPTIONS>
   <LINKER>
@@ -105,32 +67,47 @@
 Comments=
 
 [HistoryLists\hlIncludePath]
-Count=3
-Item0=src\CLucene\util;src\CLucene\store;src\CLucene\search;src\CLucene\queryParser;src\CLucene\index;src\CLucene\document;src\CLucene\debug;src\CLucene\analysis\standard;src\CLucene\analysis;src\CLucene;$(BCB)\include;$(BCB)\include\vcl;src
-Item1=src\CLucene;$(BCB)\include;$(BCB)\include\vcl;src
-Item2=src\CLucene;$(BCB)\include;$(BCB)\include\vcl
+Count=9
+Item0=src\CLucene;src;$(BCB)\include;$(BCB)\include\vcl
+Item1=src;$(BCB)\include;$(BCB)\include\vcl
+Item2=src\CLucene;..\..\clucene\src\CLucene\util;..\..\clucene\src\CLucene\store;..\..\clucene\src\CLucene\search;..\..\clucene\src\CLucene\queryParser;..\..\clucene\src\CLucene\index;..\..\clucene\src\CLucene\document;..\..\clucene\src\CLucene\debug;..\..\clucene\src\CLucene\config;..\..\clucene\src\CLucene;..\..\clucene\src\CLucene\analysis\standard;..\..\clucene\src\CLucene\analysis;..\..\clucene\src;$(BCB)\include;$(BCB)\include\vcl
+Item3=..\..\clucene\src\CLucene\util;..\..\clucene\src\CLucene\store;..\..\clucene\src\CLucene\search;..\..\clucene\src\CLucene\queryParser;..\..\clucene\src\CLucene\index;..\..\clucene\src\CLucene\document;..\..\clucene\src\CLucene\debug;..\..\clucene\src\CLucene\config;..\..\clucene\src\CLucene;..\..\clucene\src\CLucene\analysis\standard;..\..\clucene\src\CLucene\analysis;..\..\clucene\src;$(BCB)\include;$(BCB)\include\vcl
+Item4=..\..\clucene\src;$(BCB)\include;$(BCB)\include\vcl
+Item5=..\..\clucene\src\CLucene\util;..\..\clucene\src\CLucene\store;..\..\clucene\src\CLucene\search;..\..\clucene\src\CLucene\queryParser;..\..\clucene\src\CLucene\index;..\..\clucene\src\CLucene\document;..\..\clucene\src\CLucene\debug;..\..\clucene\src\CLucene\config;..\..\clucene\src\CLucene;..\..\clucene\src\CLucene\analysis\standard;..\..\clucene\src\CLucene\analysis;src\CLucene\config;src\CLucene\util;src\CLucene\store;src\CLucene\search;src\CLucene\queryParser;src\CLucene\index;src\CLucene\document;src\CLucene\debug;src\CLucene\analysis\standard;src\CLucene\analysis;src\CLucene;$(BCB)\include;$(BCB)\include\vcl;src
+Item6=src\CLucene\util;src\CLucene\store;src\CLucene\search;src\CLucene\queryParser;src\CLucene\index;src\CLucene\document;src\CLucene\debug;src\CLucene\analysis\standard;src\CLucene\analysis;src\CLucene;$(BCB)\include;$(BCB)\include\vcl;src
+Item7=src\CLucene;$(BCB)\include;$(BCB)\include\vcl;src
+Item8=src\CLucene;$(BCB)\include;$(BCB)\include\vcl
 
 [HistoryLists\hlLibraryPath]
-Count=2
-Item0=src\CLucene\util;src\CLucene\store;src\CLucene\search;src\CLucene\queryParser;src\CLucene\index;src\CLucene\document;src\CLucene\debug;src\CLucene\analysis\standard;src\CLucene\analysis;src\CLucene;$(BCB)\lib\obj;$(BCB)\lib
-Item1=src\CLucene;$(BCB)\lib\obj;$(BCB)\lib
+Count=8
+Item0=src\CLucene;src;$(BCB)\lib\obj;$(BCB)\lib
+Item1=src;$(BCB)\lib\obj;$(BCB)\lib
+Item2=src\CLucene;..\..\clucene\src\CLucene\util;..\..\clucene\src\CLucene\store;..\..\clucene\src\CLucene\search;..\..\clucene\src\CLucene\queryParser;..\..\clucene\src\CLucene\index;..\..\clucene\src\CLucene\document;..\..\clucene\src\CLucene\debug;..\..\clucene\src\CLucene\config;..\..\clucene\src\CLucene;..\..\clucene\src\CLucene\analysis\standard;..\..\clucene\src\CLucene\analysis;..\..\clucene\src;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\..\clucene\src\CLucene\util;..\..\clucene\src\CLucene\store;..\..\clucene\src\CLucene\search;..\..\clucene\src\CLucene\queryParser;..\..\clucene\src\CLucene\index;..\..\clucene\src\CLucene\document;..\..\clucene\src\CLucene\debug;..\..\clucene\src\CLucene\config;..\..\clucene\src\CLucene;..\..\clucene\src\CLucene\analysis\standard;..\..\clucene\src\CLucene\analysis;..\..\clucene\src;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..\clucene\src;$(BCB)\lib\obj;$(BCB)\lib
+Item5=..\..\clucene\src\CLucene\util;..\..\clucene\src\CLucene\store;..\..\clucene\src\CLucene\search;..\..\clucene\src\CLucene\queryParser;..\..\clucene\src\CLucene\index;..\..\clucene\src\CLucene\document;..\..\clucene\src\CLucene\debug;..\..\clucene\src\CLucene\config;..\..\clucene\src\CLucene;..\..\clucene\src\CLucene\analysis\standard;..\..\clucene\src\CLucene\analysis;src\CLucene\config;src\CLucene\util;src\CLucene\store;src\CLucene\search;src\CLucene\queryParser;src\CLucene\index;src\CLucene\document;src\CLucene\debug;src\CLucene\analysis\standard;src\CLucene\analysis;src\CLucene;$(BCB)\lib\obj;$(BCB)\lib
+Item6=src\CLucene\util;src\CLucene\store;src\CLucene\search;src\CLucene\queryParser;src\CLucene\index;src\CLucene\document;src\CLucene\debug;src\CLucene\analysis\standard;src\CLucene\analysis;src\CLucene;$(BCB)\lib\obj;$(BCB)\lib
+Item7=src\CLucene;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=10
-Item0=LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
-Item1=LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
-Item2=_DEBUG;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
-Item3=_DEBUG;LUCENE_DISABLE_MULTITHREADING;_WIN32
-Item4=_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT;_WIN32
-Item5=_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H;_WIN32
-Item6=_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H;_WIN32;UTF8
-Item7=_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H
-Item8=_DEBUG;LUCENE_DISABLE_MULTITHREADING
-Item9=_DEBUG
+Count=13
+Item0=UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item1=_WIN32;_CL_DISABLE_MULTITHREADING
+Item2=_WIN32;HAVE_DIRENT;_CL_DISABLE_MULTITHREADING
+Item3=LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
+Item4=LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
+Item5=_DEBUG;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
+Item6=_DEBUG;LUCENE_DISABLE_MULTITHREADING;_WIN32
+Item7=_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT;_WIN32
+Item8=_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H;_WIN32
+Item9=_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H;_WIN32;UTF8
+Item10=_DEBUG;LUCENE_DISABLE_MULTITHREADING;HAVE_DIRENT_H
+Item11=_DEBUG;LUCENE_DISABLE_MULTITHREADING
+Item12=_DEBUG
 
 [HistoryLists\hlTlibPageSize]
 Count=8
@@ -154,10 +131,15 @@
 RemoteDebug=0
 
 [Compiler]
-ShowInfoMsgs=0
+ShowInfoMsgs=1
 LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
 
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
+
 [Language]
 ActiveLang=
 ProjectLang=

Deleted: trunk/clucene/src/do_nothing.cc
===================================================================
--- trunk/clucene/src/do_nothing.cc	2006-06-01 04:40:52 UTC (rev 423)
+++ trunk/clucene/src/do_nothing.cc	2006-06-01 04:55:56 UTC (rev 424)
@@ -1,3 +0,0 @@
-int do_nothing() {
-    return 0;
-}

Modified: trunk/sword.bpr
===================================================================
--- trunk/sword.bpr	2006-06-01 04:40:52 UTC (rev 423)
+++ trunk/sword.bpr	2006-06-01 04:55:56 UTC (rev 424)
@@ -43,29 +43,30 @@
     <DEBUGLIBPATH value="$(BCB)\lib\debug"/>
     <RELEASELIBPATH value="$(BCB)\lib\release"/>
     <LINKER value="ilink32"/>
-    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG"/>
+    <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="sword.cpp"/>
-    <INCLUDEPATH value="D:\;TntUnicodeControls;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
-    <LIBPATH value="D:\;TntUnicodeControls;..\sword\lib;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib"/>
+    <INCLUDEPATH value="..\sword\src\modules\filters;D:\;TntUnicodeControls;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
+    <LIBPATH value="..\sword\src\modules\filters;D:\;TntUnicodeControls;..\sword\lib;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib"/>
     <WARNINGS value="-w-par -w-8027 -w-8026"/>
     <WARNOPTSTR value=""/>
   </MACROS>
   <OPTIONS>
-    <IDLCFLAGS value="-I..\.. -ITntUnicodeControls -I..\..\..\..\..\icu-sword\source\common 
-      -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include 
+    <IDLCFLAGS value="-I..\sword\src\modules\filters -ID:\. -ITntUnicodeControls 
+      -I..\icu-sword\source\common -I..\icu-sword\source\i18n -I..\sword\include 
       -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_ 
-      -D_ICUSWORD_ -DUSBINARY -D_DEBUG -DU_HAVE_PLACEMENT_NEW=0"/>
-    <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
-    <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -v -M -JPHNE"/>
+      -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 -DUSELUCENE 
+      -D_CL_DISABLE_MULTITHREADING"/>
+    <CFLAG1 value="-O2 -Vx -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
+    <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/>
     <RFLAGS value=""/>
-    <AFLAGS value="/mx /w2 /zi"/>
-    <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn -v"/>
+    <AFLAGS value="/mx /w2 /zn"/>
+    <LFLAGS value="-Iobj -D&quot;&quot; -aa -Tpe -GD -s -Gn"/>
   </OPTIONS>
   <LINKER>
     <ALLOBJ value="c0w32.obj $(OBJFILES)"/>
     <ALLRES value="$(RESFILES)"/>
-    <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
+    <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cp32mt.lib"/>
   </LINKER>
   <IDEOPTIONS>
 [Version Info]
@@ -74,7 +75,7 @@
 MajorVer=1
 MinorVer=5
 Release=8
-Build=1
+Build=2
 Debug=0
 PreRelease=0
 Special=0
@@ -86,7 +87,7 @@
 [Version Info Keys]
 CompanyName=CrossWire Software &amp; Bible Society
 FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.8.1
+FileVersion=1.5.8.2
 InternalName=biblecs
 LegalCopyright=(c) 1990-2005 CrossWire Bible Society under the terms of the GNU General Public License
 LegalTrademarks=
@@ -96,39 +97,41 @@
 Comments=Seek Him and you will find Him
 
 [HistoryLists\hlIncludePath]
-Count=16
-Item0=D:\;TntUnicodeControls;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item1=D:\;..\..;TntUnicodeControls;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item2=D:\;..\..;TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item3=..\..;TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item4=..\..;TntUnicodeControls;..\..\..\WINDOZE;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item5=TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item6=TntUnicodeControls;..\..\..\WINDOZE;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item7=..\..\..\..\..\TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item8=..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item9=..\..\..\windoze;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item10=..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item11=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item12=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item13=..\..\..\..\..\icu-sword\source\common\;..\..\..\..\..\icu-sword\source\i18n\;..\..;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item14=C:\icu-sword\source\common\;C:\icu-sword\source\i18n\;..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
-Item15=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Count=17
+Item0=..\sword\src\modules\filters;D:\;TntUnicodeControls;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item1=D:\;TntUnicodeControls;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item2=D:\;..\..;TntUnicodeControls;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item3=D:\;..\..;TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item4=..\..;TntUnicodeControls;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item5=..\..;TntUnicodeControls;..\..\..\WINDOZE;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item6=TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item7=TntUnicodeControls;..\..\..\WINDOZE;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item8=..\..\..\..\..\TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item9=..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item10=..\..\..\windoze;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item11=..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item12=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item13=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\windoze;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item14=..\..\..\..\..\icu-sword\source\common\;..\..\..\..\..\icu-sword\source\i18n\;..\..;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item15=C:\icu-sword\source\common\;C:\icu-sword\source\i18n\;..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
+Item16=..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib
 
 [HistoryLists\hlLibraryPath]
-Count=13
-Item0=D:\;TntUnicodeControls;..\sword\lib;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item1=TntUnicodeControls;..\sword\lib;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item2=D:\;..\..;TntUnicodeControls;..\..\..\..\..\TntUnicodeControls;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item3=..\..;TntUnicodeControls;..\..\..\..\..\TntUnicodeControls;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item4=..\..;TntUnicodeControls;..\..\..\..\..\TntUnicodeControls;..\..\..\WINDOZE;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item5=TntUnicodeControls;..\..\..\..\..\TntUnicodeControls;..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item6=TntUnicodeControls;..\..\..\..\..\TntUnicodeControls;..\..\..\WINDOZE;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item7=..\..\..\..\..\TntUnicodeControls;..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item8=..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item9=..\..\..\windoze;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item10=..\..;..\..\..\windoze;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item11=..\..;..\..\..\..\lib\;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item12=..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Count=14
+Item0=..\sword\src\modules\filters;D:\;TntUnicodeControls;..\sword\lib;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item1=D:\;TntUnicodeControls;..\sword\lib;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item2=TntUnicodeControls;..\sword\lib;$(BCB)\Projects\Lib;rxlib;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item3=D:\;..\..;TntUnicodeControls;..\..\..\..\..\TntUnicodeControls;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..;TntUnicodeControls;..\..\..\..\..\TntUnicodeControls;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item5=..\..;TntUnicodeControls;..\..\..\..\..\TntUnicodeControls;..\..\..\WINDOZE;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item6=TntUnicodeControls;..\..\..\..\..\TntUnicodeControls;..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item7=TntUnicodeControls;..\..\..\..\..\TntUnicodeControls;..\..\..\WINDOZE;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item8=..\..\..\..\..\TntUnicodeControls;..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item9=..\..;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item10=..\..\..\windoze;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item11=..\..;..\..\..\windoze;..\..\..\..\lib;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item12=..\..;..\..\..\..\lib\;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item13=..\..;C:\Program Files\Borland\CBuilder5\RX\Units\;$(BCB)\Projects\Lib;RX\Units;rxlib;..\InstallMgr;C:\program files\borland\cbuilder3\projects\;C:\borland\cbuilder3\lib\release\;$(BCB)\lib\release;$(BCB)\lib\obj;$(BCB)\lib
 
 [HistoryLists\hlDebugSourcePath]
 Count=3
@@ -137,21 +140,22 @@
 Item2=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=14
-Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
+Count=15
+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
 Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE
-Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
-Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
-Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
-Item5=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
-Item6=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
-Item7=_ICU_;_ICUSWORD_;USBINARY
-Item8=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
-Item9=_ICU_;_ICUSWORD_;_DEBUG
-Item10=_ICU_;_ICUSWORD_
-Item11=_ICU_
-Item12=_ICU_;_DEBUG
-Item13=_DEBUG
+Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
+Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
+Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
+Item5=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
+Item6=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
+Item7=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item8=_ICU_;_ICUSWORD_;USBINARY
+Item9=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
+Item10=_ICU_;_ICUSWORD_;_DEBUG
+Item11=_ICU_;_ICUSWORD_
+Item12=_ICU_
+Item13=_ICU_;_DEBUG
+Item14=_DEBUG
 
 [HistoryLists\hlIntOutputDir]
 Count=2
@@ -178,8 +182,13 @@
 [Compiler]
 ShowInfoMsgs=0
 LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
 
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
+
 [Language]
 ActiveLang=
 ProjectLang=

More information about the sword-cvs mailing list