Move library to root

2019-02-12 19:04:31 +08:00 · 2019-02-12 19:04:31 +08:00 · 602b148fb4
commit 602b148fb4
parent 68bea125e3
21 changed files with 6 additions and 8 deletions
--- a/src/compile
+++ b/src/compile
--- a/src/defaults.conf
+++ b/src/defaults.conf
--- a/4
+++ b/4
@ -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
--- a/src/lib/comfortable_swipe
+++ b/src/lib/comfortable_swipe
--- a/src/lib/gesture/swipe_gesture.cpp
+++ b/src/lib/gesture/swipe_gesture.cpp
--- a/src/lib/gesture/swipe_gesture.h
+++ b/src/lib/gesture/swipe_gesture.h
--- a/src/lib/gesture/swipe_gesture.regex.cpp
+++ b/src/lib/gesture/swipe_gesture.regex.cpp
--- a/src/lib/gesture/xdo_gesture.cpp
+++ b/src/lib/gesture/xdo_gesture.cpp
--- a/src/lib/gesture/xdo_gesture.h
+++ b/src/lib/gesture/xdo_gesture.h
--- a/src/lib/index.hpp
+++ b/src/lib/index.hpp
--- a/src/lib/service/autostart.cpp
+++ b/src/lib/service/autostart.cpp
--- a/src/lib/service/buffer.cpp
+++ b/src/lib/service/buffer.cpp
--- a/src/lib/service/help.cpp
+++ b/src/lib/service/help.cpp
--- a/src/lib/service/restart.cpp
+++ b/src/lib/service/restart.cpp
--- a/src/lib/service/start.cpp
+++ b/src/lib/service/start.cpp
--- a/src/lib/service/stop.cpp
+++ b/src/lib/service/stop.cpp
--- a/src/lib/util/autostart_filename.cpp
+++ b/src/lib/util/autostart_filename.cpp
--- a/src/lib/util/conf_filename.cpp
+++ b/src/lib/util/conf_filename.cpp
--- a/src/lib/util/read_config_file.cpp
+++ b/src/lib/util/read_config_file.cpp
--- a/src/main.cpp
+++ b/src/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 <http://www.gnu.org/licenses/>.
 */

-// Compile: g++ main.cpp -std=c++11 -lxdo 
-
 #include <string> // std::string
 #include "lib/comfortable_swipe"

--- a/tests/test_regex.cpp
+++ b/tests/test_regex.cpp
@ -2,8 +2,8 @@
 #include <cassert>
 #include <regex>
 #include <string>
-#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