[sword-svn] r498 - in branches/BCB5: . TntUnicodeControls.attic/BCB5 apps/InstallMgr clucene stage
scribe at crosswire.org
scribe at crosswire.org
Mon Apr 20 01:24:48 MST 2009
Author: scribe
Date: 2009-04-20 01:24:47 -0700 (Mon, 20 Apr 2009)
New Revision: 498
Added:
branches/BCB5/BibleCS.bpg
Modified:
branches/BCB5/RxRichEditX.cpp
branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk
branches/BCB5/apps/InstallMgr/InstallManager.bpr
branches/BCB5/apps/InstallMgr/InstallManager.res
branches/BCB5/apps/InstallMgr/libcurl.bpr
branches/BCB5/clucene/clucene.bpr
branches/BCB5/mainfrm.cpp
branches/BCB5/stage/layout.conf
branches/BCB5/sword.bpr
branches/BCB5/sword.res
Log:
Added a new BibleCS project group cuz we couldn't debug with old project group. This is probably missing stuff, cuz stuff was probably already being build with our old swordprj project group. Fixed a worrisome bug: vk = vk2 doesn't just positionFrom any longer. It actually copies bounds and other things. Hmmm. Is this good or really really bad?
Added: branches/BCB5/BibleCS.bpg
===================================================================
--- branches/BCB5/BibleCS.bpg (rev 0)
+++ branches/BCB5/BibleCS.bpg 2009-04-20 08:24:47 UTC (rev 498)
@@ -0,0 +1,33 @@
+#------------------------------------------------------------------------------
+VERSION = BWS.01
+#------------------------------------------------------------------------------
+!ifndef ROOT
+ROOT = $(MAKEDIR)\..
+!endif
+#------------------------------------------------------------------------------
+MAKE = $(ROOT)\bin\make.exe -$(MAKEFLAGS) -f$**
+DCC = $(ROOT)\bin\dcc32.exe $**
+BRCC = $(ROOT)\bin\brcc32.exe $**
+#------------------------------------------------------------------------------
+PROJECTS = libsword.lib icuuc.lib icuin.lib sword.exe
+#------------------------------------------------------------------------------
+default: $(PROJECTS)
+#------------------------------------------------------------------------------
+
+libsword.lib: ..\sword\lib\bcppmake\libsword.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+icuuc.lib: ..\icu-sword\as_is\borland\icuuc.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+icuin.lib: ..\icu-sword\as_is\borland\icuin.bpr
+ $(ROOT)\bin\bpr2mak -t$(ROOT)\bin\deflib.bmk $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+sword.exe: sword.bpr
+ $(ROOT)\bin\bpr2mak $**
+ $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
+
+
Modified: branches/BCB5/RxRichEditX.cpp
===================================================================
--- branches/BCB5/RxRichEditX.cpp 2009-04-10 22:25:33 UTC (rev 497)
+++ branches/BCB5/RxRichEditX.cpp 2009-04-20 08:24:47 UTC (rev 498)
@@ -1088,8 +1088,16 @@
if ((ch != '/') && (ch != '\\')) {
imgPath.append('/');
}
+ SWBuf src = tag.getAttribute("src");
+ // this should always be true because this is done in
+ // render filters.
+ if (src.startsWith(imgPath))
+ imgPath = src;
+ else imgPath.append(src);
}
- imgPath.append(tag.getAttribute("src"));
+ else {
+ imgPath = tag.getAttribute("src");
+ }
insertImage(imgPath);
}
}
Modified: branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk
===================================================================
--- branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk 2009-04-10 22:25:33 UTC (rev 497)
+++ branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk 2009-04-20 08:24:47 UTC (rev 498)
@@ -28,21 +28,22 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="tlink32"/>
- <USERDEFINES value=""/>
+ <USERDEFINES value="_DEBUG"/>
<SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
<MAINSOURCE value="TntLibR.cpp"/>
- <INCLUDEPATH value="..\;..;$(BCB)\include;$(BCB)\include\vcl"/>
- <LIBPATH value="..\;..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib"/>
+ <INCLUDEPATH value="..;$(BCB)\include;$(BCB)\include\vcl"/>
+ <LIBPATH value="..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par"/>
</MACROS>
<OPTIONS>
<IDLCFLAGS value="-I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -4 -b- -k- -vi -c -tWM"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -4 -b- -k -y -v -vi-
+ -c -tWM"/>
+ <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
+ <AFLAGS value="/mx /w2 /zi"/>
<LFLAGS value="-D"Tnt Unicode VCL Components for BCB5 (Runtime)" -aa -Tpp -Gpr -x -Gn -Gl
- -Gi"/>
+ -Gi -v"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0pkg32.obj $(PACKAGES) Memmgr.Lib sysinit.obj $(OBJFILES)"/>
@@ -79,14 +80,14 @@
[HistoryLists\hlIncludePath]
Count=3
-Item0=..;$(BCB)\include;$(BCB)\include\vcl
-Item1=..\;..;$(BCB)\include;$(BCB)\include\vcl
+Item0=..\;..;$(BCB)\include;$(BCB)\include\vcl
+Item1=..;$(BCB)\include;$(BCB)\include\vcl
Item2=..\;$(BCB)\include;$(BCB)\include\vcl
[HistoryLists\hlLibraryPath]
Count=6
-Item0=..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\;..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item0=..\;..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..;..\..\..\lib\release;$(BCB)\lib\obj;$(BCB)\lib
Item2=..\;..\..\..\lib\release;..;$(BCB)\lib\obj;$(BCB)\lib
Item3=..;$(BCB)\lib\obj;$(BCB)\lib
Item4=..\;..;$(BCB)\lib\obj;$(BCB)\lib
Modified: branches/BCB5/apps/InstallMgr/InstallManager.bpr
===================================================================
--- branches/BCB5/apps/InstallMgr/InstallManager.bpr 2009-04-10 22:25:33 UTC (rev 497)
+++ branches/BCB5/apps/InstallMgr/InstallManager.bpr 2009-04-20 08:24:47 UTC (rev 498)
@@ -160,4 +160,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
+</PROJECT>
\ No newline at end of file
Modified: branches/BCB5/apps/InstallMgr/InstallManager.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/apps/InstallMgr/libcurl.bpr
===================================================================
--- branches/BCB5/apps/InstallMgr/libcurl.bpr 2009-04-10 22:25:33 UTC (rev 497)
+++ branches/BCB5/apps/InstallMgr/libcurl.bpr 2009-04-20 08:24:47 UTC (rev 498)
@@ -31,7 +31,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value=""/>
+ <USERDEFINES value="_DEBUG"/>
<SYSDEFINES value="_RTLDLL;NO_STRICT"/>
<MAINSOURCE value="libcurl.bpf"/>
<INCLUDEPATH value="curl\curlcpp;curl\lib;curl\include;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -42,9 +42,10 @@
<OPTIONS>
<IDLCFLAGS value="-Icurl\curlcpp -Icurl\lib -Icurl\include -I$(BCB)\include
-I$(BCB)\include\vcl -src_suffix cpp -boa"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <AFLAGS value="/mx /w2 /zn"/>
+ <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -r- -a8 -4 -b- -k -y -v -vi-
+ -c -tW -tWM"/>
+ <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zi"/>
<LFLAGS value="/P32"/>
</OPTIONS>
<LINKER>
Modified: branches/BCB5/clucene/clucene.bpr
===================================================================
--- branches/BCB5/clucene/clucene.bpr 2009-04-10 22:25:33 UTC (rev 497)
+++ branches/BCB5/clucene/clucene.bpr 2009-04-20 08:24:47 UTC (rev 498)
@@ -18,7 +18,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value="MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT"/>
+ <USERDEFINES value="MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT;_DEBUG"/>
<SYSDEFINES value="_RTLDLL;NO_STRICT"/>
<MAINSOURCE value="clucene.bpf"/>
<INCLUDEPATH value="src\CLucene;src;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -30,9 +30,9 @@
<IDLCFLAGS value="-Isrc\CLucene -Isrc -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp
-DMAX_PATH=256 -DUNICODE -D_WIN32 -D_CL_DISABLE_MULTITHREADING
-DLUCENE_ENABLE_REFCOUNT -boa"/>
- <CFLAG1 value="-O2 -Q -w- -Vx -VF -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
- <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
- <AFLAGS value="/mx /w2 /zn"/>
+ <CFLAG1 value="-Od -Q -w- -Vx -VF -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
+ <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zi"/>
<LFLAGS value="/P256"/>
</OPTIONS>
<LINKER>
@@ -96,8 +96,8 @@
[HistoryLists\hlConditionals]
Count=17
-Item0=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT
-Item1=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT;_DEBUG
+Item0=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT;_DEBUG
+Item1=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;LUCENE_ENABLE_REFCOUNT
Item2=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING
Item3=MAX_PATH=256;UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
Item4=UNICODE;_WIN32;_CL_DISABLE_MULTITHREADING
Modified: branches/BCB5/mainfrm.cpp
===================================================================
--- branches/BCB5/mainfrm.cpp 2009-04-10 22:25:33 UTC (rev 497)
+++ branches/BCB5/mainfrm.cpp 2009-04-20 08:24:47 UTC (rev 498)
@@ -1926,7 +1926,7 @@
}
tmpVerseList = TOP;
- *DefaultVSKey = tmpVerseList;
+ DefaultVSKey->positionFrom(tmpVerseList);
TextKeyChanged();
}
}
Modified: branches/BCB5/stage/layout.conf
===================================================================
--- branches/BCB5/stage/layout.conf 2009-04-10 22:25:33 UTC (rev 497)
+++ branches/BCB5/stage/layout.conf 2009-04-20 08:24:47 UTC (rev 498)
@@ -39,20 +39,20 @@
Wesley=
[History]
-LastComModule=NETnotesfree
+LastComModule=JFB
LastLDKey=DAVID
LastLDModule=ImageSampler
LastParaMod01=ESV
LastParaMod02=ASV
LastParaMod03=NETtext
-LastTextModule=PARALLEL
-LastVerse=James 1:1
+LastTextModule=NASB
+LastVerse=James 4:4
LookupSaveCount=5
+LookupText=James 4.4
LookupText=James 1:1
LookupText=James 3:1
LookupText=James 1:5
LookupText=James 1:4
-LookupText=James 1:2
SearchSaveCount=5
SearchText=the sword
SearchText=God love +world
@@ -192,13 +192,13 @@
la_en=
[ModuleOptions]
-Cross-references=Off
-Footnotes=Off
+Cross-references=On
+Footnotes=On
Headings=On
Hebrew Cantillation=Off
Hebrew Vowel Points=On
-Morphological Tags=Off
-Strong's Numbers=Off
+Morphological Tags=On
+Strong's Numbers=On
Textual Variants=Primary Reading
Transliteration=Off
Words of Christ in Red=On
Modified: branches/BCB5/sword.bpr
===================================================================
--- branches/BCB5/sword.bpr 2009-04-10 22:25:33 UTC (rev 497)
+++ branches/BCB5/sword.bpr 2009-04-20 08:24:47 UTC (rev 498)
@@ -46,7 +46,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="sword.cpp"/>
<INCLUDEPATH value="..\sword\src\modules\filters;TntUnicodeControls.attic;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib;TNGImage\Package"/>
@@ -60,11 +60,12 @@
-I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -ITNGImage\Package
-src_suffix cpp -D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0
-DUSELUCENE -D_CL_DISABLE_MULTITHREADING"/>
- <CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/>
+ <CFLAG1 value="-Od -H=$(BCB)\lib\vcl50.csm -Hc -Vx -X- -r- -a8 -4 -b- -k -y -v -vi- -c
+ -tW -tWM"/>
+ <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -v -M -JPHNE"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value="-Iobj -D"" -aa -Tpe -GD -s -Gn"/>
+ <AFLAGS value="/mx /w2 /zi"/>
+ <LFLAGS value="-Iobj -D"" -aa -Tpe -GD -s -Gn -v"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0w32.obj $(OBJFILES)"/>
@@ -78,7 +79,7 @@
MajorVer=1
MinorVer=5
Release=11
-Build=7
+Build=9
Debug=0
PreRelease=0
Special=0
@@ -90,7 +91,7 @@
[Version Info Keys]
CompanyName=CrossWire Bible Society
FileDescription=Windows User Interface to The SWORD Project
-FileVersion=1.5.11.7
+FileVersion=1.5.11.9
InternalName=biblecs
LegalCopyright=(c) 1990-2008 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
@@ -149,8 +150,8 @@
[HistoryLists\hlConditionals]
Count=16
-Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
-Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
+Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE
Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
Modified: branches/BCB5/sword.res
===================================================================
(Binary files differ)
More information about the sword-cvs
mailing list