This is an automated email from the ASF dual-hosted git repository. swebb2066 pushed a commit to branch remove_cfstring_support in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit a5c66ced7bc6db2cd9ff532ac40579cd1ab3ba45 Author: Stephen Webb <[email protected]> AuthorDate: Thu Jul 27 18:00:07 2023 +1000 Remove (never used) CFString support --- CMakeLists.txt | 3 --- src/main/include/CMakeLists.txt | 6 +----- src/main/include/log4cxx/log4cxx.h.in | 2 +- src/site/markdown/development/build-cmake.md | 1 - src/site/markdown/faq.md | 2 +- 5 files changed, 3 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fce97b3..ac04a8eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -300,9 +300,6 @@ message(STATUS " log4cxx unichar API ............. : ${LOG4CXX_UNICHAR}") else() message(STATUS " std::basic_string<UniChar> ok? .. : FALSE") endif() -if(APPLE) -message(STATUS " log4cxx cfstring API ............ : ${LOG4CXX_CFSTRING}") -endif() message(STATUS " log4cxx char type ............... : ${LOG4CXX_CHAR}") message(STATUS " character encoding .............. : ${LOG4CXX_CHARSET}") message(STATUS " Networking support .............. : ${LOG4CXX_NETWORKING_SUPPORT}") diff --git a/src/main/include/CMakeLists.txt b/src/main/include/CMakeLists.txt index 675de038..b1b43784 100644 --- a/src/main/include/CMakeLists.txt +++ b/src/main/include/CMakeLists.txt @@ -53,12 +53,8 @@ endif() option(LOG4CXX_WCHAR_T "Enable wchar_t API methods" ON) option(LOG4CXX_UNICHAR "Enable UniChar API methods" OFF) set(INIT_IOS_BASE 0) -if(APPLE) -option(LOG4CXX_CFSTRING "Enable CFString API methods, requires Mac OS/X CoreFoundation" OFF) -set(INIT_IOS_BASE 1) -endif() set(CHAR_API 1) -foreach(varName WCHAR_T UNICHAR CFSTRING ) +foreach(varName WCHAR_T UNICHAR ) if(${LOG4CXX_${varName}}) set("${varName}_API" 1) else() diff --git a/src/main/include/log4cxx/log4cxx.h.in b/src/main/include/log4cxx/log4cxx.h.in index e90739dc..b85ed11f 100644 --- a/src/main/include/log4cxx/log4cxx.h.in +++ b/src/main/include/log4cxx/log4cxx.h.in @@ -47,7 +47,7 @@ #define LOG4CXX_CHAR_API @CHAR_API@ #define LOG4CXX_WCHAR_T_API @WCHAR_T_API@ #define LOG4CXX_UNICHAR_API @UNICHAR_API@ -#define LOG4CXX_CFSTRING_API @CFSTRING_API@ +#define LOG4CXX_CFSTRING_API 0 #define LOG4CXX_HAS_NETWORKING @NETWORKING_SUPPORT@ #define LOG4CXX_HAS_MULTIPROCESS_ROLLING_FILE_APPENDER @MULTIPROCESS_RFA@ diff --git a/src/site/markdown/development/build-cmake.md b/src/site/markdown/development/build-cmake.md index 242430b9..c6acc3e7 100644 --- a/src/site/markdown/development/build-cmake.md +++ b/src/site/markdown/development/build-cmake.md @@ -64,7 +64,6 @@ $ cmake --build buildtrees/Log4cxx --target install --config Release |------------------------|-------| | -DLOG4CXX_WCHAR_T=no | Enable wchar_t API methods, choice of yes (default), no. | | -DLOG4CXX_UNICHAR=yes | Enable UniChar API methods, choice of yes, no (default). | -| -DLOG4CXX_CFSTRING=yes | Enable CFString API methods, requires Mac OS/X CoreFoundation, choice of yes, no (default). | | -DBUILD_TESTING=off | Do not build tests. Tests are built by default | | -DBUILD_SHARED_LIBS=off| Build Log4cxx as a static library. A dynamically linked Log4cxx library is built by default. Any compilation unit that includes a Log4cxx header must define LOG4CXX_STATIC. | | -DAPU_STATIC=yes | Link to the APR-Util static library. By default, the Log4cxx shared library is linked to the APR-Util shared library. If BUILD_SHARED_LIBS=off, the static APR-Util library is used. | diff --git a/src/site/markdown/faq.md b/src/site/markdown/faq.md index b23ce38a..0cfd53a7 100644 --- a/src/site/markdown/faq.md +++ b/src/site/markdown/faq.md @@ -45,7 +45,7 @@ DLL" with release builds of Log4cxx and "Multithread DLL Debug" with debug build ## Does Apache Log4cxx support Unicode?{#unicode_supported} Yes. Apache Log4cxx exposes API methods in multiple string flavors supporting differently encoded -textual content, like `char*`, `std::string`, `wchar_t*`, `std::wstring`, `CFStringRef` et al. All +textual content, like `char*`, `std::string`, `wchar_t*`, `std::wstring` et al. All provided texts will be converted to the `LogString` type before further processing, which is one of several supported Unicode representations selected by the `LOG4CXX_CHAR` cmake option. If methods are used that take `LogString` as arguments, the macro `LOG4CXX_STR()` can be used to convert literals
