- moved snapper client to own directory

aschnell · Sep 30, 2024 · 3388893 · 3388893
1 parent f769b70
commit 3388893
Show file tree

Hide file tree

Showing 30 changed files with 132 additions and 125 deletions.
diff --git a/client/.gitignore b/client/.gitignore
@@ -1,4 +1,3 @@
 *.o
 *.lo
 *.la
-snapper
diff --git a/client/Makefile.am b/client/Makefile.am
@@ -2,43 +2,4 @@
 # Makefile.am for snapper/client
 #
 
-SUBDIRS = utils proxy mksubvolume installation-helper systemd-helper
-
-AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
-
-bin_PROGRAMS = snapper
-
-snapper_SOURCES =					\
-	snapper.cc					\
-	cmd.h						\
-	cmd-list-configs.cc				\
-	cmd-create-config.cc				\
-	cmd-delete-config.cc				\
-	cmd-get-config.cc				\
-	cmd-set-config.cc				\
-	cmd-list.cc					\
-	cmd-create.cc					\
-	cmd-modify.cc					\
-	cmd-delete.cc					\
-	cmd-mount.cc					\
-	cmd-umount.cc					\
-	cmd-status.cc					\
-	cmd-diff.cc					\
-	cmd-xadiff.cc					\
-	cmd-undochange.cc				\
-	cmd-rollback.cc					\
-	cmd-setup-quota.cc				\
-	cmd-cleanup.cc					\
-	cmd-debug.cc					\
-	cleanup.cc		cleanup.h		\
-	misc.cc			misc.h			\
-	MyFiles.cc		MyFiles.h		\
-	GlobalOptions.cc	GlobalOptions.h
-
-snapper_LDADD = 			\
-	proxy/libproxy.la		\
-	proxy/libclient.la		\
-	../snapper/libsnapper.la	\
-	utils/libutils.la		\
-	../dbus/libdbus.la		\
-	$(JSON_C_LIBS)
+SUBDIRS = utils proxy snapper mksubvolume installation-helper systemd-helper
diff --git a/client/snapper/.gitignore b/client/snapper/.gitignore
@@ -0,0 +1,4 @@
+*.o
+*.lo
+*.la
+snapper
diff --git a/client/GlobalOptions.cc → client/snapper/GlobalOptions.cc b/client/GlobalOptions.cc → client/snapper/GlobalOptions.cc
@@ -21,9 +21,9 @@
 
 #include <snapper/AppUtil.h>
 
-#include "utils/help.h"
-#include "misc.h"
-#include "client/GlobalOptions.h"
+#include "../utils/help.h"
+#include "../misc.h"
+#include "GlobalOptions.h"
 #include "client/utils/text.h"
 #include "client/utils/TableFormatter.h"
 #include "client/utils/CsvFormatter.h"

diff --git a/client/GlobalOptions.h → client/snapper/GlobalOptions.h b/client/GlobalOptions.h → client/snapper/GlobalOptions.h
diff --git a/client/snapper/Makefile.am b/client/snapper/Makefile.am
@@ -0,0 +1,42 @@
+#
+# Makefile.am for snapper/client/snapper
+#
+
+AM_CPPFLAGS = -I$(top_srcdir) $(DBUS_CFLAGS)
+
+bin_PROGRAMS = snapper
+
+snapper_SOURCES =					\
+	snapper.cc					\
+	cmd.h						\
+	cmd-list-configs.cc				\
+	cmd-create-config.cc				\
+	cmd-delete-config.cc				\
+	cmd-get-config.cc				\
+	cmd-set-config.cc				\
+	cmd-list.cc					\
+	cmd-create.cc					\
+	cmd-modify.cc					\
+	cmd-delete.cc					\
+	cmd-mount.cc					\
+	cmd-umount.cc					\
+	cmd-status.cc					\
+	cmd-diff.cc					\
+	cmd-xadiff.cc					\
+	cmd-undochange.cc				\
+	cmd-rollback.cc					\
+	cmd-setup-quota.cc				\
+	cmd-cleanup.cc					\
+	cmd-debug.cc					\
+	../cleanup.cc		../cleanup.h		\
+	../misc.cc		../misc.h		\
+	MyFiles.cc		MyFiles.h		\
+	GlobalOptions.cc	GlobalOptions.h
+
+snapper_LDADD = 			\
+	../proxy/libproxy.la		\
+	../proxy/libclient.la		\
+	../../snapper/libsnapper.la	\
+	../utils/libutils.la		\
+	../../dbus/libdbus.la		\
+	$(JSON_C_LIBS)
diff --git a/client/MyFiles.cc → client/snapper/MyFiles.cc b/client/MyFiles.cc → client/snapper/MyFiles.cc
@@ -23,8 +23,8 @@
 
 #include <iostream>
 
