From 03ef0958fc912865565a5c236d4bf22e70709850 Mon Sep 17 00:00:00 2001 From: Doug Hoyte Date: Sun, 21 May 2023 03:32:25 -0400 Subject: [PATCH] apps refactor --- Makefile | 5 +++-- golpe | 2 +- src/{ => apps/dbutils}/cmd_compact.cpp | 0 src/{ => apps/dbutils}/cmd_delete.cpp | 0 src/{ => apps/dbutils}/cmd_dict.cpp | 0 src/{ => apps/dbutils}/cmd_export.cpp | 0 src/{ => apps/dbutils}/cmd_import.cpp | 0 src/{ => apps/dbutils}/cmd_info.cpp | 0 src/{ => apps/dbutils}/cmd_monitor.cpp | 0 src/{ => apps/dbutils}/cmd_scan.cpp | 0 src/{ => apps/mesh}/cmd_stream.cpp | 0 src/{ => apps/mesh}/cmd_sync.cpp | 0 src/{ => apps/relay}/RelayCron.cpp | 0 src/{ => apps/relay}/RelayIngester.cpp | 0 src/{ => apps/relay}/RelayNegentropy.cpp | 0 src/{ => apps/relay}/RelayReqMonitor.cpp | 0 src/{ => apps/relay}/RelayReqWorker.cpp | 0 src/{ => apps/relay}/RelayServer.h | 0 src/{ => apps/relay}/RelayWebsocket.cpp | 0 src/{ => apps/relay}/RelayWriter.cpp | 0 src/{ => apps/relay}/cmd_relay.cpp | 0 21 files changed, 4 insertions(+), 3 deletions(-) rename src/{ => apps/dbutils}/cmd_compact.cpp (100%) rename src/{ => apps/dbutils}/cmd_delete.cpp (100%) rename src/{ => apps/dbutils}/cmd_dict.cpp (100%) rename src/{ => apps/dbutils}/cmd_export.cpp (100%) rename src/{ => apps/dbutils}/cmd_import.cpp (100%) rename src/{ => apps/dbutils}/cmd_info.cpp (100%) rename src/{ => apps/dbutils}/cmd_monitor.cpp (100%) rename src/{ => apps/dbutils}/cmd_scan.cpp (100%) rename src/{ => apps/mesh}/cmd_stream.cpp (100%) rename src/{ => apps/mesh}/cmd_sync.cpp (100%) rename src/{ => apps/relay}/RelayCron.cpp (100%) rename src/{ => apps/relay}/RelayIngester.cpp (100%) rename src/{ => apps/relay}/RelayNegentropy.cpp (100%) rename src/{ => apps/relay}/RelayReqMonitor.cpp (100%) rename src/{ => apps/relay}/RelayReqWorker.cpp (100%) rename src/{ => apps/relay}/RelayServer.h (100%) rename src/{ => apps/relay}/RelayWebsocket.cpp (100%) rename src/{ => apps/relay}/RelayWriter.cpp (100%) rename src/{ => apps/relay}/cmd_relay.cpp (100%) diff --git a/Makefile b/Makefile index d2f4fd5..e457185 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ -BIN = strfry -OPT = -O3 -g +BIN ?= strfry +APPS ?= dbutils relay mesh +OPT ?= -O3 -g include golpe/rules.mk diff --git a/golpe b/golpe index dde080d..e670693 160000 --- a/golpe +++ b/golpe @@ -1 +1 @@ -Subproject commit dde080d39a47197080cc11190797953783233a67 +Subproject commit e6706930d151fa327042371a6f38c169f5526108 diff --git a/src/cmd_compact.cpp b/src/apps/dbutils/cmd_compact.cpp similarity index 100% rename from src/cmd_compact.cpp rename to src/apps/dbutils/cmd_compact.cpp diff --git a/src/cmd_delete.cpp b/src/apps/dbutils/cmd_delete.cpp similarity index 100% rename from src/cmd_delete.cpp rename to src/apps/dbutils/cmd_delete.cpp diff --git a/src/cmd_dict.cpp b/src/apps/dbutils/cmd_dict.cpp similarity index 100% rename from src/cmd_dict.cpp rename to src/apps/dbutils/cmd_dict.cpp diff --git a/src/cmd_export.cpp b/src/apps/dbutils/cmd_export.cpp similarity index 100% rename from src/cmd_export.cpp rename to src/apps/dbutils/cmd_export.cpp diff --git a/src/cmd_import.cpp b/src/apps/dbutils/cmd_import.cpp similarity index 100% rename from src/cmd_import.cpp rename to src/apps/dbutils/cmd_import.cpp diff --git a/src/cmd_info.cpp b/src/apps/dbutils/cmd_info.cpp similarity index 100% rename from src/cmd_info.cpp rename to src/apps/dbutils/cmd_info.cpp diff --git a/src/cmd_monitor.cpp b/src/apps/dbutils/cmd_monitor.cpp similarity index 100% rename from src/cmd_monitor.cpp rename to src/apps/dbutils/cmd_monitor.cpp diff --git a/src/cmd_scan.cpp b/src/apps/dbutils/cmd_scan.cpp similarity index 100% rename from src/cmd_scan.cpp rename to src/apps/dbutils/cmd_scan.cpp diff --git a/src/cmd_stream.cpp b/src/apps/mesh/cmd_stream.cpp similarity index 100% rename from src/cmd_stream.cpp rename to src/apps/mesh/cmd_stream.cpp diff --git a/src/cmd_sync.cpp b/src/apps/mesh/cmd_sync.cpp similarity index 100% rename from src/cmd_sync.cpp rename to src/apps/mesh/cmd_sync.cpp diff --git a/src/RelayCron.cpp b/src/apps/relay/RelayCron.cpp similarity index 100% rename from src/RelayCron.cpp rename to src/apps/relay/RelayCron.cpp diff --git a/src/RelayIngester.cpp b/src/apps/relay/RelayIngester.cpp similarity index 100% rename from src/RelayIngester.cpp rename to src/apps/relay/RelayIngester.cpp diff --git a/src/RelayNegentropy.cpp b/src/apps/relay/RelayNegentropy.cpp similarity index 100% rename from src/RelayNegentropy.cpp rename to src/apps/relay/RelayNegentropy.cpp diff --git a/src/RelayReqMonitor.cpp b/src/apps/relay/RelayReqMonitor.cpp similarity index 100% rename from src/RelayReqMonitor.cpp rename to src/apps/relay/RelayReqMonitor.cpp diff --git a/src/RelayReqWorker.cpp b/src/apps/relay/RelayReqWorker.cpp similarity index 100% rename from src/RelayReqWorker.cpp rename to src/apps/relay/RelayReqWorker.cpp diff --git a/src/RelayServer.h b/src/apps/relay/RelayServer.h similarity index 100% rename from src/RelayServer.h rename to src/apps/relay/RelayServer.h diff --git a/src/RelayWebsocket.cpp b/src/apps/relay/RelayWebsocket.cpp similarity index 100% rename from src/RelayWebsocket.cpp rename to src/apps/relay/RelayWebsocket.cpp diff --git a/src/RelayWriter.cpp b/src/apps/relay/RelayWriter.cpp similarity index 100% rename from src/RelayWriter.cpp rename to src/apps/relay/RelayWriter.cpp diff --git a/src/cmd_relay.cpp b/src/apps/relay/cmd_relay.cpp similarity index 100% rename from src/cmd_relay.cpp rename to src/apps/relay/cmd_relay.cpp