[sword-svn] r2777 - in trunk: include lib/bcppmake src/frontend src/modules utilities/bcppmake
scribe at crosswire.org
scribe at crosswire.org
Fri Jan 25 11:04:31 MST 2013
Author: scribe
Date: 2013-01-25 11:04:31 -0700 (Fri, 25 Jan 2013)
New Revision: 2777
Modified:
trunk/include/defs.h
trunk/include/swdisp.h
trunk/include/swmodule.h
trunk/include/sysdata.h
trunk/lib/bcppmake/libsword.bpr
trunk/src/frontend/swdisp.cpp
trunk/src/modules/swmodule.cpp
trunk/utilities/bcppmake/addgb.bpr
trunk/utilities/bcppmake/addld.bpr
trunk/utilities/bcppmake/addvs.bpr
trunk/utilities/bcppmake/diatheke.bpr
trunk/utilities/bcppmake/tei2mod.bpr
trunk/utilities/bcppmake/treeidxutil.bpr
trunk/utilities/bcppmake/utilities.bpg
trunk/utilities/bcppmake/vs2osisreftxt.bpr
Log:
Updated to build without deprecated methods on cbuilder
Modified: trunk/include/defs.h
===================================================================
--- trunk/include/defs.h 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/include/defs.h 2013-01-25 18:04:31 UTC (rev 2777)
@@ -104,7 +104,9 @@
# define SWDLLEXPORT_CTORFN
# endif
-# define SWDEPRECATED
+#define COMMENT SLASH(/)
+#define SLASH(s) /##s
+# define SWDEPRECATED COMMENT
#elif defined(__GNUC__)
Modified: trunk/include/swdisp.h
===================================================================
--- trunk/include/swdisp.h 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/include/swdisp.h 2013-01-25 18:04:31 UTC (rev 2777)
@@ -46,7 +46,7 @@
* @param imodule module to display
* @return error status
*/
- virtual char display(SWModule &imodule);
+ virtual char display(SWModule &imodule) = 0;
SWDEPRECATED char Display(SWModule &imodule) { return display(imodule); }
};
Modified: trunk/include/swmodule.h
===================================================================
--- trunk/include/swmodule.h 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/include/swmodule.h 2013-01-25 18:04:31 UTC (rev 2777)
@@ -30,6 +30,9 @@
#include <swcacher.h>
#include <swsearchable.h>
+#ifndef _WIN32_WCE
+#include <iostream>
+#endif
#include <list>
@@ -86,6 +89,16 @@
class SWDLLEXPORT SWModule : public SWCacher, public SWSearchable {
+class StdOutDisplay : public SWDisplay {
+ char display(SWModule &imodule)
+ {
+ #ifndef _WIN32_WCE
+ std::cout << (const char *)imodule;
+ #endif
+ return 0;
+ }
+};
+
protected:
ConfigEntMap ownConfig;
@@ -112,7 +125,7 @@
/** this module's display object */
SWDisplay *disp;
- static SWDisplay rawdisp;
+ static StdOutDisplay rawdisp;
mutable SWBuf entryBuf;
/** filters to be executed to remove all markup (for searches) */
@@ -227,10 +240,7 @@
* @param ikeytext Value which to set keytext; [0]-only get
* @return pointer to keytext
*/
- SWDEPRECATED const char *KeyText(const char *ikeytext = 0) {
- if (ikeytext) setKey(ikeytext);
- return *getKey();
- }
+ SWDEPRECATED const char *KeyText(const char *ikeytext = 0) { if (ikeytext) setKey(ikeytext); return *getKey(); }
/**
* gets the key text for the module.
@@ -271,11 +281,7 @@
/**
* @deprecated Use get/setDisplay() instead.
*/
- SWDEPRECATED SWDisplay *Disp(SWDisplay * idisp = 0) {
- if (idisp)
- setDisplay(idisp);
- return getDisplay();
- }
+ SWDEPRECATED SWDisplay *Disp(SWDisplay * idisp = 0) { if (idisp) setDisplay(idisp); return getDisplay(); }
/** Gets module name
*
@@ -380,13 +386,7 @@
void *percentUserData = 0);
// for backward compat-- deprecated
- SWDEPRECATED ListKey &Search(const char *istr, int searchType = 0, int flags = 0,
- SWKey * scope = 0,
- bool * justCheckIfSupported = 0,
- void (*percent) (char, void *) = &nullPercent,
- void *percentUserData = 0) {
- return search(istr, searchType, flags, scope, justCheckIfSupported, percent, percentUserData);
- }
+ SWDEPRECATED ListKey &Search(const char *istr, int searchType = 0, int flags = 0, SWKey * scope = 0, bool * justCheckIfSupported = 0, void (*percent) (char, void *) = &nullPercent, void *percentUserData = 0) { return search(istr, searchType, flags, scope, justCheckIfSupported, percent, percentUserData); }
/** Allocates a key of specific type for module
@@ -473,9 +473,7 @@
renderFilters->push_back(newFilter);
return *this;
}
- SWDEPRECATED SWModule &AddRenderFilter(SWFilter *newFilter) {
- return addRenderFilter(newFilter);
- }
+ SWDEPRECATED SWModule &AddRenderFilter(SWFilter *newFilter) { return addRenderFilter(newFilter); }
/** Retrieves a container of render filters associated with this
* module.
@@ -493,9 +491,7 @@
renderFilters->remove(oldFilter);
return *this;
}
- SWDEPRECATED SWModule &RemoveRenderFilter(SWFilter *oldFilter) {
- return removeRenderFilter(oldFilter);
- }
+ SWDEPRECATED SWModule &RemoveRenderFilter(SWFilter *oldFilter) { return removeRenderFilter(oldFilter); }
/** Replaces a RenderFilter in this module's renderfilters queue
* @param oldfilter the filter to remove
@@ -510,9 +506,7 @@
}
return *this;
}
- SWDEPRECATED SWModule &ReplaceRenderFilter(SWFilter *oldFilter, SWFilter *newFilter) {
- return replaceRenderFilter(oldFilter, newFilter);
- }
+ SWDEPRECATED SWModule &ReplaceRenderFilter(SWFilter *oldFilter, SWFilter *newFilter) { return replaceRenderFilter(oldFilter, newFilter); }
/** RenderFilter run a buf through this module's Render Filters
* @param buf the buffer to filter
@@ -533,9 +527,7 @@
encodingFilters->push_back(newFilter);
return *this;
}
- SWDEPRECATED SWModule &AddEncodingFilter(SWFilter *newFilter) {
- return addEncodingFilter(newFilter);
- }
+ SWDEPRECATED SWModule &AddEncodingFilter(SWFilter *newFilter) { return addEncodingFilter(newFilter); }
/** Removes an EncodingFilter from this module's encodingFilters queue
* @param oldfilter the filter to remove
@@ -545,9 +537,7 @@
encodingFilters->remove(oldFilter);
return *this;
}
- SWDEPRECATED SWModule &RemoveEncodingFilter(SWFilter *oldFilter) {
- return removeEncodingFilter(oldFilter);
- }
+ SWDEPRECATED SWModule &RemoveEncodingFilter(SWFilter *oldFilter) { return removeEncodingFilter(oldFilter); }
/** Replaces an EncodingFilter in this module's encodingfilters queue
* @param oldfilter the filter to remove
@@ -562,9 +552,7 @@
}
return *this;
}
- SWDEPRECATED SWModule &ReplaceEncodingFilter(SWFilter *oldFilter, SWFilter *newFilter) {
- return replaceEncodingFilter(oldFilter, newFilter);
- }
+ SWDEPRECATED SWModule &ReplaceEncodingFilter(SWFilter *oldFilter, SWFilter *newFilter) { return replaceEncodingFilter(oldFilter, newFilter); }
/** encodingFilter run a buf through this module's Encoding Filters
* @param buf the buffer to filter
@@ -584,9 +572,7 @@
stripFilters->push_back(newFilter);
return *this;
}
- SWDEPRECATED SWModule &AddStripFilter(SWFilter *newFilter) {
- return addStripFilter(newFilter);
- }
+ SWDEPRECATED SWModule &AddStripFilter(SWFilter *newFilter) { return addStripFilter(newFilter); }
/** Adds a RawFilter to this module's rawFilters queue
* @param newFilter the filter to add
@@ -596,9 +582,7 @@
rawFilters->push_back(newfilter);
return *this;
}
- SWDEPRECATED SWModule &AddRawFilter(SWFilter *newFilter) {
- return addRawFilter(newFilter);
- }
+ SWDEPRECATED SWModule &AddRawFilter(SWFilter *newFilter) { return addRawFilter(newFilter); }
/** StripFilter run a buf through this module's Strip Filters
* @param buf the buffer to filter
@@ -628,9 +612,7 @@
optionFilters->push_back(newFilter);
return *this;
}
- SWDEPRECATED SWModule &AddOptionFilter(SWOptionFilter *newFilter) {
- return addOptionFilter(newFilter);
- }
+ SWDEPRECATED SWModule &AddOptionFilter(SWOptionFilter *newFilter) { return addOptionFilter(newFilter); }
/** OptionFilter a text buffer
* @param buf the buffer to filter
Modified: trunk/include/sysdata.h
===================================================================
--- trunk/include/sysdata.h 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/include/sysdata.h 2013-01-25 18:04:31 UTC (rev 2777)
@@ -21,6 +21,9 @@
#ifdef __GNUC__
__extension__ typedef __signed__ long long __s64;
__extension__ typedef unsigned long long __u64;
+#elif defined(__BORLANDC__)
+typedef signed __int64 __s64;
+typedef unsigned __int64 __u64;
#else
typedef signed long long __s64;
typedef unsigned long long __u64;
Modified: trunk/lib/bcppmake/libsword.bpr
===================================================================
--- trunk/lib/bcppmake/libsword.bpr 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/lib/bcppmake/libsword.bpr 2013-01-25 18:04:31 UTC (rev 2777)
@@ -306,4 +306,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
+</PROJECT>
\ No newline at end of file
Modified: trunk/src/frontend/swdisp.cpp
===================================================================
--- trunk/src/frontend/swdisp.cpp 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/src/frontend/swdisp.cpp 2013-01-25 18:04:31 UTC (rev 2777)
@@ -19,9 +19,6 @@
*/
-#ifndef _WIN32_WCE
-#include <iostream>
-#endif
#include <swmodule.h>
#include <swdisp.h>
@@ -40,12 +37,5 @@
* RET: error status
*/
-char SWDisplay::display(SWModule &imodule)
-{
-#ifndef _WIN32_WCE
- std::cout << (const char *)imodule;
-#endif
- return 0;
-}
SWORD_NAMESPACE_END
Modified: trunk/src/modules/swmodule.cpp
===================================================================
--- trunk/src/modules/swmodule.cpp 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/src/modules/swmodule.cpp 2013-01-25 18:04:31 UTC (rev 2777)
@@ -60,7 +60,7 @@
SWORD_NAMESPACE_START
-SWDisplay SWModule::rawdisp;
+SWModule::StdOutDisplay SWModule::rawdisp;
typedef std::list<SWBuf> StringList;
Modified: trunk/utilities/bcppmake/addgb.bpr
===================================================================
--- trunk/utilities/bcppmake/addgb.bpr 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/utilities/bcppmake/addgb.bpr 2013-01-25 18:04:31 UTC (rev 2777)
@@ -123,4 +123,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
+</PROJECT>
\ No newline at end of file
Modified: trunk/utilities/bcppmake/addld.bpr
===================================================================
--- trunk/utilities/bcppmake/addld.bpr 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/utilities/bcppmake/addld.bpr 2013-01-25 18:04:31 UTC (rev 2777)
@@ -123,4 +123,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
+</PROJECT>
\ No newline at end of file
Modified: trunk/utilities/bcppmake/addvs.bpr
===================================================================
--- trunk/utilities/bcppmake/addvs.bpr 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/utilities/bcppmake/addvs.bpr 2013-01-25 18:04:31 UTC (rev 2777)
@@ -123,4 +123,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
+</PROJECT>
\ No newline at end of file
Modified: trunk/utilities/bcppmake/diatheke.bpr
===================================================================
--- trunk/utilities/bcppmake/diatheke.bpr 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/utilities/bcppmake/diatheke.bpr 2013-01-25 18:04:31 UTC (rev 2777)
@@ -32,7 +32,7 @@
<USERDEFINES value=""/>
<SYSDEFINES value="NO_STRICT;_NO_VCL;_RTLDLL;USEPACKAGES"/>
<MAINSOURCE value="diatheke.bpf"/>
- <INCLUDEPATH value="..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include"/>
+ <INCLUDEPATH value="..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\include\internal\regex"/>
<LIBPATH value="..\diatheke;..\..\lib;$(BCB)\lib\obj;$(BCB)\lib"/>
<WARNINGS value="-w-par"/>
</MACROS>
@@ -79,10 +79,11 @@
Comments=
[HistoryLists\hlIncludePath]
-Count=3
-Item0=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include
-Item1=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include\
-Item2=..\diatheke;$(BCB)\include;$(BCB)\include\vcl
+Count=4
+Item0=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include;..\..\include\internal\regex
+Item1=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include
+Item2=..\diatheke;$(BCB)\include;$(BCB)\include\vcl;..\..\include\
+Item3=..\diatheke;$(BCB)\include;$(BCB)\include\vcl
[HistoryLists\hlLibraryPath]
Count=2
Modified: trunk/utilities/bcppmake/tei2mod.bpr
===================================================================
--- trunk/utilities/bcppmake/tei2mod.bpr 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/utilities/bcppmake/tei2mod.bpr 2013-01-25 18:04:31 UTC (rev 2777)
@@ -120,4 +120,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
+</PROJECT>
\ No newline at end of file
Modified: trunk/utilities/bcppmake/treeidxutil.bpr
===================================================================
--- trunk/utilities/bcppmake/treeidxutil.bpr 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/utilities/bcppmake/treeidxutil.bpr 2013-01-25 18:04:31 UTC (rev 2777)
@@ -119,4 +119,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
+</PROJECT>
\ No newline at end of file
Modified: trunk/utilities/bcppmake/utilities.bpg
===================================================================
--- trunk/utilities/bcppmake/utilities.bpg 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/utilities/bcppmake/utilities.bpg 2013-01-25 18:04:31 UTC (rev 2777)
@@ -13,8 +13,7 @@
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 vs2osisreftxt.exe xml2gbs.exe diatheke.exe \
- installmgr.exe tei2mod.exe emptyvss.exe addgb.exe addld.exe addvs.exe \
- treeidxutil.exe
+ installmgr.exe tei2mod.exe addgb.exe addld.exe addvs.exe treeidxutil.exe
#------------------------------------------------------------------------------
default: $(PROJECTS)
#------------------------------------------------------------------------------
@@ -123,10 +122,6 @@
$(ROOT)\bin\bpr2mak $**
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-emptyvss.exe: emptyvss.bpr
- $(ROOT)\bin\bpr2mak $**
- $(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
-
vs2osisreftxt.exe: vs2osisreftxt.bpr
$(ROOT)\bin\bpr2mak $**
$(ROOT)\bin\make -$(MAKEFLAGS) -f$*.mak
Modified: trunk/utilities/bcppmake/vs2osisreftxt.bpr
===================================================================
--- trunk/utilities/bcppmake/vs2osisreftxt.bpr 2013-01-25 15:15:25 UTC (rev 2776)
+++ trunk/utilities/bcppmake/vs2osisreftxt.bpr 2013-01-25 18:04:31 UTC (rev 2777)
@@ -119,4 +119,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
+</PROJECT>
\ No newline at end of file
More information about the sword-cvs
mailing list