-#include "proxy/proxy.h"
-#include "utils/text.h"
+#include "../proxy/proxy.h"
+#include "../utils/text.h"
 #include "GlobalOptions.h"
 
 #include <snapper/AppUtil.h>

diff --git a/client/MyFiles.h → client/snapper/MyFiles.h b/client/MyFiles.h → client/snapper/MyFiles.h
@@ -25,7 +25,7 @@
 
 #include <snapper/File.h>
 
-#include "utils/GetOpts.h"
+#include "../utils/GetOpts.h"
 
 
 namespace snapper

diff --git a/client/cmd-cleanup.cc → client/snapper/cmd-cleanup.cc b/client/cmd-cleanup.cc → client/snapper/cmd-cleanup.cc
@@ -32,13 +32,13 @@
 #endif
 #include <snapper/FileUtils.h>
 
-#include "utils/HumanString.h"
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
+#include "../utils/HumanString.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "cleanup.h"
-#include "misc.h"
+#include "../cleanup.h"
+#include "../misc.h"
 #include "cmd.h"
 
 

diff --git a/client/cmd-create-config.cc → client/snapper/cmd-create-config.cc b/client/cmd-create-config.cc → client/snapper/cmd-create-config.cc
@@ -25,9 +25,9 @@
 
 #include <snapper/AppUtil.h>
 
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
 
 

diff --git a/client/cmd-create.cc → client/snapper/cmd-create.cc b/client/cmd-create.cc → client/snapper/cmd-create.cc
@@ -25,11 +25,11 @@
 
 #include <snapper/AppUtil.h>
 
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "misc.h"
+#include "../misc.h"
 
 
 namespace snapper

diff --git a/client/cmd-debug.cc → client/snapper/cmd-debug.cc b/client/cmd-debug.cc → client/snapper/cmd-debug.cc
@@ -23,8 +23,8 @@
 
 #include <iostream>
 
-#include "utils/text.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
 
 

diff --git a/client/cmd-delete-config.cc → client/snapper/cmd-delete-config.cc b/client/cmd-delete-config.cc → client/snapper/cmd-delete-config.cc
@@ -23,8 +23,8 @@
 
 #include <iostream>
 
-#include "utils/text.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
 
 

diff --git a/client/cmd-delete.cc → client/snapper/cmd-delete.cc b/client/cmd-delete.cc → client/snapper/cmd-delete.cc
@@ -25,9 +25,9 @@
 
 #include <snapper/AppUtil.h>
 
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
 
 

diff --git a/client/cmd-diff.cc → client/snapper/cmd-diff.cc b/client/cmd-diff.cc → client/snapper/cmd-diff.cc
@@ -25,11 +25,11 @@
 
 #include <snapper/AppUtil.h>
 
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "misc.h"
+#include "../misc.h"
 #include "MyFiles.h"
 
 

diff --git a/client/cmd-get-config.cc → client/snapper/cmd-get-config.cc b/client/cmd-get-config.cc → client/snapper/cmd-get-config.cc
@@ -23,14 +23,14 @@
 
 #include <iostream>
 
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "misc.h"
-#include "utils/TableFormatter.h"
-#include "utils/CsvFormatter.h"
-#include "utils/JsonFormatter.h"
+#include "../misc.h"
+#include "../utils/TableFormatter.h"
+#include "../utils/CsvFormatter.h"
+#include "../utils/JsonFormatter.h"
 
 
 namespace snapper

