diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/console/diatheke/corediatheke.cpp | 5 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/sword.bpr | 22 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/sword.res | bin | 1972 -> 1972 bytes | |||
| -rw-r--r-- | apps/windoze/CBuilder5/BibleCS/swordlib.bpr | 16 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpg | 6 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr | 24 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/InstallMgr.cpp | 1 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/InstallMgr.res | bin | 1852 -> 1856 bytes | |||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm | bin | 1510 -> 1511 bytes | |||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/installmgr.conf | 1 | ||||
| -rw-r--r-- | apps/windoze/CBuilder5/InstallMgr/zlib.bpr | 13 |
11 files changed, 42 insertions, 46 deletions
diff --git a/apps/console/diatheke/corediatheke.cpp b/apps/console/diatheke/corediatheke.cpp index 6c32bbe..3b43450 100644 --- a/apps/console/diatheke/corediatheke.cpp +++ b/apps/console/diatheke/corediatheke.cpp @@ -5,6 +5,7 @@ // see accompanying LICENSE file for license details #include "corediatheke.h" +#include <regex.h> #include <iostream> #include <string> #include <list> @@ -219,7 +220,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI querytype = QT_LD; //do search stuff - searchtype = 1 - searchtype; + char st = 1 - searchtype; if (querytype == QT_BIBLE) { *output << "Verses containing \""; } @@ -227,7 +228,7 @@ void doquery(unsigned long maxverses = -1, unsigned char outputformat = FMT_PLAI *output << ref; *output << "\"-- "; - listkey = target->Search(ref, searchtype); + listkey = target->Search(ref, st, REG_ICASE); if (strlen((const char*)listkey)) { if (!listkey.Error()) { diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr index 5627534..ac9ee50 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.bpr +++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr @@ -43,7 +43,7 @@ <DEBUGLIBPATH value="$(BCB)\lib\debug"/> <RELEASELIBPATH value="$(BCB)\lib\release"/> <LINKER value="ilink32"/> - <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/> <SYSDEFINES value="NO_STRICT"/> <MAINSOURCE value="sword.cpp"/> <INCLUDEPATH value="TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/> @@ -55,16 +55,16 @@ <IDLCFLAGS value="-I..\.. -I..\..\..\..\..\icu-sword\source\common -I..\..\..\..\..\icu-sword\source\i18n -I..\..\..\..\include -I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_"/> - <CFLAG1 value="-vGc -vGt -vGd -Od -Vx -Ve -RT- -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/> - <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -v -M -JPHNE"/> + <CFLAG1 value="-O2 -Vx -Ve -RT- -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"" -aa -Tpe -GD -s -Gn -v"/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-Iobj -D"" -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] @@ -73,7 +73,7 @@ AutoIncBuild=1 MajorVer=1 MinorVer=5 Release=4 -Build=129 +Build=130 Debug=0 PreRelease=0 Special=0 @@ -85,7 +85,7 @@ CodePage=1252 [Version Info Keys] CompanyName=CrossWire Software & Bible Society FileDescription=Windows 32bit User Interface to The SWORD Project -FileVersion=1.5.4.129 +FileVersion=1.5.4.130 InternalName=biblecs LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License LegalTrademarks= @@ -125,8 +125,8 @@ Item0=$(BCB)\source\vcl [HistoryLists\hlConditionals] Count=8 -Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG -Item1=_ICU_;_ICUSWORD_;USBINARY +Item0=_ICU_;_ICUSWORD_;USBINARY +Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY Item3=_ICU_;_ICUSWORD_;_DEBUG Item4=_ICU_;_ICUSWORD_ @@ -159,7 +159,7 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 +LinkCGLIB=0 [Language] ActiveLang= diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res Binary files differindex 6dd7c05..9adcbc3 100644 --- a/apps/windoze/CBuilder5/BibleCS/sword.res +++ b/apps/windoze/CBuilder5/BibleCS/sword.res diff --git a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr index a280a48..9978ead 100644 --- a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr +++ b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr @@ -78,7 +78,7 @@ <DEBUGLIBPATH value=""/> <RELEASELIBPATH value=""/> <LINKER value="TLib"/> - <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/> + <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/> <SYSDEFINES value="NO_STRICT;_NO_VCL"/> <MAINSOURCE value="swordlib.cpp"/> <INCLUDEPATH value="..\InstallMgr\curl\include;..\..;..\..\..\..\src\modules\genbook\rawgenbook;..\..\..\..\src\modules\genbook;..\..\..\..\src\modules\lexdict\zld;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\src\utilfuns\zlib;..\..\..\..\src\modules\lexdict\rawld4;..\..\..\..\src\modules\comments\zcom;..\..\..\..\src\modules\texts\ztext;..\..\..\..\src\frontend;..\..\..;..\..\..\..\utilfuns;..\..\..\framework;..\..\..\..\src\modules\comments\rawfiles;..\..\..\..\src\modules\comments\hrefcom;..\..\..\..\include;..\..\..\..\frontend;..\..\..\..\src\utilfuns;..\..\..\..\src\modules;..\..\..\..\src\modules\texts;..\..\..\..\src\modules\texts\rawtext;..\..\..\..\src\modules\texts\rawgbf;..\..\..\..\src\modules\lexdict;..\..\..\..\src\modules\lexdict\rawld;..\..\..\..\src\modules\filters;..\..\..\..\src\modules\common;..\..\..\..\src\modules\comments;..\..\..\..\src\modules\comments\rawcom;..\..\..\..\src\mgr;..\..\..\..\src\keys;$(BCB)\include;$(BCB)\include\vcl"/> @@ -107,11 +107,11 @@ -I..\..\..\..\src\modules\comments\rawcom -I..\..\..\..\src\mgr -I..\..\..\..\src\keys -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -D_ICU_ -D_DEBUG"/> - <CFLAG1 value="-vGc -vGt -vGd -Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx - -Ve -RT- -X- -r- -a8 -4 -b- -k -y -v -vi- -c -g0 -tWM"/> - <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y+ -$W -$O- -v -M -JPHNE"/> + <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8 + -4 -b- -k- -vi -c -g0 -tWM"/> + <PFLAGS value="-N2..\..\..\..\obj -N0..\..\..\..\obj -$Y- -$L- -$D- -v -M -JPHNE"/> <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zi"/> + <AFLAGS value="/mx /w2 /zn"/> <LFLAGS value="/P512"/> </OPTIONS> <LINKER> @@ -163,8 +163,8 @@ Item5=..\..\..\..\src\modules\lexdict\zld;..\..;..\..\..\..\src\utilfuns\zlib;.. [HistoryLists\hlConditionals] Count=8 -Item0=_ICU_;_ICUSWORD_;USBINARY;_DEBUG -Item1=_ICU_;_ICUSWORD_;USBINARY +Item0=_ICU_;_ICUSWORD_;USBINARY +Item1=_ICU_;_ICUSWORD_;USBINARY;_DEBUG Item2=_ICU_;_ICUSWORD_;_DEBUG;USBINARY Item3=_ICU_;_ICUSWORD_;_DEBUG Item4=_ICU_;_ICUSWORD_ @@ -200,7 +200,7 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 +LinkCGLIB=0 [Language] ActiveLang= diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpg b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpg index 792eb7c..33413a8 100644 --- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpg +++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpg @@ -9,7 +9,7 @@ MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$** DCC = $(ROOT)\bin\dcc32.exe $** BRCC = $(ROOT)\bin\brcc32.exe $** #------------------------------------------------------------------------------ -PROJECTS = swordlib.lib zlib.lib libcurl.lib InstallMgr.exe +PROJECTS = swordlib.lib libcurl.lib InstallMgr.exe #------------------------------------------------------------------------------ default: $(PROJECTS) #------------------------------------------------------------------------------ @@ -20,10 +20,6 @@ InstallMgr.exe: InstallMgr.bpr swordlib.lib: ..\BibleCS\swordlib.bpr $(MAKE) -zlib.lib: zlib.bpr - $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** - $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak - libcurl.lib: libcurl.bpr $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $** $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr index 5ac73fc..e91fc4b 100644 --- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr +++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr @@ -12,7 +12,7 @@ <DEFFILE value=""/> <RESDEPEN value="$(RESFILES) MainFrm.dfm StatusFrm.dfm RemoteMntFrm.dfm InfoFrm.dfm cipherfrm.dfm UninstallFrm.dfm"/> - <LIBFILES value="zlib.lib ..\..\..\..\lib\swordlib.lib libcurl.lib curl\lib\ws2_32.lib + <LIBFILES value="..\..\..\..\lib\swordlib.lib libcurl.lib curl\lib\ws2_32.lib ..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib ..\..\..\..\..\icu-sword\as_is\borland\icudatab.lib ..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib"/> @@ -28,7 +28,7 @@ <DEBUGLIBPATH value="$(BCB)\lib\debug"/> <RELEASELIBPATH value="$(BCB)\lib\release"/> <LINKER value="ilink32"/> - <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG"/> + <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;USBINARY"/> <SYSDEFINES value="NO_STRICT"/> <MAINSOURCE value="InstallMgr.cpp"/> <INCLUDEPATH value="curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include"/> @@ -40,17 +40,17 @@ <IDLCFLAGS value="-I..\BibleCS -I..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr -I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\..\include -src_suffix cpp -DVCL -boa"/> - <CFLAG1 value="-vGc -vGt -vGd -Od -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx - -Ve -RT- -X- -r- -a8 -b- -k -y -v -vi- -c -tW -tWM"/> - <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/> + <CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8 + -b- -k- -vi -c -tW -tWM"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> <RFLAGS value=""/> - <AFLAGS value="/mx /w2 /zi"/> - <LFLAGS value="-D"" -aa -Tpe -x -Gn -v"/> + <AFLAGS value="/mx /w2 /zn"/> + <LFLAGS value="-D"" -aa -Tpe -x -Gn"/> </OPTIONS> <LINKER> <ALLOBJ value="c0w32.obj sysinit.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] @@ -77,7 +77,7 @@ LegalCopyright=Copyright 2002 by CrossWire Bible Society LegalTrademarks= OriginalFilename= ProductName=The SWORD Project -ProductVersion=1.5.4 +ProductVersion=1.5.4a Comments=Seek Jesus who exchanges temporary for eternal [HistoryLists\hlIncludePath] @@ -103,8 +103,8 @@ Item0=$(BCB)\source\vcl [HistoryLists\hlConditionals] Count=10 -Item0=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG -Item1=VCL;_ICU_;_ICUSWORD_;USBINARY +Item0=VCL;_ICU_;_ICUSWORD_;USBINARY +Item1=VCL;_ICU_;_ICUSWORD_;USBINARY;_DEBUG Item2=VCL Item3=VCL;_DEBUG Item4=VCL;__STDC__ true @@ -131,7 +131,7 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 +LinkCGLIB=0 [Language] ActiveLang= diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.cpp b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.cpp index ce79815..ae345b6 100644 --- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.cpp +++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.cpp @@ -8,7 +8,6 @@ USEFORM("RemoteMntFrm.cpp", RemoteMntForm); USEFORM("InfoFrm.cpp", InfoForm); USEFORM("cipherfrm.cpp", CipherForm); USEFORM("UninstallFrm.cpp", UninstallForm); -USELIB("zlib.lib"); USELIB("..\..\..\..\lib\swordlib.lib"); USELIB("libcurl.lib"); USELIB("curl\lib\ws2_32.lib"); diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res Binary files differindex a67dc92..e1236ba 100644 --- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res +++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.res diff --git a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm Binary files differindex 4d009c4..a139ac2 100644 --- a/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm +++ b/apps/windoze/CBuilder5/InstallMgr/StatusFrm.dfm diff --git a/apps/windoze/CBuilder5/InstallMgr/installmgr.conf b/apps/windoze/CBuilder5/InstallMgr/installmgr.conf index 5002470..fd15db9 100644 --- a/apps/windoze/CBuilder5/InstallMgr/installmgr.conf +++ b/apps/windoze/CBuilder5/InstallMgr/installmgr.conf @@ -5,5 +5,6 @@ PassiveFTP=true [Sources] FTPSource=crosswire|ftp.crosswire.org|/pub/sword/raw/ FTPSource=host|192.168.32.123|/pub/sword +FTPSource=CrossWire Beta|sword.cx|/pub/sword/betaraw/ LocalPath= diff --git a/apps/windoze/CBuilder5/InstallMgr/zlib.bpr b/apps/windoze/CBuilder5/InstallMgr/zlib.bpr index 04abf33..529900f 100644 --- a/apps/windoze/CBuilder5/InstallMgr/zlib.bpr +++ b/apps/windoze/CBuilder5/InstallMgr/zlib.bpr @@ -33,7 +33,7 @@ <PATHRC value=".;"/> <PATHASM value=".;"/> <LINKER value="TLib"/> - <USERDEFINES value="_DEBUG"/> + <USERDEFINES value=""/> <SYSDEFINES value="_RTLDLL;NO_STRICT"/> <MAINSOURCE value="zlib.bpf"/> <INCLUDEPATH value="..\..\..\..\src\utilfuns\zlib;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include"/> @@ -44,15 +44,14 @@ <OPTIONS> <IDLCFLAGS value="-I..\..\..\..\src\utilfuns\zlib -I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\..\include -src_suffix cpp -boa"/> - <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"/> + <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tW -tWM"/> + <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/> + <AFLAGS value="/mx /w2 /zn"/> <LFLAGS value=""/> </OPTIONS> <LINKER> <ALLOBJ value="$(OBJFILES)"/> - <ALLLIB value="cg32.lib "/> + <ALLLIB value="cg32.lib"/> </LINKER> <IDEOPTIONS> [Version Info] @@ -112,7 +111,7 @@ RemoteDebug=0 [Compiler] ShowInfoMsgs=0 LinkDebugVcl=0 -LinkCGLIB=1 +LinkCGLIB=0 [Language] ActiveLang= |