]> git.ipfire.org Git - thirdparty/snapper.git/commitdiff
- moved snapper client to own directory 938/head
authorArvin Schnell <aschnell@suse.de>
Mon, 30 Sep 2024 15:51:56 +0000 (17:51 +0200)
committerArvin Schnell <aschnell@suse.de>
Mon, 30 Sep 2024 15:51:56 +0000 (17:51 +0200)
30 files changed:
client/.gitignore
client/Makefile.am
client/snapper/.gitignore [new file with mode: 0644]
client/snapper/GlobalOptions.cc [moved from client/GlobalOptions.cc with 98% similarity]
client/snapper/GlobalOptions.h [moved from client/GlobalOptions.h with 100% similarity]
client/snapper/Makefile.am [new file with mode: 0644]
client/snapper/MyFiles.cc [moved from client/MyFiles.cc with 97% similarity]
client/snapper/MyFiles.h [moved from client/MyFiles.h with 97% similarity]
client/snapper/cmd-cleanup.cc [moved from client/cmd-cleanup.cc with 98% similarity]
client/snapper/cmd-create-config.cc [moved from client/cmd-create-config.cc with 96% similarity]
client/snapper/cmd-create.cc [moved from client/cmd-create.cc with 98% similarity]
client/snapper/cmd-debug.cc [moved from client/cmd-debug.cc with 96% similarity]
client/snapper/cmd-delete-config.cc [moved from client/cmd-delete-config.cc with 96% similarity]
client/snapper/cmd-delete.cc [moved from client/cmd-delete.cc with 97% similarity]
client/snapper/cmd-diff.cc [moved from client/cmd-diff.cc with 96% similarity]
client/snapper/cmd-get-config.cc [moved from client/cmd-get-config.cc with 95% similarity]
client/snapper/cmd-list-configs.cc [moved from client/cmd-list-configs.cc with 95% similarity]
client/snapper/cmd-list.cc [moved from client/cmd-list.cc with 98% similarity]
client/snapper/cmd-modify.cc [moved from client/cmd-modify.cc with 97% similarity]
client/snapper/cmd-mount.cc [moved from client/cmd-mount.cc with 96% similarity]
client/snapper/cmd-rollback.cc [moved from client/cmd-rollback.cc with 98% similarity]
client/snapper/cmd-set-config.cc [moved from client/cmd-set-config.cc with 95% similarity]
client/snapper/cmd-setup-quota.cc [moved from client/cmd-setup-quota.cc with 96% similarity]
client/snapper/cmd-status.cc [moved from client/cmd-status.cc with 97% similarity]
client/snapper/cmd-umount.cc [moved from client/cmd-umount.cc with 96% similarity]
client/snapper/cmd-undochange.cc [moved from client/cmd-undochange.cc with 98% similarity]
client/snapper/cmd-xadiff.cc [moved from client/cmd-xadiff.cc with 98% similarity]
client/snapper/cmd.h [moved from client/cmd.h with 99% similarity]
client/snapper/snapper.cc [moved from client/snapper.cc with 98% similarity]
configure.ac

index 1c40c41830bdf1eea8837e69a0149ae25bdc2c5f..cf19bd8c5f9d4e95e7eff9f428e6e7f4e4feb52d 100644 (file)
@@ -1,4 +1,3 @@
 *.o
 *.lo
 *.la