diff --git a/client/cmd-list-configs.cc → client/snapper/cmd-list-configs.cc b/client/cmd-list-configs.cc → client/snapper/cmd-list-configs.cc
@@ -23,14 +23,14 @@
 
 #include <iostream>
 
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "misc.h"
-#include "utils/TableFormatter.h"
-#include "utils/CsvFormatter.h"
-#include "utils/JsonFormatter.h"
+#include "../misc.h"
+#include "../utils/TableFormatter.h"
+#include "../utils/CsvFormatter.h"
+#include "../utils/JsonFormatter.h"
 
 
 namespace snapper

diff --git a/client/cmd-list.cc → client/snapper/cmd-list.cc b/client/cmd-list.cc → client/snapper/cmd-list.cc
@@ -29,17 +29,17 @@
 #include <snapper/SnapperTmpl.h>
 #include <snapper/BtrfsUtils.h>
 
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
-#include "proxy/locker.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
+#include "../proxy/locker.h"
 #include "GlobalOptions.h"
-#include "misc.h"
-#include "utils/TableFormatter.h"
-#include "utils/CsvFormatter.h"
-#include "utils/JsonFormatter.h"
+#include "../misc.h"
+#include "../utils/TableFormatter.h"
+#include "../utils/CsvFormatter.h"
+#include "../utils/JsonFormatter.h"
 #include "dbus/DBusMessage.h"
-#include "utils/HumanString.h"
+#include "../utils/HumanString.h"
 
 
 namespace snapper

diff --git a/client/cmd-modify.cc → client/snapper/cmd-modify.cc b/client/cmd-modify.cc → client/snapper/cmd-modify.cc
@@ -25,11 +25,11 @@
 
 #include <snapper/Filesystem.h>
 
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "misc.h"
+#include "../misc.h"
 
 
 namespace snapper

diff --git a/client/cmd-mount.cc → client/snapper/cmd-mount.cc b/client/cmd-mount.cc → client/snapper/cmd-mount.cc
@@ -23,8 +23,8 @@
 
 #include <iostream>
 
-#include "utils/text.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
 
 

diff --git a/client/cmd-rollback.cc → client/snapper/cmd-rollback.cc b/client/cmd-rollback.cc → client/snapper/cmd-rollback.cc
@@ -29,11 +29,11 @@
 #include <snapper/Filesystem.h>
 #include <snapper/PluginsImpl.h>
 
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "misc.h"
+#include "../misc.h"
 
 
 namespace snapper

diff --git a/client/cmd-set-config.cc → client/snapper/cmd-set-config.cc b/client/cmd-set-config.cc → client/snapper/cmd-set-config.cc
@@ -23,10 +23,10 @@
 
 #include <iostream>
 
-#include "utils/text.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
-#include "misc.h"
+#include "../misc.h"
 
 
 namespace snapper

diff --git a/client/cmd-setup-quota.cc → client/snapper/cmd-setup-quota.cc b/client/cmd-setup-quota.cc → client/snapper/cmd-setup-quota.cc
@@ -23,8 +23,8 @@
 
 #include <iostream>
 
-#include "utils/text.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
 
 

diff --git a/client/cmd-status.cc → client/snapper/cmd-status.cc b/client/cmd-status.cc → client/snapper/cmd-status.cc
@@ -25,9 +25,9 @@
 
 #include <snapper/AppUtil.h>
 
-#include "utils/text.h"
-#include "utils/help.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../utils/help.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
 #include "MyFiles.h"
 

diff --git a/client/cmd-umount.cc → client/snapper/cmd-umount.cc b/client/cmd-umount.cc → client/snapper/cmd-umount.cc
@@ -23,8 +23,8 @@
 
 #include <iostream>
 
-#include "utils/text.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"