[sword-svn] r1709 - in trunk: lib/bcppmake src/keys tests/bcppmake
scribe at crosswire.org
scribe at crosswire.org
Fri Feb 4 02:46:22 MST 2005
Author: scribe
Date: 2005-02-04 02:46:22 -0700 (Fri, 04 Feb 2005)
New Revision: 1709
Modified:
trunk/lib/bcppmake/libsword.bpr
trunk/src/keys/versekey.cpp
trunk/tests/bcppmake/filtertest.bpf
trunk/tests/bcppmake/filtertest.bpr
trunk/tests/bcppmake/mgrtest.bpf
trunk/tests/bcppmake/mgrtest.bpr
trunk/tests/bcppmake/parsekey.bpf
trunk/tests/bcppmake/parsekey.bpr
trunk/tests/bcppmake/tests.bpg
Log:
updated tests bcppmake.
Fixed versekey.cpp for better parsing
Modified: trunk/lib/bcppmake/libsword.bpr
===================================================================
--- trunk/lib/bcppmake/libsword.bpr 2005-02-04 08:13:53 UTC (rev 1708)
+++ trunk/lib/bcppmake/libsword.bpr 2005-02-04 09:46:22 UTC (rev 1709)
@@ -115,7 +115,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="libsword.bpf"/>
<INCLUDEPATH value="..\..\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"/>
@@ -139,9 +139,9 @@
-I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\icu-sword\source\i18n
-src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -D_DEBUG
-DU_HAVE_PLACEMENT_NEW=0 -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"/>
+ <CFLAG1 value="-Od -Vx -X- -r- -a8 -b- -k -y -v -vi- -c -tW -tWM"/>
+ <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zi"/>
<LFLAGS value="/P512"/>
</OPTIONS>
<LINKER>
@@ -210,8 +210,8 @@
[HistoryLists\hlConditionals]
Count=11
-Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
-Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
+Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
Item2=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
Item3=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
Item4=_ICU_;_ICUSWORD_;USBINARY
Modified: trunk/src/keys/versekey.cpp
===================================================================
--- trunk/src/keys/versekey.cpp 2005-02-04 08:13:53 UTC (rev 1708)
+++ trunk/src/keys/versekey.cpp 2005-02-04 09:46:22 UTC (rev 1709)
@@ -421,6 +421,7 @@
if (*number)
chap = atoi(number);
*number = 0;
+ comma = 0;
break;
}
// otherwise drop down to next case
Modified: trunk/tests/bcppmake/filtertest.bpf
===================================================================
--- trunk/tests/bcppmake/filtertest.bpf 2005-02-04 08:13:53 UTC (rev 1708)
+++ trunk/tests/bcppmake/filtertest.bpf 2005-02-04 09:46:22 UTC (rev 1709)
@@ -1,5 +1,8 @@
USEUNIT("..\filtertest.cpp");
-USELIB("libsword.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
//---------------------------------------------------------------------------
This file is used by the project manager only and should be treated like the project file
Modified: trunk/tests/bcppmake/filtertest.bpr
===================================================================
--- trunk/tests/bcppmake/filtertest.bpr 2005-02-04 08:13:53 UTC (rev 1708)
+++ trunk/tests/bcppmake/filtertest.bpr 2005-02-04 09:46:22 UTC (rev 1709)
@@ -8,7 +8,9 @@
<RESFILES value=""/>
<DEFFILE value=""/>
<RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="libsword.lib"/>
+ <LIBFILES value="..\..\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icuuc.lib
+ ..\..\..\icu-sword\as_is\borland\icuin.lib
+ ..\..\..\icu-sword\as_is\borland\icudatab.lib"/>
<LIBRARIES value=""/>
<SPARELIBS value=""/>
<PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
@@ -25,13 +27,13 @@
<USERDEFINES value="_DEBUG"/>
<SYSDEFINES value="NO_STRICT;_NO_VCL"/>
<MAINSOURCE value="filtertest.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par"/>
</MACROS>
<OPTIONS>
- <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k
- -y -v -vi- -tWC -tWM -c"/>
+ <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC
+ -tWM -c"/>
<PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
<RFLAGS value=""/>
<AFLAGS value="/mx /w2 /zi"/>
@@ -40,7 +42,7 @@
<LINKER>
<ALLOBJ value="c0x32.obj $(OBJFILES)"/>
<ALLRES value="$(RESFILES)"/>
- <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
</LINKER>
<IDEOPTIONS>
[Version Info]
@@ -104,7 +106,7 @@
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
[Language]
ActiveLang=
Modified: trunk/tests/bcppmake/mgrtest.bpf
===================================================================
--- trunk/tests/bcppmake/mgrtest.bpf 2005-02-04 08:13:53 UTC (rev 1708)
+++ trunk/tests/bcppmake/mgrtest.bpf 2005-02-04 09:46:22 UTC (rev 1709)
@@ -1,5 +1,8 @@
USEUNIT("..\mgrtest.cpp");
-USELIB("libsword.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
//---------------------------------------------------------------------------
This file is used by the project manager only and should be treated like the project file
Modified: trunk/tests/bcppmake/mgrtest.bpr
===================================================================
--- trunk/tests/bcppmake/mgrtest.bpr 2005-02-04 08:13:53 UTC (rev 1708)
+++ trunk/tests/bcppmake/mgrtest.bpr 2005-02-04 09:46:22 UTC (rev 1709)
@@ -8,7 +8,9 @@
<RESFILES value=""/>
<DEFFILE value=""/>
<RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="libsword.lib"/>
+ <LIBFILES value="..\..\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icuuc.lib
+ ..\..\..\icu-sword\as_is\borland\icuin.lib
+ ..\..\..\icu-sword\as_is\borland\icudatab.lib"/>
<LIBRARIES value=""/>
<SPARELIBS value=""/>
<PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
@@ -25,13 +27,13 @@
<USERDEFINES value="_DEBUG"/>
<SYSDEFINES value="NO_STRICT;_NO_VCL"/>
<MAINSOURCE value="mgrtest.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par"/>
</MACROS>
<OPTIONS>
- <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k
- -y -v -vi- -tWC -tWM -c"/>
+ <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC
+ -tWM -c"/>
<PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
<RFLAGS value=""/>
<AFLAGS value="/mx /w2 /zi"/>
@@ -40,7 +42,7 @@
<LINKER>
<ALLOBJ value="c0x32.obj $(OBJFILES)"/>
<ALLRES value="$(RESFILES)"/>
- <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
</LINKER>
<IDEOPTIONS>
[Version Info]
@@ -104,7 +106,7 @@
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
[Language]
ActiveLang=
Modified: trunk/tests/bcppmake/parsekey.bpf
===================================================================
--- trunk/tests/bcppmake/parsekey.bpf 2005-02-04 08:13:53 UTC (rev 1708)
+++ trunk/tests/bcppmake/parsekey.bpf 2005-02-04 09:46:22 UTC (rev 1709)
@@ -1,5 +1,8 @@
USEUNIT("..\parsekey.cpp");
-USELIB("libsword.lib");
+USELIB("..\..\lib\libsword.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuuc.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icuin.lib");
+USELIB("..\..\..\icu-sword\as_is\borland\icudatab.lib");
//---------------------------------------------------------------------------
This file is used by the project manager only and should be treated like the project file
Modified: trunk/tests/bcppmake/parsekey.bpr
===================================================================
--- trunk/tests/bcppmake/parsekey.bpr 2005-02-04 08:13:53 UTC (rev 1708)
+++ trunk/tests/bcppmake/parsekey.bpr 2005-02-04 09:46:22 UTC (rev 1709)
@@ -8,7 +8,9 @@
<RESFILES value=""/>
<DEFFILE value=""/>
<RESDEPEN value="$(RESFILES)"/>
- <LIBFILES value="libsword.lib"/>
+ <LIBFILES value="..\..\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icuuc.lib
+ ..\..\..\icu-sword\as_is\borland\icuin.lib
+ ..\..\..\icu-sword\as_is\borland\icudatab.lib"/>
<LIBRARIES value=""/>
<SPARELIBS value=""/>
<PACKAGES value="VCL50.bpi VCLX50.bpi bcbsmp50.bpi QRPT50.bpi VCLDB50.bpi VCLBDE50.bpi
@@ -25,13 +27,13 @@
<USERDEFINES value="_DEBUG"/>
<SYSDEFINES value="NO_STRICT;_NO_VCL"/>
<MAINSOURCE value="parsekey.bpf"/>
- <INCLUDEPATH value="..\;..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..;..\..\include;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par"/>
</MACROS>
<OPTIONS>
- <CFLAG1 value="-vGc -vGt -vGd -Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k
- -y -v -vi- -tWC -tWM -c"/>
+ <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -b- -k -y -v -vi- -tWC
+ -tWM -c"/>
<PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
<RFLAGS value=""/>
<AFLAGS value="/mx /w2 /zi"/>
@@ -40,7 +42,7 @@
<LINKER>
<ALLOBJ value="c0x32.obj $(OBJFILES)"/>
<ALLRES value="$(RESFILES)"/>
- <ALLLIB value="cg32.lib $(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
+ <ALLLIB value="$(LIBFILES) $(LIBRARIES) import32.lib cw32mt.lib"/>
</LINKER>
<IDEOPTIONS>
[Version Info]
@@ -95,7 +97,7 @@
DebugSourceDirs=$(BCB)\source\vcl
[Parameters]
-RunParams=
+RunParams="jn1:2,3:4;1jn2:3 2jn;1jn 2:3: yo test"
HostApplication=
RemoteHost=
RemotePath=
@@ -104,7 +106,7 @@
[Compiler]
ShowInfoMsgs=0
LinkDebugVcl=0
-LinkCGLIB=1
+LinkCGLIB=0
[Language]
ActiveLang=
Modified: trunk/tests/bcppmake/tests.bpg
===================================================================
--- trunk/tests/bcppmake/tests.bpg 2005-02-04 08:13:53 UTC (rev 1708)
+++ trunk/tests/bcppmake/tests.bpg 2005-02-04 09:46:22 UTC (rev 1709)
@@ -14,10 +14,6 @@
default: $(PROJECTS)
#------------------------------------------------------------------------------
-libsword.lib: libsword.bpr
- $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
parsekey.exe: parsekey.bpr
$(ROOT)\bin\bpr2mak $**
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
@@ -30,4 +26,8 @@
$(ROOT)\bin\bpr2mak $**
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+libsword.lib: ..\..\lib\bcppmake\libsword.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
More information about the sword-cvs
mailing list