-snapper
index f0bc8394c9daec6c6cf7825afb9daca06de2ede7..59de7e6b8de9a40d30455f928e4e4c468daa4e2b 100644 (file)
@@ -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
new file mode 100644 (file)
index 0000000..1c40c41
--- /dev/null
@@ -0,0 +1,4 @@
+*.o
+*.lo
+*.la
+snapper
similarity index 98%
rename from client/GlobalOptions.cc
rename to client/snapper/GlobalOptions.cc
index 0aa42f167fe566458e1f0a86d922a42061d1576c..47df9b1f4b26daf67e0ccd2917d72260f4ed4302 100644 (file)
@@ -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/snapper/Makefile.am b/client/snapper/Makefile.am
new file mode 100644 (file)
index 0000000..f64f37a
--- /dev/null
@@ -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)
similarity index 97%
rename from client/MyFiles.cc
rename to client/snapper/MyFiles.cc
index 48b5fe2b0afb8ee2bc53bed77f06bfe22063a253..19dd932a9c8b1d84a689e9b9b49668d08cc1afaf 100644 (file)
@@ -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>
similarity index 97%
rename from client/MyFiles.h
rename to client/snapper/MyFiles.h
index b3dfcd6ab3bb5e4c3408b739a7e09c2d91d63a7d..ddd6ae471b0f5db311a636e6296b4b7b3ec5ef71 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <snapper/File.h>
 
-#include "utils/GetOpts.h"
+#include "../utils/GetOpts.h"
 
 
 namespace snapper
similarity index 98%
rename from client/cmd-cleanup.cc
rename to client/snapper/cmd-cleanup.cc
index d07a91faaa0949318fd4647f41de8e7c07cf2b7a..9afbef15789585e877edc82f594d6914f2133923 100644 (file)
 #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"
 
 
similarity index 96%
rename from client/cmd-create-config.cc
rename to client/snapper/cmd-create-config.cc
index 0d0707d42163ff8c70e4ea7a883f8cba060a73d8..0852af47d421ce728a999a4a72a8695178d505ff 100644 (file)
@@ -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"
 
 
similarity index 98%
rename from client/cmd-create.cc
rename to client/snapper/cmd-create.cc
index 026ac8cfce63bf1c18f5c737a51c1ee122060100..4abdb63a58acb2a191c8e78d1347db1e37cad8fb 100644 (file)
 
 #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
similarity index 96%
rename from client/cmd-debug.cc
rename to client/snapper/cmd-debug.cc
index 36da6d2cea786d0abd894489f3c2327596ce4691..28d1d8db84a7bae5bfedf33979d05c51cba5c603 100644 (file)
@@ -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"
 
 
similarity index 96%
rename from client/cmd-delete-config.cc
rename to client/snapper/cmd-delete-config.cc
index ff11e02ef053c9b6c88aec1590fc72e044a2d090..4ac055f5dc677e332decd0015d81597cf27c56c6 100644 (file)
@@ -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"
 
 
similarity index 97%
rename from client/cmd-delete.cc
rename to client/snapper/cmd-delete.cc
index 2eda1c5214d224d3285f12faf5c9518c3db14d1c..60e3a7c0e0b422e5ecba3a54194204f6f4e95be3 100644 (file)
@@ -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"
 
 
similarity index 96%
rename from client/cmd-diff.cc
rename to client/snapper/cmd-diff.cc
index d24c3dd0a0c11523ea33709d934900de6a5481d1..f008f79168f4b5a623ef90de7565127468789884 100644 (file)
 
 #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"
 
 
similarity index 95%
rename from client/cmd-get-config.cc
rename to client/snapper/cmd-get-config.cc
index 0d8b4f83ec56dc7e0186e868b6503ad57364e589..e4b8e157b97b746602564dc344f40ffe31a042a8 100644 (file)
 
 #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
similarity index 95%
rename from client/cmd-list-configs.cc
rename to client/snapper/cmd-list-configs.cc
index 274cbf29abd1b64c0fe7cbe3796a3d3704b95e37..345e2542ee6f5c72948966342234b979a3bb7038 100644 (file)
 
 #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
similarity index 98%
rename from client/cmd-list.cc
rename to client/snapper/cmd-list.cc
index 70805bd8469e42bc32af3564a95fec8970c6dcc1..acb1cd7fee081510a85b29ce46d8a0d7c65b5373 100644 (file)
 #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
similarity index 97%
rename from client/cmd-modify.cc
rename to client/snapper/cmd-modify.cc
index 90c378c9621edba08bb3c904d3d296270123328b..f1066863223e13efb147a3fc7e20a60bad42c0b5 100644 (file)
 
 #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
