From d703648831f5080f9edc2a0550769ba5f143e09f Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Thu, 19 Sep 2024 15:46:53 +0200 Subject: [PATCH] - moved proxy library to subdirectory --- client/Makefile.am | 26 +++++--------------------- client/MyFiles.cc | 2 +- client/cleanup.h | 2 +- client/cmd-cleanup.cc | 2 +- client/cmd-create-config.cc | 2 +- client/cmd-create.cc | 2 +- client/cmd-debug.cc | 2 +- client/cmd-delete-config.cc | 2 +- client/cmd-delete.cc | 2 +- client/cmd-diff.cc | 2 +- client/cmd-get-config.cc | 2 +- client/cmd-list-configs.cc | 2 +- client/cmd-list.cc | 2 +- client/cmd-modify.cc | 2 +- client/cmd-mount.cc | 2 +- client/cmd-rollback.cc | 2 +- client/cmd-set-config.cc | 2 +- client/cmd-setup-quota.cc | 2 +- client/cmd-status.cc | 2 +- client/cmd-umount.cc | 2 +- client/cmd-undochange.cc | 2 +- client/cmd-xadiff.cc | 2 +- client/cmd.h | 2 +- client/locker.h | 2 +- client/misc.h | 2 +- client/proxy/Makefile.am | 21 +++++++++++++++++++++ client/{ => proxy}/commands.cc | 2 +- client/{ => proxy}/commands.h | 0 client/{ => proxy}/errors.cc | 2 +- client/{ => proxy}/errors.h | 0 client/{ => proxy}/proxy-dbus.cc | 2 +- client/{ => proxy}/proxy-dbus.h | 0 client/{ => proxy}/proxy-lib.cc | 0 client/{ => proxy}/proxy-lib.h | 0 client/{ => proxy}/proxy.cc | 2 +- client/{ => proxy}/proxy.h | 0 client/{ => proxy}/types.cc | 0 client/{ => proxy}/types.h | 0 client/snapper.cc | 4 ++-- client/systemd-helper.cc | 4 ++-- configure.ac | 1 + po/Makefile.am | 2 +- zypp-plugin/Makefile.am | 2 +- zypp-plugin/snapper-zypp-plugin.cc | 4 ++-- 44 files changed, 63 insertions(+), 57 deletions(-) create mode 100644 client/proxy/Makefile.am rename client/{ => proxy}/commands.cc (99%) rename client/{ => proxy}/commands.h (100%) rename client/{ => proxy}/errors.cc (99%) rename client/{ => proxy}/errors.h (100%) rename client/{ => proxy}/proxy-dbus.cc (99%) rename client/{ => proxy}/proxy-dbus.h (100%) rename client/{ => proxy}/proxy-lib.cc (100%) rename client/{ => proxy}/proxy-lib.h (100%) rename client/{ => proxy}/proxy.cc (99%) rename client/{ => proxy}/proxy.h (100%) rename client/{ => proxy}/types.cc (100%) rename client/{ => proxy}/types.h (100%) diff --git a/client/Makefile.am b/client/Makefile.am index 7e0598c3..85de987f 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -2,26 +2,10 @@ # Makefile.am for snapper/client # -SUBDIRS = utils +SUBDIRS = utils proxy AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) -noinst_LTLIBRARIES = libclient.la libproxy.la - -libclient_la_SOURCES = \ - types.cc types.h \ - commands.cc commands.h \ - errors.cc errors.h - -libclient_la_LIBADD = \ - utils/libutils.la \ - ../dbus/libdbus.la - -libproxy_la_SOURCES = \ - proxy.cc proxy.h \ - proxy-dbus.cc proxy-dbus.h \ - proxy-lib.cc proxy-lib.h - bin_PROGRAMS = snapper snapper_SOURCES = \ @@ -53,8 +37,8 @@ snapper_SOURCES = \ GlobalOptions.cc GlobalOptions.h snapper_LDADD = \ - libproxy.la \ - libclient.la \ + proxy/libproxy.la \ + proxy/libclient.la \ ../snapper/libsnapper.la \ utils/libutils.la \ ../dbus/libdbus.la \ @@ -71,8 +55,8 @@ systemd_helper_SOURCES = \ misc.cc misc.h systemd_helper_LDADD = \ - libproxy.la \ - libclient.la \ + proxy/libproxy.la \ + proxy/libclient.la \ ../snapper/libsnapper.la \ utils/libutils.la \ ../dbus/libdbus.la diff --git a/client/MyFiles.cc b/client/MyFiles.cc index 9fc8d375..48b5fe2b 100644 --- a/client/MyFiles.cc +++ b/client/MyFiles.cc @@ -23,7 +23,7 @@ #include -#include "proxy.h" +#include "proxy/proxy.h" #include "utils/text.h" #include "GlobalOptions.h" diff --git a/client/cleanup.h b/client/cleanup.h index aceaab80..764d8515 100644 --- a/client/cleanup.h +++ b/client/cleanup.h @@ -23,7 +23,7 @@ #include -#include "proxy.h" +#include "proxy/proxy.h" /* diff --git a/client/cmd-cleanup.cc b/client/cmd-cleanup.cc index f00d16e8..d07a91fa 100644 --- a/client/cmd-cleanup.cc +++ b/client/cmd-cleanup.cc @@ -35,8 +35,8 @@ #include "utils/HumanString.h" #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "cleanup.h" #include "misc.h" #include "cmd.h" diff --git a/client/cmd-create-config.cc b/client/cmd-create-config.cc index c1e70084..0d0707d4 100644 --- a/client/cmd-create-config.cc +++ b/client/cmd-create-config.cc @@ -27,8 +27,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" namespace snapper diff --git a/client/cmd-create.cc b/client/cmd-create.cc index aebc1770..026ac8cf 100644 --- a/client/cmd-create.cc +++ b/client/cmd-create.cc @@ -27,8 +27,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "misc.h" diff --git a/client/cmd-debug.cc b/client/cmd-debug.cc index 18a7bbdb..36da6d2c 100644 --- a/client/cmd-debug.cc +++ b/client/cmd-debug.cc @@ -24,8 +24,8 @@ #include #include "utils/text.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" namespace snapper diff --git a/client/cmd-delete-config.cc b/client/cmd-delete-config.cc index 930e63bf..ff11e02e 100644 --- a/client/cmd-delete-config.cc +++ b/client/cmd-delete-config.cc @@ -24,8 +24,8 @@ #include #include "utils/text.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" namespace snapper diff --git a/client/cmd-delete.cc b/client/cmd-delete.cc index 5288512c..2eda1c52 100644 --- a/client/cmd-delete.cc +++ b/client/cmd-delete.cc @@ -27,8 +27,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" namespace snapper diff --git a/client/cmd-diff.cc b/client/cmd-diff.cc index dd80dd19..d24c3dd0 100644 --- a/client/cmd-diff.cc +++ b/client/cmd-diff.cc @@ -27,8 +27,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "misc.h" #include "MyFiles.h" diff --git a/client/cmd-get-config.cc b/client/cmd-get-config.cc index 19fe2ff3..0d8b4f83 100644 --- a/client/cmd-get-config.cc +++ b/client/cmd-get-config.cc @@ -25,8 +25,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "misc.h" #include "utils/TableFormatter.h" #include "utils/CsvFormatter.h" diff --git a/client/cmd-list-configs.cc b/client/cmd-list-configs.cc index 4cfde2b6..274cbf29 100644 --- a/client/cmd-list-configs.cc +++ b/client/cmd-list-configs.cc @@ -25,8 +25,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "misc.h" #include "utils/TableFormatter.h" #include "utils/CsvFormatter.h" diff --git a/client/cmd-list.cc b/client/cmd-list.cc index 5f503074..550ca3a4 100644 --- a/client/cmd-list.cc +++ b/client/cmd-list.cc @@ -31,8 +31,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "locker.h" #include "misc.h" #include "utils/TableFormatter.h" diff --git a/client/cmd-modify.cc b/client/cmd-modify.cc index 0671259e..90c378c9 100644 --- a/client/cmd-modify.cc +++ b/client/cmd-modify.cc @@ -27,8 +27,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "misc.h" diff --git a/client/cmd-mount.cc b/client/cmd-mount.cc index a73871f3..dcc0fd1e 100644 --- a/client/cmd-mount.cc +++ b/client/cmd-mount.cc @@ -24,8 +24,8 @@ #include #include "utils/text.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" namespace snapper diff --git a/client/cmd-rollback.cc b/client/cmd-rollback.cc index 3075d503..a4748db1 100644 --- a/client/cmd-rollback.cc +++ b/client/cmd-rollback.cc @@ -31,8 +31,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "misc.h" diff --git a/client/cmd-set-config.cc b/client/cmd-set-config.cc index d1618e6b..234907ec 100644 --- a/client/cmd-set-config.cc +++ b/client/cmd-set-config.cc @@ -24,8 +24,8 @@ #include #include "utils/text.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "misc.h" diff --git a/client/cmd-setup-quota.cc b/client/cmd-setup-quota.cc index e1540085..15461922 100644 --- a/client/cmd-setup-quota.cc +++ b/client/cmd-setup-quota.cc @@ -24,8 +24,8 @@ #include #include "utils/text.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" namespace snapper diff --git a/client/cmd-status.cc b/client/cmd-status.cc index d0cd6d8f..be423572 100644 --- a/client/cmd-status.cc +++ b/client/cmd-status.cc @@ -27,8 +27,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "MyFiles.h" diff --git a/client/cmd-umount.cc b/client/cmd-umount.cc index 200d32e0..067af6ae 100644 --- a/client/cmd-umount.cc +++ b/client/cmd-umount.cc @@ -24,8 +24,8 @@ #include #include "utils/text.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" namespace snapper diff --git a/client/cmd-undochange.cc b/client/cmd-undochange.cc index dee27e3b..a0726ca5 100644 --- a/client/cmd-undochange.cc +++ b/client/cmd-undochange.cc @@ -27,8 +27,8 @@ #include "utils/text.h" #include "utils/help.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "MyFiles.h" diff --git a/client/cmd-xadiff.cc b/client/cmd-xadiff.cc index 770480bb..15aa26df 100644 --- a/client/cmd-xadiff.cc +++ b/client/cmd-xadiff.cc @@ -28,8 +28,8 @@ #include #include "utils/text.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" -#include "proxy.h" #include "MyFiles.h" diff --git a/client/cmd.h b/client/cmd.h index 37ede8c6..44c7d14d 100644 --- a/client/cmd.h +++ b/client/cmd.h @@ -23,7 +23,7 @@ #include "config.h" -#include "proxy.h" +#include "proxy/proxy.h" #include "GlobalOptions.h" diff --git a/client/locker.h b/client/locker.h index 41d30ae1..9d53516e 100644 --- a/client/locker.h +++ b/client/locker.h @@ -20,7 +20,7 @@ */ -#include "proxy.h" +#include "proxy/proxy.h" namespace snapper diff --git a/client/misc.h b/client/misc.h index c4ade1b2..a87d7603 100644 --- a/client/misc.h +++ b/client/misc.h @@ -30,7 +30,7 @@ #include "client/utils/text.h" #include "client/utils/GetOpts.h" -#include "proxy.h" +#include "proxy/proxy.h" using namespace snapper; diff --git a/client/proxy/Makefile.am b/client/proxy/Makefile.am new file mode 100644 index 00000000..785b09de --- /dev/null +++ b/client/proxy/Makefile.am @@ -0,0 +1,21 @@ +# +# Makefile.am for snapper/client/proxy +# + +AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS) + +noinst_LTLIBRARIES = libclient.la libproxy.la + +libclient_la_SOURCES = \ + types.cc types.h \ + commands.cc commands.h \ + errors.cc errors.h + +libclient_la_LIBADD = \ + ../utils/libutils.la \ + ../../dbus/libdbus.la + +libproxy_la_SOURCES = \ + proxy.cc proxy.h \ + proxy-dbus.cc proxy-dbus.h \ + proxy-lib.cc proxy-lib.h diff --git a/client/commands.cc b/client/proxy/commands.cc similarity index 99% rename from client/commands.cc rename to client/proxy/commands.cc index d4673710..3aece4ac 100644 --- a/client/commands.cc +++ b/client/proxy/commands.cc @@ -26,7 +26,7 @@ #include "commands.h" #include "errors.h" -#include "utils/text.h" +#include "../utils/text.h" #include "dbus/DBusPipe.h" #include "snapper/AppUtil.h" diff --git a/client/commands.h b/client/proxy/commands.h similarity index 100% rename from client/commands.h rename to client/proxy/commands.h diff --git a/client/errors.cc b/client/proxy/errors.cc similarity index 99% rename from client/errors.cc rename to client/proxy/errors.cc index 12f7af93..c9c81f7e 100644 --- a/client/errors.cc +++ b/client/proxy/errors.cc @@ -24,7 +24,7 @@ #include #include -#include "utils/text.h" +#include "../utils/text.h" #include "errors.h" diff --git a/client/errors.h b/client/proxy/errors.h similarity index 100% rename from client/errors.h rename to client/proxy/errors.h diff --git a/client/proxy-dbus.cc b/client/proxy/proxy-dbus.cc similarity index 99% rename from client/proxy-dbus.cc rename to client/proxy/proxy-dbus.cc index 7d998d5a..2722f78d 100644 --- a/client/proxy-dbus.cc +++ b/client/proxy/proxy-dbus.cc @@ -22,7 +22,7 @@ #include "proxy-dbus.h" #include "commands.h" -#include "utils/text.h" +#include "../utils/text.h" using namespace std; diff --git a/client/proxy-dbus.h b/client/proxy/proxy-dbus.h similarity index 100% rename from client/proxy-dbus.h rename to client/proxy/proxy-dbus.h diff --git a/client/proxy-lib.cc b/client/proxy/proxy-lib.cc similarity index 100% rename from client/proxy-lib.cc rename to client/proxy/proxy-lib.cc diff --git a/client/proxy-lib.h b/client/proxy/proxy-lib.h similarity index 100% rename from client/proxy-lib.h rename to client/proxy/proxy-lib.h diff --git a/client/proxy.cc b/client/proxy/proxy.cc similarity index 99% rename from client/proxy.cc rename to client/proxy/proxy.cc index c70eb359..08a6a5e6 100644 --- a/client/proxy.cc +++ b/client/proxy/proxy.cc @@ -27,7 +27,7 @@ #include #include -#include "utils/text.h" +#include "../utils/text.h" #include "proxy.h" diff --git a/client/proxy.h b/client/proxy/proxy.h similarity index 100% rename from client/proxy.h rename to client/proxy/proxy.h diff --git a/client/types.cc b/client/proxy/types.cc similarity index 100% rename from client/types.cc rename to client/proxy/types.cc diff --git a/client/types.h b/client/proxy/types.h similarity index 100% rename from client/types.h rename to client/proxy/types.h diff --git a/client/snapper.cc b/client/snapper.cc index c8d4c342..eccda08c 100644 --- a/client/snapper.cc +++ b/client/snapper.cc @@ -36,9 +36,9 @@ #include "utils/text.h" #include "utils/Table.h" #include "utils/GetOpts.h" +#include "proxy/errors.h" +#include "proxy/proxy.h" -#include "errors.h" -#include "proxy.h" #include "GlobalOptions.h" #include "cmd.h" diff --git a/client/systemd-helper.cc b/client/systemd-helper.cc index a1f2bc96..2801c5ad 100644 --- a/client/systemd-helper.cc +++ b/client/systemd-helper.cc @@ -31,10 +31,10 @@ #include "utils/text.h" #include "utils/GetOpts.h" +#include "proxy/proxy.h" +#include "proxy/errors.h" -#include "proxy.h" #include "cleanup.h" -#include "errors.h" #include "misc.h" diff --git a/configure.ac b/configure.ac index a3147195..8ee4d7b9 100644 --- a/configure.ac +++ b/configure.ac @@ -217,6 +217,7 @@ AC_CONFIG_FILES([ server/Makefile client/Makefile client/utils/Makefile + client/proxy/Makefile scripts/Makefile pam/Makefile data/Makefile diff --git a/po/Makefile.am b/po/Makefile.am index 54126428..56072222 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -6,7 +6,7 @@ XGETTEXT = xgettext MSGFMT = msgfmt MSGMERGE = msgmerge -SRCFILES = $(wildcard ../client/*.cc ../client/*.h ../client/utils/*.cc) +SRCFILES = $(wildcard ../client/*.cc ../client/*.h ../client/utils/*.cc ../client/proxy/*.cc) POFILES = $(wildcard *.po) diff --git a/zypp-plugin/Makefile.am b/zypp-plugin/Makefile.am index de58ebef..9d102e0f 100644 --- a/zypp-plugin/Makefile.am +++ b/zypp-plugin/Makefile.am @@ -18,7 +18,7 @@ snapper_zypp_plugin_SOURCES = \ zypp-plugin.cc zypp-plugin.h snapper_zypp_plugin_LDADD = \ - ../client/libclient.la \ + ../client/proxy/libclient.la \ ../snapper/libsnapper.la \ ../dbus/libdbus.la \ ../stomp/libstomp.la \ diff --git a/zypp-plugin/snapper-zypp-plugin.cc b/zypp-plugin/snapper-zypp-plugin.cc index e13dc33d..2909a301 100644 --- a/zypp-plugin/snapper-zypp-plugin.cc +++ b/zypp-plugin/snapper-zypp-plugin.cc @@ -39,8 +39,8 @@ #include "dbus/DBusConnection.h" #include "snapper/Exception.h" #include "snapper/Log.h" -#include "client/commands.h" -#include "client/errors.h" +#include "client/proxy/commands.h" +#include "client/proxy/errors.h" #include "snapper-zypp-plugin.h" -- 2.47.3