[sword-svn] r3823 - in trunk: include lib/bcppmake

scribe at crosswire.org scribe at crosswire.org
Tue Nov 3 18:20:40 EST 2020 

Author: scribe
Date: 2020-11-03 18:20:40 -0500 (Tue, 03 Nov 2020)
New Revision: 3823

Modified:
   trunk/include/defs.h
   trunk/lib/bcppmake/libsword.bpr
Log:
Rearrange STRIPLOG defines to allow for adjustment for compilers which don't support __VA_ARGS__ in macros.

Modified: trunk/include/defs.h
===================================================================
--- trunk/include/defs.h	2020-11-03 18:54:47 UTC (rev 3822)
+++ trunk/include/defs.h	2020-11-03 23:20:40 UTC (rev 3823)
@@ -42,20 +42,7 @@
 
 SWORD_NAMESPACE_START
 
-#ifndef STRIPLOGD
-#define SWLOGD(...) SWLog::getSystemLog()->logDebug(__VA_ARGS__)
-#else
-#define SWLOGD(...) (void)0
-#endif
 
-#ifndef STRIPLOGI
-#define SWLOGI(...) SWLog::getSystemLog()->logInformation(__VA_ARGS__)
-#define SWLOGTI(...) SWLog::getSystemLog()->logTimedInformation(__VA_ARGS__)
-#else
-#define SWLOGI(...) (void)0
-#define SWLOGTI(...) (void)0 
-#endif
-
 // support for compilers with no RTTI
 #define SWDYNAMIC_CAST(className, object) dynamic_cast<className *>(object)
 
@@ -122,7 +109,7 @@
 #    define SWDLLEXPORT_CTORFN
 #  endif
 
-#  define SWDEPRECATED 
+#  define SWDEPRECATED
 
 
 #elif defined(__GNUWIN32__)
@@ -145,6 +132,7 @@
 
 
 #elif defined(__BORLANDC__)
+#define NOVARMACS
 #  ifdef SWMAKINGDLL
 #    define SWDLLEXPORT _export
 #    define SWDLLEXPORT_DATA(type) __declspec( dllexport ) type
@@ -159,6 +147,7 @@
 #    define SWDLLEXPORT_CTORFN
 #  endif
 
+
 #define COMMENT SLASH(/)
 #define SLASH(s) /##s
 /* Use the following line to comment out all deprecation declarations so you
@@ -193,5 +182,36 @@
 #  define SWDLLIMPORT
 #endif
 
+#ifndef NOVARMACS
+#ifndef STRIPLOGD
+#define SWLOGD(...) SWLog::getSystemLog()->logDebug(__VA_ARGS__)
+#else
+#define SWLOGD(...) (void)0
+#endif
+
+#ifndef STRIPLOGI
+#define SWLOGI(...) SWLog::getSystemLog()->logInformation(__VA_ARGS__)
+#define SWLOGTI(...) SWLog::getSystemLog()->logTimedInformation(__VA_ARGS__)
+#else
+#define SWLOGI(...) (void)0
+#define SWLOGTI(...) (void)0
+#endif
+#else
+#ifndef STRIPLOGD
+#define SWLOGD SWLog::getSystemLog()->logDebug
+#else
+#define SWLOGD COMMENT
+#endif
+
+#ifndef STRIPLOGI
+#define SWLOGI SWLog::getSystemLog()->logInformation
+#define SWLOGTI SWLog::getSystemLog()->logTimedInformation
+#else
+#define SWLOGI COMMENT
+#define SWLOGTI COMMENT
+#endif
+#endif
+
+
 SWORD_NAMESPACE_END
 #endif //SWORDDEFS_H

Modified: trunk/lib/bcppmake/libsword.bpr
===================================================================
--- trunk/lib/bcppmake/libsword.bpr	2020-11-03 18:54:47 UTC (rev 3822)
+++ trunk/lib/bcppmake/libsword.bpr	2020-11-03 23:20:40 UTC (rev 3823)
@@ -146,7 +146,7 @@
     <PATHRC value=".;"/>
     <PATHASM value=".;"/>
     <LINKER value="TLib"/>
-    <USERDEFINES value="UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;OLDCURL"/>
+    <USERDEFINES value="UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;OLDCURL;STRIPLOGD;STRIPLOGI"/>
     <SYSDEFINES value="NO_STRICT"/>
     <MAINSOURCE value="libsword.bpf"/>
     <INCLUDEPATH value="..\..\src\modules\comments\zcom4;..\..\src\modules\texts\ztext4;..\..\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;..\..\include\internal\regex;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include"/>
@@ -254,35 +254,36 @@
 Item0=$(BCB)\source\vcl
 
 [HistoryLists\hlConditionals]
-Count=28
-Item0=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;OLDCURL
-Item1=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2
-Item2=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;_DEBUG
-Item3=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT
-Item4=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;_DEBUG
-Item5=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE
-Item6=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item7=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
-Item8=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item9=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE
-Item10=_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item11=_ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item12=__ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item13=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
-Item14=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
-Item15=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
-Item16=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
-Item17=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
-Item18=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
-Item19=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
-Item20=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
-Item21=_ICU_;_ICUSWORD_;USBINARY
-Item22=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG
-Item23=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE
-Item24=;USBINARY;_DEBUG
-Item25=_ICU_;_ICUSWORD_
-Item26=_ICU_;_ICUSWORD_;_DEBUG
-Item27=_DEBUG
+Count=29
+Item0=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;OLDCURL;STRIPLOGD;STRIPLOGI
+Item1=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;OLDCURL
+Item2=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2
+Item3=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;_DEBUG
+Item4=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT
+Item5=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;_DEBUG
+Item6=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE
+Item7=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item8=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
+Item9=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item10=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE
+Item11=_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item12=_ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item13=__ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item14=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
+Item15=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
+Item16=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
+Item17=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
+Item18=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
+Item19=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
+Item20=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
+Item21=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item22=_ICU_;_ICUSWORD_;USBINARY
+Item23=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG
+Item24=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE
+Item25=;USBINARY;_DEBUG
+Item26=_ICU_;_ICUSWORD_
+Item27=_ICU_;_ICUSWORD_;_DEBUG
+Item28=_DEBUG
 
 [HistoryLists\hlFinalOutputDir]
 Count=3

More information about the sword-cvs mailing list