[sword-svn] r2107 - in trunk: include lib/bcppmake src/mgr utilities utilities/bcppmake
chrislit at www.crosswire.org
chrislit at www.crosswire.org
Thu Oct 11 22:54:55 MST 2007
Author: chrislit
Date: 2007-10-11 22:54:54 -0700 (Thu, 11 Oct 2007)
New Revision: 2107
Modified:
trunk/include/defs.h
trunk/lib/bcppmake/libsword.bpf
trunk/lib/bcppmake/libsword.bpr
trunk/src/mgr/filemgr.cpp
trunk/utilities/bcppmake/installmgr.bpf
trunk/utilities/bcppmake/utilities.bpg
trunk/utilities/cipherraw.cpp
trunk/utilities/mod2zmod.cpp
trunk/utilities/step2vpl.cpp
trunk/utilities/stepdump.cpp
trunk/utilities/vpl2mod.cpp
trunk/utilities/vpl2zmod2.cpp
Log:
fixed BCB compilation of utils (mostly)
added rawverse4 stuff to BCB projects
Modified: trunk/include/defs.h
===================================================================
--- trunk/include/defs.h 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/include/defs.h 2007-10-12 05:54:54 UTC (rev 2107)
@@ -101,6 +101,18 @@
# define SWDLLIMPORT
#endif
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+#ifndef S_IRGRP
+#define S_IRGRP 0
+#endif
+
+#ifndef S_IROTH
+#define S_IROTH 0
+#endif
+
enum {DIRECTION_LTR = 0, DIRECTION_RTL, DIRECTION_BIDI};
enum {FMT_UNKNOWN = 0, FMT_PLAIN, FMT_THML, FMT_GBF, FMT_HTML, FMT_HTMLHREF, FMT_RTF, FMT_OSIS, FMT_WEBIF, FMT_TEI};
enum {ENC_UNKNOWN = 0, ENC_LATIN1, ENC_UTF8, ENC_SCSU, ENC_UTF16, ENC_RTF, ENC_HTML};
Modified: trunk/lib/bcppmake/libsword.bpf
===================================================================
--- trunk/lib/bcppmake/libsword.bpf 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/lib/bcppmake/libsword.bpf 2007-10-12 05:54:54 UTC (rev 2107)
@@ -145,6 +145,9 @@
USEUNIT("..\..\src\keys\versetreekey.cpp");
USEUNIT("..\..\src\modules\filters\teiplain.cpp");
USEUNIT("..\..\src\modules\filters\teirtf.cpp");
+USEUNIT("..\..\src\modules\texts\rawtext4\rawtext4.cpp");
+USEUNIT("..\..\src\modules\comments\rawcom4\rawcom4.cpp");
+USEUNIT("..\..\src\modules\common\rawverse4.cpp");
//---------------------------------------------------------------------------
#define Library
Modified: trunk/lib/bcppmake/libsword.bpr
===================================================================
--- trunk/lib/bcppmake/libsword.bpr 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/lib/bcppmake/libsword.bpr 2007-10-12 05:54:54 UTC (rev 2107)
@@ -114,7 +114,10 @@
..\..\src\modules\filters\papyriplain.obj ..\..\src\utilfuns\ftpparse.obj
..\..\src\modules\filters\osismorphsegmentation.obj
..\..\src\keys\versetreekey.obj ..\..\src\modules\filters\teiplain.obj
- ..\..\src\modules\filters\teirtf.obj"/>
+ ..\..\src\modules\filters\teirtf.obj
+ ..\..\src\modules\texts\rawtext4\rawtext4.obj
+ ..\..\src\modules\comments\rawcom4\rawcom4.obj
+ ..\..\src\modules\common\rawverse4.obj"/>
<RESFILES value=""/>
<IDLFILES value=""/>
<IDLGENFILES value=""/>
@@ -123,21 +126,21 @@
<LIBFILES value=""/>
<LIBRARIES value=""/>
<PACKAGES value=""/>
- <PATHCPP value=".;..\..\src\frontend;..\..\src\keys;..\..\src\mgr;..\..\src\utilfuns;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\zcom;..\..\src\modules\comments;..\..\src\modules\common;..\..\src\modules\filters;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict;..\..\src\modules\tests;..\..\src\modules\texts\rawtext;..\..\src\modules\texts\ztext;..\..\src\modules\texts;..\..\src\modules;..\..\src\utilfuns\zlib"/>
+ <PATHCPP value=".;..\..\src\frontend;..\..\src\keys;..\..\src\mgr;..\..\src\utilfuns;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\zcom;..\..\src\modules\comments;..\..\src\modules\common;..\..\src\modules\filters;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict;..\..\src\modules\tests;..\..\src\modules\texts\rawtext;..\..\src\modules\texts\ztext;..\..\src\modules\texts;..\..\src\modules;..\..\src\utilfuns\zlib;..\..\src\modules\texts\rawtext4;..\..\src\modules\comments\rawcom4"/>
<PATHPAS value=".;"/>
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value="UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="libsword.bpf"/>
- <INCLUDEPATH value="..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include"/>
- <LIBPATH value="..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include"/>
+ <LIBPATH value="..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par"/>
<LISTFILE value=""/>
</MACROS>
<OPTIONS>
- <IDLCFLAGS value="-I..\..\src\modules\tests -I..\..\src\utilfuns\zlib
+ <IDLCFLAGS value="-I..\..\src\modules\comments\rawcom4 -I..\..\src\modules\texts\rawtext4
+ -I..\..\src\modules\tests -I..\..\src\utilfuns\zlib
-I..\..\src\modules\lexdict\zld -I..\..\src\modules\lexdict\rawld4
-I..\..\src\modules\comments\zcom -I..\..\src\modules\genbook\rawgenbook
-I..\..\src\modules\genbook -I..\..\src\modules\texts\ztext
@@ -153,10 +156,6 @@
-I..\..\..\biblecs\clucene\src
-I..\..\..\biblecs\apps\InstallMgr\curl\include -src_suffix cpp -DUNICODE
-D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 -DUSELUCENE
- -D_WIN32 -D_CL_DISABLE_MULTITHREADING -no_tie -boa"/>
- <CFLAG1 value="-O2 -Vx -X- -a8 -b- -k- -vi -c -tW -tWM"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <AFLAGS value="/mx /w2 /zn"/>
<LFLAGS value="/P512"/>
</OPTIONS>
<LINKER>
@@ -230,8 +229,6 @@
[HistoryLists\hlConditionals]
Count=22
-Item0=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item1=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE
Item4=_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
Modified: trunk/src/mgr/filemgr.cpp
===================================================================
--- trunk/src/mgr/filemgr.cpp 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/src/mgr/filemgr.cpp 2007-10-12 05:54:54 UTC (rev 2107)
@@ -37,19 +37,6 @@
#include <unistd.h>
#endif
-
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-#ifndef S_IRGRP
-#define S_IRGRP 0
-#endif
-
-#ifndef S_IROTH
-#define S_IROTH 0
-#endif
-
// Fix for VC6
#ifndef S_IREAD
#ifdef _S_IREAD
Modified: trunk/utilities/bcppmake/installmgr.bpf
===================================================================
--- trunk/utilities/bcppmake/installmgr.bpf 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/utilities/bcppmake/installmgr.bpf 2007-10-12 05:54:54 UTC (rev 2107)
@@ -1,3 +1,10 @@
+USEUNIT("..\installmgr.cpp");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\biblecs\clucene\clucene.lib");
+//---------------------------------------------------------------------------
This file is used by the project manager only and should be treated like the project file
Modified: trunk/utilities/bcppmake/utilities.bpg
===================================================================
--- trunk/utilities/bcppmake/utilities.bpg 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/utilities/bcppmake/utilities.bpg 2007-10-12 05:54:54 UTC (rev 2107)
@@ -12,7 +12,7 @@
PROJECTS = icuuc.lib icuin.lib libcurl.lib clucene.lib libsword.lib \
osis2mod.exe mod2zmod.exe mod2vpl.exe mkfastmod.exe imp2gbs.exe vpl2mod.exe \
imp2ld.exe imp2vs.exe mod2imp.exe cipherraw.exe step2vpl.exe stepdump.exe \
- mod2osis.exe vs2osisref.exe diatheke.exe xml2gbs.exe installmgr.exe
+ mod2osis.exe vs2osisref.exe xml2gbs.exe diatheke.exe installmgr.exe
#------------------------------------------------------------------------------
default: $(PROJECTS)
#------------------------------------------------------------------------------
Modified: trunk/utilities/cipherraw.cpp
===================================================================
--- trunk/utilities/cipherraw.cpp 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/utilities/cipherraw.cpp 2007-10-12 05:54:54 UTC (rev 2107)
@@ -4,6 +4,7 @@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
+#include <sys/stat.h>
#ifndef __GNUC__
#include <io.h>
@@ -16,7 +17,6 @@
#include <rawverse.h>
#include <swbuf.h>
-
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
#endif
Modified: trunk/utilities/mod2zmod.cpp
===================================================================
--- trunk/utilities/mod2zmod.cpp 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/utilities/mod2zmod.cpp 2007-10-12 05:54:54 UTC (rev 2107)
@@ -133,7 +133,7 @@
((VerseKey *)(SWKey *)(*inModule))->Headings(1);
break;
case LEX:
- outModule = new zLD(argv[2], 0, 0, iType, compressor); // open our datapath with our RawText driver.
+ outModule = new zLD(argv[2], 0, 0, iType, compressor); // open our datapath with our RawText driver.
break;
}
Modified: trunk/utilities/step2vpl.cpp
===================================================================
--- trunk/utilities/step2vpl.cpp 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/utilities/step2vpl.cpp 2007-10-12 05:54:54 UTC (rev 2107)
@@ -1,6 +1,7 @@
#include <iostream>
#include <string>
#include <stdio.h>
+#include <sys/stat.h>
#include <fcntl.h>
@@ -12,10 +13,6 @@
#include <lzsscomprs.h>
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
using namespace std;
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
Modified: trunk/utilities/stepdump.cpp
===================================================================
--- trunk/utilities/stepdump.cpp 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/utilities/stepdump.cpp 2007-10-12 05:54:54 UTC (rev 2107)
@@ -1,6 +1,6 @@
#include <iostream>
#include <string>
-
+#include <sys/stat.h>
#include <fcntl.h>
#ifndef __GNUC__
@@ -11,11 +11,6 @@
#include <lzsscomprs.h>
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
-
using namespace std;
#ifndef NO_SWORD_NAMESPACE
using namespace sword;
Modified: trunk/utilities/vpl2mod.cpp
===================================================================
--- trunk/utilities/vpl2mod.cpp 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/utilities/vpl2mod.cpp 2007-10-12 05:54:54 UTC (rev 2107)
@@ -3,6 +3,7 @@
#include <fcntl.h>
#include <errno.h>
#include <stdlib.h>
+#include <sys/stat.h>
#ifndef __GNUC__
#include <io.h>
@@ -16,10 +17,6 @@
#include <string>
#include <versekey.h>
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
#ifndef NO_SWORD_NAMESPACE
using sword::SWMgr;
using sword::RawText;
Modified: trunk/utilities/vpl2zmod2.cpp
===================================================================
--- trunk/utilities/vpl2zmod2.cpp 2007-10-12 01:01:40 UTC (rev 2106)
+++ trunk/utilities/vpl2zmod2.cpp 2007-10-12 05:54:54 UTC (rev 2107)
@@ -3,6 +3,7 @@
#include <fcntl.h>
#include <errno.h>
#include <stdlib.h>
+#include <sys/stat.h>
#ifndef __GNUC__
#include <io.h>
@@ -18,10 +19,6 @@
#include <zipcomprs.h>
#include <versekey2.h>
-#ifndef O_BINARY
-#define O_BINARY 0
-#endif
-
#ifndef NO_SWORD_NAMESPACE
using sword::SWMgr;
using sword::SWBuf;
More information about the sword-cvs
mailing list