Author: lslezak Date: Mon Jul 27 14:31:53 2009 New Revision: 58164 URL: http://svn.opensuse.org/viewcvs/yast?rev=58164&view=rev Log: - completely removed DBus code Removed: branches/tmp/lslezak/core/agent-dbus/ branches/tmp/lslezak/core/dbus/ branches/tmp/lslezak/core/liby2dbus/ Modified: branches/tmp/lslezak/core/SUBDIRS branches/tmp/lslezak/core/configure.in.in branches/tmp/lslezak/core/libscr/src/Makefile.am branches/tmp/lslezak/core/libscr/src/SCR.cc branches/tmp/lslezak/core/libscr/src/include/scr/SCR.h branches/tmp/lslezak/core/libscr/testsuite/Makefile.am branches/tmp/lslezak/core/scr/src/Makefile.am Modified: branches/tmp/lslezak/core/SUBDIRS URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/SUBDIRS?rev=58164&r1=58163&r2=58164&view=diff ============================================================================== --- branches/tmp/lslezak/core/SUBDIRS (original) +++ branches/tmp/lslezak/core/SUBDIRS Mon Jul 27 14:31:53 2009 @@ -1 +1 @@ -liby2util-r liby2 libycp liby2dbus libscr agent-dummy scr agent-system agent-dbus agent-any agent-ini agent-modules agent-resolver agents-non-y2 agents-perl wfm agent-process base autodocs dbus +liby2util-r liby2 libycp libscr agent-dummy scr agent-system agent-any agent-ini agent-modules agent-resolver agents-non-y2 agents-perl wfm agent-process base autodocs Modified: branches/tmp/lslezak/core/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/configure.in.in?rev=58164&r1=58163&r2=58164&view=diff ============================================================================== --- branches/tmp/lslezak/core/configure.in.in (original) +++ branches/tmp/lslezak/core/configure.in.in Mon Jul 27 14:31:53 2009 @@ -94,88 +94,10 @@ AC_MSG_ERROR(Headers for blocxx are missing. Please install the package blocxx-devel.) fi -PKG_CHECK_MODULES(DBUS, dbus-1) - -## check for PolicyKit -AC_ARG_ENABLE([policykit], - AS_HELP_STRING([--enable-policykit], [Enable experimental PolicyKit support]), - [ - case "${enableval}" in - yes) policykit=yes ;; - no) policykit=no ;; - *) AC_MSG_ERROR(--enable-policykit: Unknwon value ${enableval}) ;; - esac - ], - [policykit=yes]) - -if test "x${policykit}" == xyes ; then - PKG_CHECK_MODULES(POLKIT, [ polkit-dbus >= 0.7 ], - [ - HAVE_POLKIT=1 - AC_DEFINE([HAVE_POLKIT], 1, [Have PolicyKit]) - policydir=`pkg-config polkit-dbus --variable prefix`/share/PolicyKit/policy/ - AC_SUBST(policydir) - ], - [ - HAVE_POLKIT=0 - AC_MSG_ERROR([*** PolicyKit support not found, install PolicyKit-devel: 'zypper in PolicyKit-devel' or libpolkit-dbus-dev.deb]) - ]) -else - HAVE_POLKIT=0 -fi - -# -# configuration for dbus/SCR_service -# - -# set access mode according to the PolicyKit status -# if policykit is disabled only root can access the service -if test $HAVE_POLKIT -ne 0; then -ACCESS_MODE=allow -else -ACCESS_MODE=deny -fi - -YAST_DBUS_SERVICE=org.opensuse.YaST.modules -AC_SUBST(YAST_DBUS_SERVICE) -YAST_DBUS_RAW_INTERFACE=org.opensuse.YaST.Values -AC_SUBST(YAST_DBUS_RAW_INTERFACE) -YAST_DBUS_YCP_INTERFACE=org.opensuse.YaST.YCPValues -AC_SUBST(YAST_DBUS_YCP_INTERFACE) -YAST_DBUS_MGR_INTERFACE=org.opensuse.YaST.modules.ModuleManager -AC_SUBST(YAST_DBUS_MGR_INTERFACE) -YAST_DBUS_OBJ_PREFIX=/org/opensuse/YaST/modules -AC_SUBST(YAST_DBUS_OBJ_PREFIX) - -YAST_POLKIT_PREFIX_MANAGER=org.opensuse.yast.module-manager -AC_SUBST(YAST_POLKIT_PREFIX_MANAGER) - -YAST_SCR_SERVICE=org.opensuse.yast.SCR -YAST_SCR_INTERFACE=$YAST_SCR_SERVICE.Methods -# @ybindir@ expands to ${prefix}/lib/..., force full expansion here -YAST_SCR_SERVICE_DIR=$ybindir -AC_SUBST(YAST_SCR_SERVICE) -AC_SUBST(YAST_SCR_INTERFACE) -AC_SUBST(YAST_SCR_SERVICE_DIR) - -AC_SUBST(ACCESS_MODE) - -AC_SUBST(POLKIT_CFLAGS) -AC_SUBST(POLKIT_LIBS) -AC_SUBST(HAVE_POLKIT) -AM_CONDITIONAL([HAVE_POLKIT], [test "x$HAVE_POLKIT" = x1]) ## and generate the output AC_CONFIG_FILES([ scr/doc/SCR.html scr/doc/intro_to_scr.html - dbus/namespace_service/src/yast_dbus_names.h - dbus/namespace_service/src/org.opensuse.yast.module-manager.policy - dbus/namespace_service/src/org.opensuse.YaST.modules.conf - dbus/namespace_service/src/org.opensuse.YaST.modules.service.in - dbus/SCR_service/org.opensuse.yast.SCR.conf - dbus/SCR_service/org.opensuse.yast.SCR.service.in - dbus/SCR_service/scr_names.h - dbus/SCR_service/test_SCR_dbus_server.rb ]) @YAST2-OUTPUT@ Modified: branches/tmp/lslezak/core/libscr/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libscr/src/Makefile.am?rev=58164&r1=58163&r2=58164&view=diff ============================================================================== --- branches/tmp/lslezak/core/libscr/src/Makefile.am (original) +++ branches/tmp/lslezak/core/libscr/src/Makefile.am Mon Jul 27 14:31:53 2009 @@ -11,15 +11,9 @@ libscr_la_SOURCES = \ SCRAgent.cc SCR.cc -libscr_la_CPPFLAGS = $(DBUS_CFLAGS) - -libscr_la_LIBADD = $(srcdir)/../../liby2dbus/src/liby2dbus.la - INCLUDES = \ -I$(srcdir)/../../libycp/src/include \ -I$(srcdir)/../../liby2/src/include \ - -I$(srcdir)/../../liby2dbus/src \ - -I$(srcdir)/../../scr/src \ -I$(srcdir)/include \ ${Y2UTIL_CFLAGS} Modified: branches/tmp/lslezak/core/libscr/src/SCR.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libscr/src/SCR.cc?rev=58164&r1=58163&r2=58164&view=diff ============================================================================== --- branches/tmp/lslezak/core/libscr/src/SCR.cc (original) +++ branches/tmp/lslezak/core/libscr/src/SCR.cc Mon Jul 27 14:31:53 2009 @@ -151,11 +151,6 @@ SCRWrite2 (const YCPPath &path, const YCPValue& value_n) { YCPValue value = value_n.isNull()? YCPVoid(): value_n; // bnc#406138 - if (connection != NULL) - { - return CallDBus("Write", path, value); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -170,11 +165,6 @@ YCPValue value = value_n.isNull()? YCPVoid(): value_n; // bnc#406138 YCPValue arg = arg_n.isNull()? YCPVoid(): arg_n; // bnc#406138 - if (connection != NULL) - { - return CallDBus("Write", path, value, arg); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -186,11 +176,6 @@ static YCPValue SCRDir (const YCPPath& path) { - if (connection != NULL) - { - return CallDBus("Dir", path); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -202,11 +187,6 @@ static YCPValue SCRExecute (const YCPPath &path) { - if (connection != NULL) - { - return CallDBus("Execute", path); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -218,11 +198,6 @@ static YCPValue SCRError (const YCPPath &path) { - if (connection != NULL) - { - return CallDBus("Error", path); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -238,11 +213,6 @@ SCRExecute2 (const YCPPath &path, const YCPValue &arg_n) { YCPValue arg = arg_n.isNull()? YCPVoid(): arg_n; // bnc#406138 - if (connection != NULL) - { - return CallDBus("Execute", path, arg); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -260,11 +230,6 @@ YCPValue arg = arg_n.isNull()? YCPVoid(): arg_n; // bnc#406138 YCPValue opt = opt_n.isNull()? YCPVoid(): opt_n; // bnc#406138 - if (connection != NULL) - { - return CallDBus("Execute", path, arg, opt); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -279,11 +244,6 @@ static YCPValue SCRRegisterAgentS (const YCPPath &path, const YCPString &arg) { - if (connection != NULL) - { - return CallDBus("RegisterAgent", path, arg); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -297,11 +257,6 @@ static YCPValue SCRRegisterAgentT (const YCPPath &path, const YCPTerm &arg) { - if (connection != NULL) - { - return CallDBus("RegisterAgent", path, arg); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -315,11 +270,6 @@ static YCPValue SCRUnregisterAgent (const YCPPath &path) { - if (connection != NULL) - { - return CallDBus("UnregisterAgent", path); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -332,11 +282,6 @@ static YCPValue SCRUnregisterAllAgents () { - if (connection != NULL) - { - return CallDBus("UnregisterAllAgents"); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -348,11 +293,6 @@ static YCPValue SCRUnmountAgent (const YCPPath &path) { - if (connection != NULL) - { - return CallDBus("UnmountAgent", path); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -365,11 +305,6 @@ static YCPValue SCRRegisterNewAgents () { - if (connection != NULL) - { - return CallDBus("RegisterNewAgents"); - } - if (! SCRAgent::instance()) { ycperror ( "No SCR instance found" ); @@ -415,33 +350,5 @@ static_declarations.registerDeclarations ("SCR", declarations); registered = true; - - bool y2dbus = check_dbus_env(); - - // use std SCR or DBUS SCR? - if (y2dbus) - { - y2debug("Y2DBUS is set, using DBUS for SCR access"); - connection = new DBusConn; - - // connect to the system bus - if (!connection->connect(DBUS_BUS_SYSTEM)) - { - y2error("Cannot connect to DBus, exiting..."); - exit(1); - } - } - else - { - y2debug("Y2DBUS is not set, using embedded SCR"); - } } -SCR::~SCR() -{ - if (connection != NULL) - { - delete connection; - connection = NULL; - } -} Modified: branches/tmp/lslezak/core/libscr/src/include/scr/SCR.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libscr/src/include/scr/SCR.h?rev=58164&r1=58163&r2=58164&view=diff ============================================================================== --- branches/tmp/lslezak/core/libscr/src/include/scr/SCR.h (original) +++ branches/tmp/lslezak/core/libscr/src/include/scr/SCR.h Mon Jul 27 14:31:53 2009 @@ -25,7 +25,6 @@ public: SCR (); - ~SCR(); static bool registered; }; Modified: branches/tmp/lslezak/core/libscr/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/libscr/testsuite/Makefile.am?rev=58164&r1=58163&r2=58164&view=diff ============================================================================== --- branches/tmp/lslezak/core/libscr/testsuite/Makefile.am (original) +++ branches/tmp/lslezak/core/libscr/testsuite/Makefile.am Mon Jul 27 14:31:53 2009 @@ -12,7 +12,7 @@ noinst_PROGRAMS = runscr runscr_SOURCES = runscr.cc -runscr_LDADD = ${AGENT_LIBADD} ../../liby2dbus/src/liby2dbus.la +runscr_LDADD = ${AGENT_LIBADD} PACKAGE = libscr AUTOMAKE_OPTIONS = dejagnu Modified: branches/tmp/lslezak/core/scr/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/scr/src/Makefile.am?rev=58164&r1=58163&r2=58164&view=diff ============================================================================== --- branches/tmp/lslezak/core/scr/src/Makefile.am (original) +++ branches/tmp/lslezak/core/scr/src/Makefile.am Mon Jul 27 14:31:53 2009 @@ -32,4 +32,9 @@ INCLUDES = ${AGENT_INCLUDES} +pkgincludedir = $(includedir)/scr +# these go to $(pkgincludedir) +pkginclude_HEADERS = \ + ScriptingAgent.h \ + SCRSubAgent.h -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org