similarity index 96%
rename from client/cmd-mount.cc
rename to client/snapper/cmd-mount.cc
index dcc0fd1e7fb04441ad58d2ec1ed18a38f3745bf7..1da525b31b6d0fc60c6303605b9a073a623a14fc 100644 (file)
@@ -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"
 
 
similarity index 98%
rename from client/cmd-rollback.cc
rename to client/snapper/cmd-rollback.cc
index a4748db1659d22b67fad6d25a70c37bfdefc9ac0..80447fba3dab38c512d23f230b8920d9cc6a0867 100644 (file)
 #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
similarity index 95%
rename from client/cmd-set-config.cc
rename to client/snapper/cmd-set-config.cc
index 234907ec1e546d34191ce8ebc81ecc7b5e4a76c2..d43e552964a00dd0471ad1095f36f7038da3558a 100644 (file)
 
 #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
similarity index 96%
rename from client/cmd-setup-quota.cc
rename to client/snapper/cmd-setup-quota.cc
index 15461922fafd649106f2a8d262382733ff655e69..d720981e53bbc72e1528718a7ca02e397f72376d 100644 (file)
@@ -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"
 
 
similarity index 97%
rename from client/cmd-status.cc
rename to client/snapper/cmd-status.cc
index be4235721e14d8f8d296b867142ee54ff382b785..2e0d3db4fee39ed47f3fdafc16e11aa9bcb49888 100644 (file)
@@ -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"
 
similarity index 96%
rename from client/cmd-umount.cc
rename to client/snapper/cmd-umount.cc
index 067af6ae301282a3e4961decfd94a65dd4789181..91e8f2b84921775fce995c3557243a31c16c1f9f 100644 (file)
@@ -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"
 
 
similarity index 98%
rename from client/cmd-undochange.cc
rename to client/snapper/cmd-undochange.cc
index a0726ca510d5f4f6eec6a8dd0b0dd0349ac1eb0c..16984145d28958d7f95257c293b0f2bf05e75a3d 100644 (file)
@@ -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"
 
similarity index 98%
rename from client/cmd-xadiff.cc
rename to client/snapper/cmd-xadiff.cc
index 15aa26dfeff713d7fe4d23bd2095988b0180f565..802b56ea56f40d2c8ed5f27437591a5c49a29acd 100644 (file)
@@ -27,8 +27,8 @@
 
 #include <snapper/XAttributes.h>
 
-#include "utils/text.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
 #include "MyFiles.h"
 
similarity index 99%
rename from client/cmd.h
rename to client/snapper/cmd.h
index 44c7d14ddbe657fdbd82a883bf6b9bf5689b3ee1..7bb5c4237710f37cfaac06ba9e1da8e5e99b2fb2 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "config.h"
 
-#include "proxy/proxy.h"
+#include "../proxy/proxy.h"
 #include "GlobalOptions.h"
 
 
similarity index 98%
rename from client/snapper.cc
rename to client/snapper/snapper.cc
index eccda08ceb729dd178dcbd5de1b3146cc65be5d4..0bf5e6ca7ea6f0fbb9e5aef900846fa4d727482d 100644 (file)
 #include <snapper/Enum.h>
 #include <snapper/Version.h>
 
-#include "utils/text.h"
-#include "utils/Table.h"
-#include "utils/GetOpts.h"
-#include "proxy/errors.h"
-#include "proxy/proxy.h"
+#include "../utils/text.h"
+#include "../utils/Table.h"
+#include "../utils/GetOpts.h"
+#include "../proxy/errors.h"
+#include "../proxy/proxy.h"
 
 #include "GlobalOptions.h"
 #include "cmd.h"
index fc2804ddcabfb5e979721ba358ee7402cbd8b227..11fcf31e518b473e423a9d0b612f07035a4280a1 100644 (file)
@@ -218,6 +218,7 @@ AC_CONFIG_FILES([
        client/Makefile
        client/utils/Makefile
        client/proxy/Makefile
+       client/snapper/Makefile
        client/mksubvolume/Makefile
        client/installation-helper/Makefile
        client/systemd-helper/Makefile