From 602b148fb4157f29931261212a2f1ea9f577ae3d Mon Sep 17 00:00:00 2001 From: Rico Tiongson Date: Tue, 12 Feb 2019 19:04:31 +0800 Subject: [PATCH] Move library to root --- src/compile => compile.sh | 0 src/defaults.conf => defaults.conf | 0 install | 4 ++-- {src/lib => lib}/comfortable_swipe | 0 {src/lib => lib}/gesture/swipe_gesture.cpp | 0 {src/lib => lib}/gesture/swipe_gesture.h | 0 {src/lib => lib}/gesture/swipe_gesture.regex.cpp | 0 {src/lib => lib}/gesture/xdo_gesture.cpp | 0 {src/lib => lib}/gesture/xdo_gesture.h | 0 {src/lib => lib}/index.hpp | 0 {src/lib => lib}/service/autostart.cpp | 0 {src/lib => lib}/service/buffer.cpp | 0 {src/lib => lib}/service/help.cpp | 0 {src/lib => lib}/service/restart.cpp | 0 {src/lib => lib}/service/start.cpp | 0 {src/lib => lib}/service/stop.cpp | 0 {src/lib => lib}/util/autostart_filename.cpp | 0 {src/lib => lib}/util/conf_filename.cpp | 0 {src/lib => lib}/util/read_config_file.cpp | 0 src/main.cpp => main.cpp | 6 ++---- tests/test_regex.cpp | 4 ++-- 21 files changed, 6 insertions(+), 8 deletions(-) rename src/compile => compile.sh (100%) rename src/defaults.conf => defaults.conf (100%) rename {src/lib => lib}/comfortable_swipe (100%) rename {src/lib => lib}/gesture/swipe_gesture.cpp (100%) rename {src/lib => lib}/gesture/swipe_gesture.h (100%) rename {src/lib => lib}/gesture/swipe_gesture.regex.cpp (100%) rename {src/lib => lib}/gesture/xdo_gesture.cpp (100%) rename {src/lib => lib}/gesture/xdo_gesture.h (100%) rename {src/lib => lib}/index.hpp (100%) rename {src/lib => lib}/service/autostart.cpp (100%) rename {src/lib => lib}/service/buffer.cpp (100%) rename {src/lib => lib}/service/help.cpp (100%) rename {src/lib => lib}/service/restart.cpp (100%) rename {src/lib => lib}/service/start.cpp (100%) rename {src/lib => lib}/service/stop.cpp (100%) rename {src/lib => lib}/util/autostart_filename.cpp (100%) rename {src/lib => lib}/util/conf_filename.cpp (100%) rename {src/lib => lib}/util/read_config_file.cpp (100%) rename src/main.cpp => main.cpp (96%) diff --git a/src/compile b/compile.sh similarity index 100% rename from src/compile rename to compile.sh diff --git a/src/defaults.conf b/defaults.conf similarity index 100% rename from src/defaults.conf rename to defaults.conf diff --git a/install b/install index d81d328..6f9cf51 100755 --- a/install +++ b/install @@ -3,7 +3,7 @@ DIR=$(dirname $0) PROGRAM=/usr/local/bin/comfortable-swipe CONF_PATH=/usr/local/share/comfortable-swipe/comfortable-swipe.conf -DCONF_PATH=$DIR/src/defaults.conf +DCONF_PATH=$DIR/defaults.conf OLD_CONF_PATH=${XDG_CONFIG_HOME:-$HOME/.config}/comfortable-swipe.conf if [ -x "$(command -v $PROGRAM)" ]; then @@ -50,7 +50,7 @@ if [ -x "$(command -v $PROGRAM)" ]; then fi # compile library -sudo $DIR/src/compile $PROGRAM || abort +sudo $DIR/compile.sh $PROGRAM || abort # add permissions to input group (defer) # GROUP=$(ls -l /dev/input/event* | awk '{print $4}' | head --line=1) || abort diff --git a/src/lib/comfortable_swipe b/lib/comfortable_swipe similarity index 100% rename from src/lib/comfortable_swipe rename to lib/comfortable_swipe diff --git a/src/lib/gesture/swipe_gesture.cpp b/lib/gesture/swipe_gesture.cpp similarity index 100% rename from src/lib/gesture/swipe_gesture.cpp rename to lib/gesture/swipe_gesture.cpp diff --git a/src/lib/gesture/swipe_gesture.h b/lib/gesture/swipe_gesture.h similarity index 100% rename from src/lib/gesture/swipe_gesture.h rename to lib/gesture/swipe_gesture.h diff --git a/src/lib/gesture/swipe_gesture.regex.cpp b/lib/gesture/swipe_gesture.regex.cpp similarity index 100% rename from src/lib/gesture/swipe_gesture.regex.cpp rename to lib/gesture/swipe_gesture.regex.cpp diff --git a/src/lib/gesture/xdo_gesture.cpp b/lib/gesture/xdo_gesture.cpp similarity index 100% rename from src/lib/gesture/xdo_gesture.cpp rename to lib/gesture/xdo_gesture.cpp diff --git a/src/lib/gesture/xdo_gesture.h b/lib/gesture/xdo_gesture.h similarity index 100% rename from src/lib/gesture/xdo_gesture.h rename to lib/gesture/xdo_gesture.h diff --git a/src/lib/index.hpp b/lib/index.hpp similarity index 100% rename from src/lib/index.hpp rename to lib/index.hpp diff --git a/src/lib/service/autostart.cpp b/lib/service/autostart.cpp similarity index 100% rename from src/lib/service/autostart.cpp rename to lib/service/autostart.cpp diff --git a/src/lib/service/buffer.cpp b/lib/service/buffer.cpp similarity index 100% rename from src/lib/service/buffer.cpp rename to lib/service/buffer.cpp diff --git a/src/lib/service/help.cpp b/lib/service/help.cpp similarity index 100% rename from src/lib/service/help.cpp rename to lib/service/help.cpp diff --git a/src/lib/service/restart.cpp b/lib/service/restart.cpp similarity index 100% rename from src/lib/service/restart.cpp rename to lib/service/restart.cpp diff --git a/src/lib/service/start.cpp b/lib/service/start.cpp similarity index 100% rename from src/lib/service/start.cpp rename to lib/service/start.cpp diff --git a/src/lib/service/stop.cpp b/lib/service/stop.cpp similarity index 100% rename from src/lib/service/stop.cpp rename to lib/service/stop.cpp diff --git a/src/lib/util/autostart_filename.cpp b/lib/util/autostart_filename.cpp similarity index 100% rename from src/lib/util/autostart_filename.cpp rename to lib/util/autostart_filename.cpp diff --git a/src/lib/util/conf_filename.cpp b/lib/util/conf_filename.cpp similarity index 100% rename from src/lib/util/conf_filename.cpp rename to lib/util/conf_filename.cpp diff --git a/src/lib/util/read_config_file.cpp b/lib/util/read_config_file.cpp similarity index 100% rename from src/lib/util/read_config_file.cpp rename to lib/util/read_config_file.cpp diff --git a/src/main.cpp b/main.cpp similarity index 96% rename from src/main.cpp rename to main.cpp index 8698f1b..de1118b 100644 --- a/src/main.cpp +++ b/main.cpp @@ -16,8 +16,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -// Compile: g++ main.cpp -std=c++11 -lxdo - #include // std::string #include "lib/comfortable_swipe" @@ -28,7 +26,7 @@ int main(int argc, char** args) if (argc > 1) { std::string arg = args[1]; - + // select based on argument if (arg == "start") comfortable_swipe::service::start(); @@ -52,4 +50,4 @@ int main(int argc, char** args) comfortable_swipe::service::help(); return 0; -} \ No newline at end of file +} diff --git a/tests/test_regex.cpp b/tests/test_regex.cpp index a54fd2f..f2a524b 100644 --- a/tests/test_regex.cpp +++ b/tests/test_regex.cpp @@ -2,8 +2,8 @@ #include #include #include -#include "../src/lib/gesture/swipe_gesture.h" -#include "../src/lib/gesture/swipe_gesture.regex.cpp" +#include "../lib/gesture/swipe_gesture.h" +#include "../lib/gesture/swipe_gesture.regex.cpp" /* Comfortable Swipe