[sword-svn] r1795 - in trunk: lib/bcppmake src/modules/texts/rawtext
scribe at crosswire.org
scribe at crosswire.org
Tue May 3 13:03:51 MST 2005
Author: scribe
Date: 2005-05-03 13:03:50 -0700 (Tue, 03 May 2005)
New Revision: 1795
Modified:
trunk/lib/bcppmake/libsword.bpf
trunk/lib/bcppmake/libsword6icu.bpr
trunk/src/modules/texts/rawtext/rawtext.cpp
Log:
Fixes to compile again BCB6
Modified: trunk/lib/bcppmake/libsword.bpf
===================================================================
--- trunk/lib/bcppmake/libsword.bpf 2005-05-03 19:40:40 UTC (rev 1794)
+++ trunk/lib/bcppmake/libsword.bpf 2005-05-03 20:03:50 UTC (rev 1795)
@@ -3,145 +3,6 @@
//#include <vcl.h>
#pragma hdrstop
-USEUNIT("..\..\src\frontend\swdisp.cpp");
-USEUNIT("..\..\src\frontend\swlog.cpp");
-USEUNIT("..\..\src\keys\versekey.cpp");
-USEUNIT("..\..\src\keys\strkey.cpp");
-USEUNIT("..\..\src\keys\swkey.cpp");
-USEUNIT("..\..\src\keys\treekey.cpp");
-USEUNIT("..\..\src\keys\treekeyidx.cpp");
-USEUNIT("..\..\src\keys\listkey.cpp");
-USEUNIT("..\..\src\mgr\swsearchable.cpp");
-USEUNIT("..\..\src\mgr\encfiltmgr.cpp");
-USEUNIT("..\..\src\mgr\filemgr.cpp");
-USEUNIT("..\..\src\mgr\ftplibftpt.cpp");
-USEUNIT("..\..\src\mgr\ftptrans.cpp");
-USEUNIT("..\..\src\mgr\installmgr.cpp");
-USEUNIT("..\..\src\mgr\localemgr.cpp");
-USEUNIT("..\..\src\mgr\markupfiltmgr.cpp");
-USEUNIT("..\..\src\mgr\stringmgr.cpp");
-USEUNIT("..\..\src\mgr\swcacher.cpp");
-USEUNIT("..\..\src\mgr\swconfig.cpp");
-USEUNIT("..\..\src\mgr\swfiltermgr.cpp");
-USEUNIT("..\..\src\mgr\swlocale.cpp");
-USEUNIT("..\..\src\mgr\swmgr.cpp");
-USEUNIT("..\..\src\mgr\curlftpt.cpp");
-USEUNIT("..\..\src\utilfuns\utilxml.cpp");
-USEUNIT("..\..\src\utilfuns\roman.cpp");
-USEUNIT("..\..\src\utilfuns\swbuf.cpp");
-USEUNIT("..\..\src\utilfuns\swobject.cpp");
-USEUNIT("..\..\src\utilfuns\swunicod.cpp");
-USEUNIT("..\..\src\utilfuns\swversion.cpp");
-USEUNIT("..\..\src\utilfuns\url.cpp");
-USEUNIT("..\..\src\utilfuns\utilstr.cpp");
-USEUNIT("..\..\src\utilfuns\Greek2Greek.cpp");
-USEUNIT("..\..\src\modules\comments\hrefcom\hrefcom.cpp");
-USEUNIT("..\..\src\modules\comments\rawcom\rawcom.cpp");
-USEUNIT("..\..\src\modules\comments\rawfiles\rawfiles.cpp");
-USEUNIT("..\..\src\modules\comments\zcom\zcom.cpp");
-USEUNIT("..\..\src\modules\comments\swcom.cpp");
-USEUNIT("..\..\src\modules\common\zverse.cpp");
-USEUNIT("..\..\src\modules\common\entriesblk.cpp");
-USEUNIT("..\..\src\modules\common\lzsscomprs.cpp");
-USEUNIT("..\..\src\modules\common\rawstr.cpp");
-USEUNIT("..\..\src\modules\common\rawstr4.cpp");
-USEUNIT("..\..\src\modules\common\rawverse.cpp");
-USEUNIT("..\..\src\modules\common\sapphire.cpp");
-USEUNIT("..\..\src\modules\common\swcipher.cpp");
-USEUNIT("..\..\src\modules\common\swcomprs.cpp");
-USEUNIT("..\..\src\modules\common\zipcomprs.cpp");
-USEUNIT("..\..\src\modules\common\zstr.cpp");
-USEUNIT("..\..\src\modules\filters\utf8utf16.cpp");
-USEUNIT("..\..\src\modules\filters\gbffootnotes.cpp");
-USEUNIT("..\..\src\modules\filters\gbfheadings.cpp");
-USEUNIT("..\..\src\modules\filters\gbfhtml.cpp");
-USEUNIT("..\..\src\modules\filters\gbfhtmlhref.cpp");
-USEUNIT("..\..\src\modules\filters\gbfmorph.cpp");
-USEUNIT("..\..\src\modules\filters\gbfosis.cpp");
-USEUNIT("..\..\src\modules\filters\gbfplain.cpp");
-USEUNIT("..\..\src\modules\filters\gbfredletterwords.cpp");
-USEUNIT("..\..\src\modules\filters\gbfrtf.cpp");
-USEUNIT("..\..\src\modules\filters\gbfstrongs.cpp");
-USEUNIT("..\..\src\modules\filters\gbfthml.cpp");
-USEUNIT("..\..\src\modules\filters\gbfwebif.cpp");
-USEUNIT("..\..\src\modules\filters\greeklexattribs.cpp");
-USEUNIT("..\..\src\modules\filters\latin1utf16.cpp");
-USEUNIT("..\..\src\modules\filters\latin1utf8.cpp");
-USEUNIT("..\..\src\modules\filters\osisfootnotes.cpp");
-USEUNIT("..\..\src\modules\filters\osisheadings.cpp");
-USEUNIT("..\..\src\modules\filters\osishtmlhref.cpp");
-USEUNIT("..\..\src\modules\filters\osislemma.cpp");
-USEUNIT("..\..\src\modules\filters\osismorph.cpp");
-USEUNIT("..\..\src\modules\filters\osisosis.cpp");
-USEUNIT("..\..\src\modules\filters\osisplain.cpp");
-USEUNIT("..\..\src\modules\filters\osisredletterwords.cpp");
-USEUNIT("..\..\src\modules\filters\osisrtf.cpp");
-USEUNIT("..\..\src\modules\filters\osisscripref.cpp");
-USEUNIT("..\..\src\modules\filters\osisstrongs.cpp");
-USEUNIT("..\..\src\modules\filters\osiswebif.cpp");
-USEUNIT("..\..\src\modules\filters\osiswordjs.cpp");
-USEUNIT("..\..\src\modules\filters\plainfootnotes.cpp");
-USEUNIT("..\..\src\modules\filters\plainhtml.cpp");
-USEUNIT("..\..\src\modules\filters\rtfhtml.cpp");
-USEUNIT("..\..\src\modules\filters\scsuutf8.cpp");
-USEUNIT("..\..\src\modules\filters\swbasicfilter.cpp");
-USEUNIT("..\..\src\modules\filters\swoptfilter.cpp");
-USEUNIT("..\..\src\modules\filters\thmlfootnotes.cpp");
-USEUNIT("..\..\src\modules\filters\thmlgbf.cpp");
-USEUNIT("..\..\src\modules\filters\thmlheadings.cpp");
-USEUNIT("..\..\src\modules\filters\thmlhtml.cpp");
-USEUNIT("..\..\src\modules\filters\thmlhtmlhref.cpp");
-USEUNIT("..\..\src\modules\filters\thmllemma.cpp");
-USEUNIT("..\..\src\modules\filters\thmlmorph.cpp");
-USEUNIT("..\..\src\modules\filters\thmlosis.cpp");
-USEUNIT("..\..\src\modules\filters\thmlplain.cpp");
-USEUNIT("..\..\src\modules\filters\thmlrtf.cpp");
-USEUNIT("..\..\src\modules\filters\thmlscripref.cpp");
-USEUNIT("..\..\src\modules\filters\thmlstrongs.cpp");
-USEUNIT("..\..\src\modules\filters\thmlvariants.cpp");
-USEUNIT("..\..\src\modules\filters\thmlwebif.cpp");
-USEUNIT("..\..\src\modules\filters\thmlwordjs.cpp");
-USEUNIT("..\..\src\modules\filters\unicodertf.cpp");
-USEUNIT("..\..\src\modules\filters\utf16utf8.cpp");
-USEUNIT("..\..\src\modules\filters\utf8arshaping.cpp");
-USEUNIT("..\..\src\modules\filters\utf8bidireorder.cpp");
-USEUNIT("..\..\src\modules\filters\utf8cantillation.cpp");
-USEUNIT("..\..\src\modules\filters\utf8greekaccents.cpp");
-USEUNIT("..\..\src\modules\filters\utf8hebrewpoints.cpp");
-USEUNIT("..\..\src\modules\filters\utf8html.cpp");
-USEUNIT("..\..\src\modules\filters\utf8latin1.cpp");
-USEUNIT("..\..\src\modules\filters\utf8nfc.cpp");
-USEUNIT("..\..\src\modules\filters\utf8nfkd.cpp");
-USEUNIT("..\..\src\modules\filters\utf8transliterator.cpp");
-USEUNIT("..\..\src\modules\filters\cipherfil.cpp");
-USEUNIT("..\..\src\modules\genbook\rawgenbook\rawgenbook.cpp");
-USEUNIT("..\..\src\modules\genbook\swgenbook.cpp");
-USEUNIT("..\..\src\modules\lexdict\rawld\rawld.cpp");
-USEUNIT("..\..\src\modules\lexdict\rawld4\rawld4.cpp");
-USEUNIT("..\..\src\modules\lexdict\zld\zld.cpp");
-USEUNIT("..\..\src\modules\lexdict\swld.cpp");
-USEUNIT("..\..\src\modules\tests\echomod.cpp");
-USEUNIT("..\..\src\modules\texts\rawtext\rawtext.cpp");
-USEUNIT("..\..\src\modules\texts\ztext\ztext.cpp");
-USEUNIT("..\..\src\modules\texts\swtext.cpp");
-USEUNIT("..\..\src\modules\swmodule.cpp");
-USEUNIT("..\..\src\utilfuns\zlib\zutil.c");
-USEUNIT("..\..\src\utilfuns\zlib\compress.c");
-USEUNIT("..\..\src\utilfuns\zlib\crc32.c");
-USEUNIT("..\..\src\utilfuns\zlib\deflate.c");
-USEUNIT("..\..\src\utilfuns\zlib\gzio.c");
-USEUNIT("..\..\src\utilfuns\zlib\infblock.c");
-USEUNIT("..\..\src\utilfuns\zlib\infcodes.c");
-USEUNIT("..\..\src\utilfuns\zlib\inffast.c");
-USEUNIT("..\..\src\utilfuns\zlib\inflate.c");
-USEUNIT("..\..\src\utilfuns\zlib\inftrees.c");
-USEUNIT("..\..\src\utilfuns\zlib\infutil.c");
-USEUNIT("..\..\src\utilfuns\zlib\maketree.c");
-USEUNIT("..\..\src\utilfuns\zlib\trees.c");
-USEUNIT("..\..\src\utilfuns\zlib\uncompr.c");
-USEUNIT("..\..\src\utilfuns\zlib\untgz.c");
-USEUNIT("..\..\src\utilfuns\zlib\adler32.c");
-//---------------------------------------------------------------------------
USE("..\..\src\modules\lexdict\rawld\#include <utilxml.h>
", File);
//---------------------------------------------------------------------------
Modified: trunk/lib/bcppmake/libsword6icu.bpr
===================================================================
--- trunk/lib/bcppmake/libsword6icu.bpr 2005-05-03 19:40:40 UTC (rev 1794)
+++ trunk/lib/bcppmake/libsword6icu.bpr 2005-05-03 20:03:50 UTC (rev 1795)
@@ -7,23 +7,23 @@
<OBJFILES value="..\..\obj\versekey.obj ..\..\obj\strkey.obj ..\..\obj\swkey.obj
..\..\obj\listkey.obj ..\..\obj\swmgr.obj ..\..\obj\localemgr.obj
..\..\obj\swconfig.obj ..\..\obj\swlocale.obj ..\..\obj\filemgr.obj
- ..\..\obj\utilstr.obj ..\..\obj\utilconf.obj ..\..\obj\Greek2Greek.obj
- ..\..\obj\swlog.obj ..\..\obj\swdisp.obj ..\..\obj\swmodule.obj
- ..\..\obj\swcom.obj ..\..\obj\hrefcom.obj ..\..\obj\rawcom.obj
- ..\..\obj\rawfiles.obj ..\..\obj\lzsscomprs.obj ..\..\obj\rawstr.obj
- ..\..\obj\rawverse.obj ..\..\obj\sapphire.obj ..\..\obj\swcipher.obj
- ..\..\obj\swcomprs.obj ..\..\obj\thmlrtf.obj ..\..\obj\gbffootnotes.obj
- ..\..\obj\gbfhtml.obj ..\..\obj\gbfplain.obj ..\..\obj\gbfrtf.obj
- ..\..\obj\gbfstrongs.obj ..\..\obj\gbfthml.obj
- ..\..\obj\plainfootnotes.obj ..\..\obj\plainhtml.obj ..\..\obj\rtfhtml.obj
- ..\..\obj\thmlgbf.obj ..\..\obj\thmlhtml.obj ..\..\obj\thmlplain.obj
- ..\..\obj\cipherfil.obj ..\..\obj\swld.obj ..\..\obj\rawld.obj
- ..\..\obj\swtext.obj ..\..\obj\rawtext.obj ..\..\obj\ztext.obj
- ..\..\obj\zverse.obj ..\..\obj\treekey.obj ..\..\obj\treekeyidx.obj
- ..\..\obj\rawstr4.obj ..\..\obj\zstr.obj ..\..\obj\swgenbook.obj
- ..\..\obj\rawgenbook.obj ..\..\obj\swfiltermgr.obj ..\..\obj\utf8utf16.obj
- ..\..\obj\gbfheadings.obj ..\..\obj\gbfhtmlhref.obj ..\..\obj\gbfmorph.obj
- ..\..\obj\latin1utf16.obj ..\..\obj\latin1utf8.obj ..\..\obj\scsuutf8.obj
+ ..\..\obj\utilstr.obj ..\..\obj\Greek2Greek.obj ..\..\obj\swlog.obj
+ ..\..\obj\swdisp.obj ..\..\obj\swmodule.obj ..\..\obj\swcom.obj
+ ..\..\obj\hrefcom.obj ..\..\obj\rawcom.obj ..\..\obj\rawfiles.obj
+ ..\..\obj\lzsscomprs.obj ..\..\obj\rawstr.obj ..\..\obj\rawverse.obj
+ ..\..\obj\sapphire.obj ..\..\obj\swcipher.obj ..\..\obj\swcomprs.obj
+ ..\..\obj\thmlrtf.obj ..\..\obj\gbffootnotes.obj ..\..\obj\gbfhtml.obj
+ ..\..\obj\gbfplain.obj ..\..\obj\gbfrtf.obj ..\..\obj\gbfstrongs.obj
+ ..\..\obj\gbfthml.obj ..\..\obj\plainfootnotes.obj ..\..\obj\plainhtml.obj
+ ..\..\obj\rtfhtml.obj ..\..\obj\thmlgbf.obj ..\..\obj\thmlhtml.obj
+ ..\..\obj\thmlplain.obj ..\..\obj\cipherfil.obj ..\..\obj\swld.obj
+ ..\..\obj\rawld.obj ..\..\obj\swtext.obj ..\..\obj\rawtext.obj
+ ..\..\obj\ztext.obj ..\..\obj\zverse.obj ..\..\obj\treekey.obj
+ ..\..\obj\treekeyidx.obj ..\..\obj\rawstr4.obj ..\..\obj\zstr.obj
+ ..\..\obj\swgenbook.obj ..\..\obj\rawgenbook.obj ..\..\obj\swfiltermgr.obj
+ ..\..\obj\utf8utf16.obj ..\..\obj\gbfheadings.obj
+ ..\..\obj\gbfhtmlhref.obj ..\..\obj\gbfmorph.obj ..\..\obj\latin1utf16.obj
+ ..\..\obj\latin1utf8.obj ..\..\obj\scsuutf8.obj
..\..\obj\swbasicfilter.obj ..\..\obj\thmlfootnotes.obj
..\..\obj\thmlheadings.obj ..\..\obj\thmlhtmlhref.obj
..\..\obj\thmllemma.obj ..\..\obj\thmlmorph.obj ..\..\obj\thmlscripref.obj
@@ -52,7 +52,7 @@
..\..\obj\osislemma.obj ..\..\obj\osisredletterwords.obj
..\..\obj\osishtmlhref.obj ..\..\obj\swsearchable.obj
..\..\obj\osiswebif.obj ..\..\obj\osisosis.obj ..\..\obj\stringmgr.obj
- ..\..\obj\swversion.obj ..\..\obj\url.obj"/>
+ ..\..\obj\swversion.obj ..\..\obj\url.obj ..\..\obj\swobject.obj"/>
<RESFILES value=""/>
<IDLFILES value=""/>
<IDLGENFILES value=""/>
@@ -114,7 +114,6 @@
<FILE FILENAME="..\..\src\mgr\swlocale.cpp" FORMNAME="" UNITNAME="swlocale" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\mgr\filemgr.cpp" FORMNAME="" UNITNAME="filemgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\utilfuns\utilstr.cpp" FORMNAME="" UNITNAME="utilstr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
- <FILE FILENAME="..\..\src\utilfuns\utilconf.cpp" FORMNAME="" UNITNAME="utilconf" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\utilfuns\Greek2Greek.cpp" FORMNAME="" UNITNAME="Greek2Greek" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\frontend\swlog.cpp" FORMNAME="" UNITNAME="swlog" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\frontend\swdisp.cpp" FORMNAME="" UNITNAME="swdisp" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
@@ -235,6 +234,7 @@
<FILE FILENAME="..\..\src\mgr\stringmgr.cpp" FORMNAME="" UNITNAME="stringmgr" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\utilfuns\swversion.cpp" FORMNAME="" UNITNAME="swversion" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
<FILE FILENAME="..\..\src\utilfuns\url.cpp" FORMNAME="" UNITNAME="url" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+ <FILE FILENAME="..\..\src\utilfuns\swobject.cpp" FORMNAME="" UNITNAME="swobject" CONTAINERID="CCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
</FILELIST>
<BUILDTOOLS>
</BUILDTOOLS>
Modified: trunk/src/modules/texts/rawtext/rawtext.cpp
===================================================================
--- trunk/src/modules/texts/rawtext/rawtext.cpp 2005-05-03 19:40:40 UTC (rev 1794)
+++ trunk/src/modules/texts/rawtext/rawtext.cpp 2005-05-03 20:03:50 UTC (rev 1795)
@@ -53,9 +53,9 @@
for (int loop = 0; loop < 2; loop++) {
fastSearch[loop] = 0;
SWBuf fastidxname =(fname + ((loop)?"ntwords.dat":"otwords.dat"));
- if (!access(fastidxname.c_str(), 04)) {
+ if (FileMgr::existsFile(fastidxname.c_str())) {
fastidxname = (fname + ((loop)?"ntwords.idx":"otwords.idx"));
- if (!access(fastidxname.c_str(), 04))
+ if (FileMgr::existsFile(fastidxname.c_str()))
fastSearch[loop] = new RawStr((fname + ((loop)?"ntwords":"otwords")).c_str());
}
}
More information about the sword-cvs
mailing list