diff options
Diffstat (limited to 'external/meta-sdl/recipes-devtools/log4cxx')
5 files changed, 0 insertions, 682 deletions
diff --git a/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/0001-LOGCXX-413-doesn-t-compile-on-openembedded-thanks-to.patch b/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/0001-LOGCXX-413-doesn-t-compile-on-openembedded-thanks-to.patch deleted file mode 100644 index 38acb604..00000000 --- a/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/0001-LOGCXX-413-doesn-t-compile-on-openembedded-thanks-to.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 4120267758d6fd7cc11560773b02fe53a3b211a0 Mon Sep 17 00:00:00 2001 -From: Christian Grobmeier <grobmeier@apache.org> -Date: Wed, 7 Aug 2013 05:24:54 +0000 -Subject: [PATCH] LOGCXX-413: doesn't compile on openembedded, thanks to Alex - Zbarcea - -git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@1511175 13f79535-47bb-0310-9956-ffa450edef68 -(cherry picked from commit 3faaf9a4e4a00e70fc973a3afd8997bf96859682) - -Conflicts: - src/changes/changes.xml ---- - src/changes/changes.xml | 1 + - src/main/include/log4cxx/Makefile.am | 2 +- - src/main/include/log4cxx/private/Makefile.am | 6 +----- - 3 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/src/changes/changes.xml b/src/changes/changes.xml -index 7faa62b..8a133b5 100644 ---- a/src/changes/changes.xml -+++ b/src/changes/changes.xml -@@ -227,6 +227,7 @@ - <action issue="LOGCXX-257">ServerSocket::accept hangs on Unix</action> - <action issue="LOGCXX-258">unable to build from make dist package due to missing doxygen file</action> - <action issue="LOGCXX-259">Several appenders fail to compile in Visual Studio 2008</action> -+<action issue="LOGCXX-413">log4cxx doesn't compile on openembedded (due to Alex Zbarcea)</action> - </release> - <release version="0.9.7" date="2004-05-10"> - <action type="fix">Fixed examples source code in the "Short introduction to log4cxx".</action> -diff --git a/src/main/include/log4cxx/Makefile.am b/src/main/include/log4cxx/Makefile.am -index 719c2dd..53e99b0 100644 ---- a/src/main/include/log4cxx/Makefile.am -+++ b/src/main/include/log4cxx/Makefile.am -@@ -15,7 +15,7 @@ - # - SUBDIRS = helpers net nt rolling spi varia xml config db private pattern filter - log4cxxincdir = $(includedir)/log4cxx --log4cxxinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/*.h log4cxx.h -+log4cxxinc_HEADERS= $(top_srcdir)/src/main/include/log4cxx/*.h - DISTCLEANFILES = log4cxx.h - EXTRA_DIST = log4cxx.hw - -diff --git a/src/main/include/log4cxx/private/Makefile.am b/src/main/include/log4cxx/private/Makefile.am -index 3a896ea..8fb5448 100644 ---- a/src/main/include/log4cxx/private/Makefile.am -+++ b/src/main/include/log4cxx/private/Makefile.am -@@ -14,10 +14,6 @@ - # limitations under the License. - # - privateincdir = $(includedir)/log4cxx/private --privateinc_HEADERS= $(top_builddir)/src/main/include/log4cxx/private/*.h log4cxx_private.h --DISTCLEANFILES = log4cxx_private.h -+privateinc_HEADERS = log4cxx_private.h - EXTRA_DIST = log4cxx_private.hw - --dist-hook: -- -rm -f $(distdir)/log4cxx_private.h -- --- -1.9.1 - diff --git a/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/0002-LOGCXX-414-possibly-wrong-use-of-autotools-docdir-th.patch b/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/0002-LOGCXX-414-possibly-wrong-use-of-autotools-docdir-th.patch deleted file mode 100644 index 2c7a7090..00000000 --- a/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/0002-LOGCXX-414-possibly-wrong-use-of-autotools-docdir-th.patch +++ /dev/null @@ -1,53 +0,0 @@ -From f50ec1be4210877925d6a7105f5a258e2f732616 Mon Sep 17 00:00:00 2001 -From: Christian Grobmeier <grobmeier@apache.org> -Date: Wed, 7 Aug 2013 05:27:14 +0000 -Subject: [PATCH 2/2] LOGCXX-414: possibly wrong use of autotools docdir, - thanks to Alex Zbarcea - -git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@1511176 13f79535-47bb-0310-9956-ffa450edef68 -(cherry picked from commit 34e2b302a5be1a106d7d565da0944c53aad4fd21) - -Conflicts: - src/changes/changes.xml ---- - src/changes/changes.xml | 1 + - src/site/doxy/Makefile.am | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/changes/changes.xml b/src/changes/changes.xml -index 8a133b5..c1e167b 100644 ---- a/src/changes/changes.xml -+++ b/src/changes/changes.xml -@@ -228,6 +228,7 @@ - <action issue="LOGCXX-258">unable to build from make dist package due to missing doxygen file</action> - <action issue="LOGCXX-259">Several appenders fail to compile in Visual Studio 2008</action> - <action issue="LOGCXX-413">log4cxx doesn't compile on openembedded (due to Alex Zbarcea)</action> -+<action issue="LOGCXX-414">possibly wrong use of autotools docdir (due to Alex Zbarcea)</action> - </release> - <release version="0.9.7" date="2004-05-10"> - <action type="fix">Fixed examples source code in the "Short introduction to log4cxx".</action> -diff --git a/src/site/doxy/Makefile.am b/src/site/doxy/Makefile.am -index 0c7293d..963c6fb 100644 ---- a/src/site/doxy/Makefile.am -+++ b/src/site/doxy/Makefile.am -@@ -20,7 +20,7 @@ EXTRA_DIST = Doxyfile mainpage.dox license_notice_footer.txt - - if DOC - --htmldest = $(pkgdatadir)/html -+htmldest = $(docdir)/html - - install-data-hook: - $(mkinstalldirs) $(DESTDIR)$(htmldest) -@@ -40,7 +40,7 @@ pdf: @PACKAGE@.pdf - $(MAKE) -C ./latex pdf - ln -s ./latex/refman.ps @PACKAGE@.ps - ln -s ./latex/refman.pdf @PACKAGE@.pdf -- -+ - endif - - else --- -1.9.1 - diff --git a/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/0003-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch b/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/0003-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch deleted file mode 100644 index ef13dd88..00000000 --- a/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/0003-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 5b75dfa78b2c5e95296cee0201bc045ef7264ed0 Mon Sep 17 00:00:00 2001 -From: Christian Grobmeier <grobmeier@apache.org> -Date: Tue, 27 Nov 2012 09:39:18 +0000 -Subject: [PATCH] Applied patch for LOGCXX-400 LOGCXX-404 LOGCXX-402 LOGCXX-403 - LOGCXX-401 thanks to Andrew Lazarus - -git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@1414037 13f79535-47bb-0310-9956-ffa450edef68 ---- - pom.xml | 2 ++ - src/main/cpp/locationinfo.cpp | 4 ++-- - src/main/cpp/loggingevent.cpp | 2 +- - src/main/cpp/ndc.cpp | 4 ++-- - src/main/cpp/objectoutputstream.cpp | 4 ++-- - src/main/cpp/transcoder.cpp | 2 +- - src/main/include/log4cxx/helpers/object.h | 6 +++--- - src/main/include/log4cxx/helpers/simpledateformat.h | 4 +++- - src/main/include/log4cxx/logstring.h | 2 +- - 9 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 3504c8a3..255907bd 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -55,6 +55,7 @@ - </organization> - <build> - <plugins> -+ <!-- - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> -@@ -166,6 +167,7 @@ - </dependency> - </dependencies> - </plugin> -+ --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> -diff --git a/src/main/cpp/locationinfo.cpp b/src/main/cpp/locationinfo.cpp -index e76ea29c..1daa3a5f 100644 ---- a/src/main/cpp/locationinfo.cpp -+++ b/src/main/cpp/locationinfo.cpp -@@ -153,8 +153,8 @@ void LocationInfo::write(ObjectOutputStream& os, Pool& p) const { - 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C, - 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, - 0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, -- 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB, -- 0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01, -+ 0x6E, 0x49, 0x6E, 0x66, 0x6F, static_cast<char>(0xED), static_cast<char>(0x99), static_cast<char>(0xBB), -+ static_cast<char>(0xE1), 0x4A, static_cast<char>(0x91), static_cast<char>(0xA5), 0x7C, 0x02, 0x00, 0x01, - 0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, - 0x6E, 0x66, 0x6F, - 0x74, 0x00, 0x12, 0x4C, 0x6A, -diff --git a/src/main/cpp/loggingevent.cpp b/src/main/cpp/loggingevent.cpp -index 1c0d4be7..edbf40b6 100644 ---- a/src/main/cpp/loggingevent.cpp -+++ b/src/main/cpp/loggingevent.cpp -@@ -242,7 +242,7 @@ void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) { - 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A, - 0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67, - 0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E, -- 0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5, -+ 0x74, static_cast<char>(0xF3), static_cast<char>(0xF2), static_cast<char>(0xB9), 0x23, 0x74, 0x0B, static_cast<char>(0xB5), - 0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D, - 0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F, - 0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, -diff --git a/src/main/cpp/ndc.cpp b/src/main/cpp/ndc.cpp -index 4ab612dd..89788c16 100644 ---- a/src/main/cpp/ndc.cpp -+++ b/src/main/cpp/ndc.cpp -@@ -309,7 +309,7 @@ bool NDC::pop(CFStringRef& dst) - Stack& stack = data->getStack(); - if(!stack.empty()) - { -- dst = Transcoder::encode(stack.top().message); -+ dst = Transcoder::encode(getMessage(stack.top())); - stack.pop(); - data->recycle(); - return true; -@@ -326,7 +326,7 @@ bool NDC::peek(CFStringRef& dst) - Stack& stack = data->getStack(); - if(!stack.empty()) - { -- dst = Transcoder::encode(stack.top().message); -+ dst = Transcoder::encode(getMessage(stack.top())); - return true; - } - data->recycle(); -diff --git a/src/main/cpp/objectoutputstream.cpp b/src/main/cpp/objectoutputstream.cpp -index 7cd696b8..9567a856 100644 ---- a/src/main/cpp/objectoutputstream.cpp -+++ b/src/main/cpp/objectoutputstream.cpp -@@ -36,7 +36,7 @@ ObjectOutputStream::ObjectOutputStream(OutputStreamPtr outputStream, Pool& p) - objectHandle(0x7E0000), - classDescriptions(new ClassDescriptionMap()) - { -- char start[] = { 0xAC, 0xED, 0x00, 0x05 }; -+ char start[] = { static_cast<char>(0xAC), static_cast<char>(0xED), 0x00, 0x05 }; - ByteBuffer buf(start, sizeof(start)); - os->write(buf, p); - } -@@ -85,7 +85,7 @@ void ObjectOutputStream::writeObject(const MDC::Map& val, Pool& p) { - 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, - 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, - 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, -- 0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03, -+ static_cast<char>(0xBB), 0x0F, 0x25, 0x21, 0x4A, static_cast<char>(0xE4), static_cast<char>(0xB8), 0x03, - 0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, - 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, - 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, -diff --git a/src/main/cpp/transcoder.cpp b/src/main/cpp/transcoder.cpp -index d572ffce..32bed844 100644 ---- a/src/main/cpp/transcoder.cpp -+++ b/src/main/cpp/transcoder.cpp -@@ -356,7 +356,7 @@ static void encodeUTF16(unsigned int sv, String& dst) { - unsigned char u = (unsigned char) (sv >> 16); - unsigned char w = (unsigned char) (u - 1); - unsigned short hs = (0xD800 + ((w & 0xF) << 6) + ((sv & 0xFFFF) >> 10)); -- unsigned short ls = (0xDC00 + (sv && 0x3FF)); -+ unsigned short ls = (0xDC00 + (sv & 0x3FF)); - dst.append(1, hs); - dst.append(1, ls); - } -diff --git a/src/main/include/log4cxx/helpers/object.h b/src/main/include/log4cxx/helpers/object.h -index 92d44c55..b9386c47 100644 ---- a/src/main/include/log4cxx/helpers/object.h -+++ b/src/main/include/log4cxx/helpers/object.h -@@ -61,8 +61,8 @@ static const helpers::Class& getStaticClass();\ - static const log4cxx::helpers::ClassRegistration& registerClass(); - - #define IMPLEMENT_LOG4CXX_OBJECT(object)\ --const log4cxx::helpers::Class& object::getClass() const { return getStaticClass(); }\ --const log4cxx::helpers::Class& object::getStaticClass() { \ -+const ::log4cxx::helpers::Class& object::getClass() const { return getStaticClass(); }\ -+const ::log4cxx::helpers::Class& object::getStaticClass() { \ - static Clazz##object theClass; \ - return theClass; \ - } \ -@@ -71,7 +71,7 @@ const log4cxx::helpers::ClassRegistration& object::registerClass() { \ - return classReg; \ - }\ - namespace log4cxx { namespace classes { \ --const log4cxx::helpers::ClassRegistration& object##Registration = object::registerClass(); \ -+const ::log4cxx::helpers::ClassRegistration& object##Registration = object::registerClass(); \ - } } - - -diff --git a/src/main/include/log4cxx/helpers/simpledateformat.h b/src/main/include/log4cxx/helpers/simpledateformat.h -index 9c27f685..76fb784c 100644 ---- a/src/main/include/log4cxx/helpers/simpledateformat.h -+++ b/src/main/include/log4cxx/helpers/simpledateformat.h -@@ -29,7 +29,9 @@ - #include <vector> - #include <time.h> - --namespace std { class locale; } -+#include <locale> -+ -+using std::locale; - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/logstring.h b/src/main/include/log4cxx/logstring.h -index 3bbcdf2d..19e8aec7 100644 ---- a/src/main/include/log4cxx/logstring.h -+++ b/src/main/include/log4cxx/logstring.h -@@ -27,7 +27,7 @@ - #include <string> - #include <log4cxx/log4cxx.h> - --#if LOG4CXX_LOGCHAR_IS_WCHAR && LOG4CXX_LOGCHAR_IS_UTF8 && LOG4CXX_LOGCHAR_IS_UNICHAR -+#if (LOG4CXX_LOGCHAR_IS_WCHAR + LOG4CXX_LOGCHAR_IS_UTF8 + LOG4CXX_LOGCHAR_IS_UNICHAR)>1 - #error only one of LOG4CXX_LOGCHAR_IS_WCHAR, LOG4CXX_LOGCHAR_IS_UTF8 or LOG4CXX_LOGCHAR_IS_UNICHAR may be true - #endif - --- -2.11.0 - diff --git a/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/svn-log4cxx-rev-1751050.patch b/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/svn-log4cxx-rev-1751050.patch deleted file mode 100644 index f92ac48f..00000000 --- a/external/meta-sdl/recipes-devtools/log4cxx/log4cxx/svn-log4cxx-rev-1751050.patch +++ /dev/null @@ -1,365 +0,0 @@ -diff --git a/src/test/cpp/xml/domtestcase.cpp b/src/test/cpp/xml/domtestcase.cpp -index a50062818..a1491c73e 100644 ---- a/src/test/cpp/xml/domtestcase.cpp -+++ b/src/test/cpp/xml/domtestcase.cpp -@@ -15,7 +15,6 @@ - * limitations under the License. - */ - -- - #include <log4cxx/logger.h> - #include <log4cxx/xml/domconfigurator.h> - #include "../logunit.h" -@@ -36,190 +35,186 @@ using namespace log4cxx; - using namespace log4cxx::helpers; - using namespace log4cxx::xml; - -- - #define TEST1_1A_PAT \ -- "(DEBUG|INFO |WARN |ERROR|FATAL) \\w*\\.\\w* - Message [0-9]" -+ "(DEBUG|INFO |WARN |ERROR|FATAL) \\w*\\.\\w* - Message [0-9]" - - #define TEST1_1B_PAT "(DEBUG|INFO |WARN |ERROR|FATAL) root - Message [0-9]" - - #define TEST1_2_PAT "^[0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\} [0-9]\\{2\\}:[0-9]\\{2\\}:[0-9]\\{2\\},[0-9]\\{3\\} " \ -- "\\[0x[0-9A-F]*]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* - Message [0-9]" -+ "\\[0x[0-9A-F]*]\\ (DEBUG|INFO|WARN|ERROR|FATAL) .* - Message [0-9]" - - LOGUNIT_CLASS(DOMTestCase) - { -- LOGUNIT_TEST_SUITE(DOMTestCase); -- LOGUNIT_TEST(test1); -+ LOGUNIT_TEST_SUITE(DOMTestCase); -+ LOGUNIT_TEST(test1); - #if defined(_WIN32) -- LOGUNIT_TEST(test2); -+ LOGUNIT_TEST(test2); - #endif -- LOGUNIT_TEST(test3); -- LOGUNIT_TEST(test4); -- LOGUNIT_TEST_SUITE_END(); -- -- LoggerPtr root; -- LoggerPtr logger; -- -- static const File TEMP_A1; -- static const File TEMP_A2; -- static const File FILTERED_A1; -- static const File FILTERED_A2; -- static const File TEMP_A1_2; -- static const File TEMP_A2_2; -- static const File FILTERED_A1_2; -- static const File FILTERED_A2_2; -+ LOGUNIT_TEST(test3); -+ LOGUNIT_TEST(test4); -+ LOGUNIT_TEST_SUITE_END(); -+ -+ LoggerPtr root; -+ LoggerPtr logger; -+ -+ static const File TEMP_A1; -+ static const File TEMP_A2; -+ static const File FILTERED_A1; -+ static const File FILTERED_A2; -+ static const File TEMP_A1_2; -+ static const File TEMP_A2_2; -+ static const File FILTERED_A1_2; -+ static const File FILTERED_A2_2; - - public: -- void setUp() -- { -- root = Logger::getRootLogger(); -- logger = Logger::getLogger(LOG4CXX_TEST_STR("org.apache.log4j.xml.DOMTestCase")); -- } -- -- void tearDown() -- { -- root->getLoggerRepository()->resetConfiguration(); -- } -- -- -- void test1() { -- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase1.xml")); -- common(); -- -- ControlFilter cf1; -- cf1 << TEST1_1A_PAT << TEST1_1B_PAT; -- -- ControlFilter cf2; -- cf2 << TEST1_2_PAT; -- -- ThreadFilter threadFilter; -- ISO8601Filter iso8601Filter; -- -- std::vector<Filter *> filters1; -- filters1.push_back(&cf1); -- -- std::vector<Filter *> filters2; -- filters2.push_back(&cf2); -- filters2.push_back(&threadFilter); -- filters2.push_back(&iso8601Filter); -- -- try -- { -- Transformer::transform(TEMP_A1, FILTERED_A1, filters1); -- Transformer::transform(TEMP_A2, FILTERED_A2, filters2); -- } -- catch(UnexpectedFormatException& e) -- { -- std::cout << "UnexpectedFormatException :" << e.what() << std::endl; -- throw; -- } -- -- const File witness1(LOG4CXX_TEST_STR("witness/dom.A1.1")); -- const File witness2(LOG4CXX_TEST_STR("witness/dom.A2.1")); -- // TODO: A1 doesn't contain duplicate entries -- // -- // LOGUNIT_ASSERT(Compare::compare(FILTERED_A1, witness1)); -- LOGUNIT_ASSERT(Compare::compare(FILTERED_A2, witness2)); -- } -- -- // -- // Same test but backslashes instead of forward -- // -- void test2() { -- DOMConfigurator::configure(LOG4CXX_TEST_STR("input\\xml\\DOMTestCase2.xml")); -- common(); -- -- ThreadFilter threadFilter; -- ISO8601Filter iso8601Filter; -- -- std::vector<Filter *> filters1; -- -- std::vector<Filter *> filters2; -- filters2.push_back(&threadFilter); -- filters2.push_back(&iso8601Filter); -- -- try -- { -- Transformer::transform(TEMP_A1_2, FILTERED_A1_2, filters1); -- Transformer::transform(TEMP_A2_2, FILTERED_A2_2, filters2); -- } -- catch(UnexpectedFormatException& e) -- { -- std::cout << "UnexpectedFormatException :" << e.what() << std::endl; -- throw; -- } -- -- const File witness1(LOG4CXX_TEST_STR("witness/dom.A1.2")); -- const File witness2(LOG4CXX_TEST_STR("witness/dom.A2.2")); -- // TODO: A1 doesn't contain duplicate entries -- // -- // LOGUNIT_ASSERT(Compare::compare(FILTERED_A1, witness1)); -- LOGUNIT_ASSERT(Compare::compare(FILTERED_A2, witness2)); -- } -- -- -- void common() -- { -- int i = 0; -- -- LOG4CXX_DEBUG(logger, "Message " << i); -- LOG4CXX_DEBUG(root, "Message " << i); -- -- i++; -- LOG4CXX_INFO(logger, "Message " << i); -- LOG4CXX_INFO(root, "Message " << i); -- -- i++; -- LOG4CXX_WARN(logger, "Message " << i); -- LOG4CXX_WARN(root, "Message " << i); -- -- i++; -- LOG4CXX_ERROR(logger, "Message " << i); -- LOG4CXX_ERROR(root, "Message " << i); -- -- i++; -- LOG4CXX_FATAL(logger, "Message " << i); -- LOG4CXX_FATAL(root, "Message " << i); -- -- } -- -- /** -- * Creates a output file that ends with a superscript 3. -- * Output file is checked by build.xml after completion. -- */ -- void test3() { -- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); -- LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3"); -+ void setUp() -+ { -+ root = Logger::getRootLogger(); -+ logger = Logger::getLogger(LOG4CXX_TEST_STR("org.apache.log4j.xml.DOMTestCase")); -+ } -+ -+ void tearDown() -+ { -+ root->getLoggerRepository()->resetConfiguration(); -+ } -+ -+ void test1() { -+ DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase1.xml")); -+ common(); -+ -+ ControlFilter cf1; -+ cf1 << TEST1_1A_PAT << TEST1_1B_PAT; -+ -+ ControlFilter cf2; -+ cf2 << TEST1_2_PAT; -+ -+ ThreadFilter threadFilter; -+ ISO8601Filter iso8601Filter; -+ -+ std::vector<Filter *> filters1; -+ filters1.push_back(&cf1); -+ -+ std::vector<Filter *> filters2; -+ filters2.push_back(&cf2); -+ filters2.push_back(&threadFilter); -+ filters2.push_back(&iso8601Filter); -+ -+ try -+ { -+ Transformer::transform(TEMP_A1, FILTERED_A1, filters1); -+ Transformer::transform(TEMP_A2, FILTERED_A2, filters2); -+ } -+ catch(UnexpectedFormatException& e) -+ { -+ std::cout << "UnexpectedFormatException :" << e.what() << std::endl; -+ throw; -+ } -+ -+ const File witness1(LOG4CXX_TEST_STR("witness/dom.A1.1")); -+ const File witness2(LOG4CXX_TEST_STR("witness/dom.A2.1")); -+ // TODO: A1 doesn't contain duplicate entries -+ // -+ // LOGUNIT_ASSERT(Compare::compare(FILTERED_A1, witness1)); -+ LOGUNIT_ASSERT(Compare::compare(FILTERED_A2, witness2)); -+ } -+ -+ // -+ // Same test but backslashes instead of forward -+ // -+ void test2() { -+ DOMConfigurator::configure(LOG4CXX_TEST_STR("input\\xml\\DOMTestCase2.xml")); -+ common(); -+ -+ ThreadFilter threadFilter; -+ ISO8601Filter iso8601Filter; -+ -+ std::vector<Filter *> filters1; -+ -+ std::vector<Filter *> filters2; -+ filters2.push_back(&threadFilter); -+ filters2.push_back(&iso8601Filter); -+ -+ try -+ { -+ Transformer::transform(TEMP_A1_2, FILTERED_A1_2, filters1); -+ Transformer::transform(TEMP_A2_2, FILTERED_A2_2, filters2); -+ } -+ catch(UnexpectedFormatException& e) -+ { -+ std::cout << "UnexpectedFormatException :" << e.what() << std::endl; -+ throw; -+ } -+ -+ const File witness1(LOG4CXX_TEST_STR("witness/dom.A1.2")); -+ const File witness2(LOG4CXX_TEST_STR("witness/dom.A2.2")); -+ // TODO: A1 doesn't contain duplicate entries -+ // -+ // LOGUNIT_ASSERT(Compare::compare(FILTERED_A1, witness1)); -+ LOGUNIT_ASSERT(Compare::compare(FILTERED_A2, witness2)); -+ } -+ -+ -+ void common() -+ { -+ int i = 0; -+ -+ LOG4CXX_DEBUG(logger, "Message " << i); -+ LOG4CXX_DEBUG(root, "Message " << i); -+ -+ i++; -+ LOG4CXX_INFO(logger, "Message " << i); -+ LOG4CXX_INFO(root, "Message " << i); -+ -+ i++; -+ LOG4CXX_WARN(logger, "Message " << i); -+ LOG4CXX_WARN(root, "Message " << i); -+ -+ i++; -+ LOG4CXX_ERROR(logger, "Message " << i); -+ LOG4CXX_ERROR(root, "Message " << i); -+ -+ i++; -+ LOG4CXX_FATAL(logger, "Message " << i); -+ LOG4CXX_FATAL(root, "Message " << i); -+ } -+ -+ /** -+ * Creates a output file that ends with a superscript 3. -+ * Output file is checked by build.xml after completion. -+ */ -+ void test3() { -+ DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); -+ LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3"); - #if LOG4CXX_LOGCHAR_IS_UTF8 -- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 }; -+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xC2), static_cast<logchar>(0xB3), 0 }; - #else -- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 }; -+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xB3), 0 }; - #endif -- File file; -- file.setPath(fname); -- Pool p; -- bool exists = file.exists(p); -- LOGUNIT_ASSERT(exists); -- } -- -- /** -- * Creates a output file that ends with a ideographic 4. -- * Output file is checked by build.xml after completion. -- */ -- void test4() { -- DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml")); -- LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4"); -+ File file; -+ file.setPath(fname); -+ Pool p; -+ bool exists = file.exists(p); -+ LOGUNIT_ASSERT(exists); -+ } -+ -+ /** -+ * Creates a output file that ends with a ideographic 4. -+ * Output file is checked by build.xml after completion. -+ */ -+ void test4() { -+ DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml")); -+ LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4"); - #if LOG4CXX_LOGCHAR_IS_UTF8 -- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 }; -+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0xE3), static_cast<logchar>(0x86), static_cast<logchar>(0x95), 0 }; - #else -- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 }; -+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast<logchar>(0x3195), 0 }; - #endif -- File file; -- file.setPath(fname); -- Pool p; -- bool exists = file.exists(p); -- LOGUNIT_ASSERT(exists); -- } -- -+ File file; -+ file.setPath(fname); -+ Pool p; -+ bool exists = file.exists(p); -+ LOGUNIT_ASSERT(exists); -+ } - }; - - LOGUNIT_TEST_SUITE_REGISTRATION(DOMTestCase); diff --git a/external/meta-sdl/recipes-devtools/log4cxx/log4cxx_0.10.0.bb b/external/meta-sdl/recipes-devtools/log4cxx/log4cxx_0.10.0.bb deleted file mode 100644 index 2a0f5dfe..00000000 --- a/external/meta-sdl/recipes-devtools/log4cxx/log4cxx_0.10.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Apache logging framework for C++ library 3rd party" -SECTION = "libs" -DEPENDS = "apr apr-util expat gdbm" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -HOMEPAGE = "http://logging.apache.org/log4cxx/" - -SRC_URI = "git://github.com/smartdevicelink/sdl_core.git;branch=master" -SRC_URI_append = " \ - file://0001-LOGCXX-413-doesn-t-compile-on-openembedded-thanks-to.patch \ - file://0002-LOGCXX-414-possibly-wrong-use-of-autotools-docdir-th.patch \ - file://0003-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch \ - file://svn-log4cxx-rev-1751050.patch \ -" - -SRCREV = "7f7fcbb998fb17f2954fd103349af67ea9b71a3f" - -S = "${WORKDIR}/git/src/3rd_party/apache-${PN}-${PV}" - -inherit autotools-brokensep pkgconfig - -BBCLASSEXTEND += "native" - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" |