Browse files

- removed blocxx usage (fate #313242)

  • Loading branch information...
1 parent 5e9341b commit 04f83ca9f7394312a542aba92d4d9b405aedc27e @aschnell aschnell committed with root Jun 12, 2012
Showing with 4 additions and 114 deletions.
  1. +0 −8 configure.in.in
  2. +1 −1 liby2/src/Makefile.am
  3. +0 −100 liby2/src/genericfrontend.cc
  4. +2 −1 package/yast2-core.changes
  5. +1 −4 yast2-core.spec.in
View
8 configure.in.in
@@ -81,14 +81,6 @@ CREATE_PKGCONFIG=true
@YAST2-CHECKS-PROGRAM@
@YAST2-CHECKS-TESTSUITE@
-## check for blocxx
-dnl FIXME assumes PCRE
-AC_CHECK_HEADER(blocxx/BLOCXX_config.h, [yast_found_blocxx=yes])
-if [[ "$yast_found_blocxx" != "yes" ]]; then
- AC_MSG_ERROR(Headers for blocxx are missing. Please install the package blocxx-devel.)
-fi
-
-
## and generate the output
AC_CONFIG_FILES([
scr/doc/SCR.html
View
2 liby2/src/Makefile.am
@@ -24,7 +24,7 @@ liby2_la_SOURCES = \
liby2_la_LDFLAGS = -version-info 2:0
# pthread added (74501)
-liby2_la_LIBADD = ${Y2UTIL_LIBS} -lutil -ldl -lpthread -lblocxx -lpcre
+liby2_la_LIBADD = ${Y2UTIL_LIBS} -lutil -ldl -lpthread
libpy2serial_la_SOURCES = \
Y2SerialComponent.cc Y2CCSerial.cc
View
100 liby2/src/genericfrontend.cc
@@ -269,106 +269,6 @@ signal_handler (int sig)
}
-#include <blocxx/BLOCXX_config.h>
-#include <blocxx/Logger.hpp>
-#include <blocxx/LogMessage.hpp>
-#if BLOCXX_LIBRARY_VERSION >= 5
-#include <blocxx/LogAppender.hpp>
-#else
-#include <blocxx/LogConfig.hpp>
-#endif
-
-/**
- * The YaST logger for LiMaL framework. It's just a wrapper around
- * the standard YaST logging mechanism.
- */
-#if BLOCXX_LIBRARY_VERSION >= 5
-class YaSTLogger : public blocxx::LogAppender
-#else
-class YaSTLogger : public blocxx::Logger
-#endif
-{
-public:
- virtual ~YaSTLogger() {};
-
- /**
- * Constructor. YaST will try to log every message level,
- * because we filter on our own.
- */
-#if BLOCXX_LIBRARY_VERSION >= 5
- YaSTLogger() : blocxx::LogAppender(
- blocxx::LogAppender::ALL_COMPONENTS,
- blocxx::LogAppender::ALL_CATEGORIES,
- blocxx::LogAppender::STR_TTCC_MESSAGE_FORMAT
- )
- {}
-#else
- YaSTLogger() : blocxx::Logger ("YaST",blocxx::E_ALL_LEVEL) {}
-#endif
-
- /**
- * The logging message processing. The method converts the
- * Blocxx LogMessage into a YaST logger. Unfortunatelly,
- * the log level can be received only as a string, so
- * we have to do a conversion to loglevel_t used by YaST.
- *
- * @param m the message to be logged
- */
-#if BLOCXX_LIBRARY_VERSION >= 5
- virtual void doProcessLogMessage(const blocxx::String & /*f*/,
- const blocxx::LogMessage& m) const
-#else
- virtual void doProcessLogMessage(const blocxx::LogMessage& m) const
-#endif
- {
- loglevel_t level = LOG_DEBUG;
- if (m.category == blocxx::Logger::STR_FATAL_CATEGORY
- || m.category == blocxx::Logger::STR_ERROR_CATEGORY)
- {
- level = LOG_ERROR;
-#if BLOCXX_LIBRARY_VERSION >= 5
- } else if (m.category == blocxx::Logger::STR_WARNING_CATEGORY)
- {
- level = LOG_WARNING;
-#endif
- } else if (m.category == blocxx::Logger::STR_INFO_CATEGORY)
- {
- level = LOG_MILESTONE;
- }
-
- y2_logger(level,m.component.c_str ()
- ,m.filename,m.fileline,m.methodname,"%s", m.message.c_str ());
- }
-#if BLOCXX_LIBRARY_VERSION <= 4
- /**
- * Clone this logger - create a new instance as a copy
- * of this one and return a reference to the instance.
- */
- virtual blocxx::LoggerRef doClone() const
- {
- return blocxx::LoggerRef(new YaSTLogger(*this));
- }
-#endif
-};
-
-// YaSTLogger redirection factory for BloCxx/LiMaL
-struct logger_initializer
-{
- logger_initializer()
- {
-#if BLOCXX_LIBRARY_VERSION >= 5
- blocxx::LogAppender::setDefaultLogAppender(
- blocxx::LogAppenderRef(new YaSTLogger())
- );
-#else
- blocxx::Logger::setDefaultLogger(
- blocxx::LoggerRef(new YaSTLogger())
- );
-#endif
- }
-};
-static logger_initializer initialize_logger;
-
void
parse_client_and_options (int argc, char ** argv, int& arg, char *& client_name, YCPList& arglist)
{
View
3 package/yast2-core.changes
@@ -1,7 +1,8 @@
-------------------------------------------------------------------
Tue Jun 12 13:53:23 CEST 2012 - aschnell@suse.de
-- improved efficiency of logging functions (fate #313242)
+- removed blocxx usage (fate #313242)
+- improved efficiency of logging functions
- 2.23.1
-------------------------------------------------------------------
View
5 yast2-core.spec.in
@@ -18,9 +18,6 @@ BuildRequires: doxygen
BuildRequires: docbook-xsl-stylesheets libxslt
# catalog: convert URIs to local filenames
BuildRequires: sgml-skel
-# logging
-# renamed: http://lists.opensuse.org/opensuse-packaging/2007-11/msg00076.html
-BuildRequires: libblocxx-devel
Summary: YaST2 - Core Libraries
Requires: perl = %{perl_version}
@@ -36,7 +33,7 @@ Summary: YaST2 - Core Libraries
Provides: liby2util-devel = 2.16.1
Obsoletes: liby2util-devel < 2.16.1
Requires: hwinfo-devel
-Requires: glibc-devel libstdc++-devel pcre-devel libblocxx-devel sysfsutils
+Requires: glibc-devel libstdc++-devel sysfsutils
# required for libscr
# for FlexLexer.h; I think that this dependency could be made
# private but it seems not worth the effort

0 comments on commit 04f83ca

Please sign in to comment.