Moves files to wayfire subdir and fixes all make scripts.

WayfireWM · Feb 29, 2020 · bf9e222 · bf9e222
1 parent 70d6e04
commit bf9e222
Show file tree

Hide file tree

Showing 32 changed files with 78 additions and 78 deletions.
diff --git a/Doxyfile.in b/Doxyfile.in
@@ -829,12 +829,12 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = "@TOP_SRCDIR@/action" \
-                         "@TOP_SRCDIR@/condition" \
-                         "@TOP_SRCDIR@/lexer" \
-                         "@TOP_SRCDIR@/parser" \
-                         "@TOP_SRCDIR@/rule" \
-                         "@TOP_SRCDIR@" \
+INPUT                  = "@TOP_SRCDIR@/wayfire/action" \
+                         "@TOP_SRCDIR@/wayfire/condition" \
+                         "@TOP_SRCDIR@/wayfire/lexer" \
+                         "@TOP_SRCDIR@/wayfire/parser" \
+                         "@TOP_SRCDIR@/wayfire/rule" \
+                         "@TOP_SRCDIR@/wayfire" \
                          "@README_PATH@"
 
 # This tag can be used to specify the character encoding of the source files

diff --git a/Makefile b/Makefile
@@ -5,20 +5,20 @@ PROJECT := ruleparser
 
 # List of source files.
 SOURCES := \
-	action/action.cpp \
-	condition/condition.cpp \
-	condition/logic_condition.cpp \
-	condition/test_condition.cpp \
-	lexer/lexer.cpp \
-	lexer/literal.cpp \
-	lexer/symbol.cpp \
+	wayfire/action/action.cpp \
+	wayfire/condition/condition.cpp \
+	wayfire/condition/logic_condition.cpp \
+	wayfire/condition/test_condition.cpp \
+	wayfire/lexer/lexer.cpp \
+	wayfire/lexer/literal.cpp \
+	wayfire/lexer/symbol.cpp \
+	wayfire/parser/action_parser.cpp \
+	wayfire/parser/condition_parser.cpp \
+	wayfire/parser/rule_parser.cpp \
+	wayfire/rule/rule.cpp \
+	wayfire/rule/rule_interface.cpp \
+	wayfire/variant.cpp \
 	main.cpp \
-	parser/action_parser.cpp \
-	parser/condition_parser.cpp \
-	parser/rule_parser.cpp \
-	rule/rule.cpp \
-	rule/rule_interface.cpp \
-	variant.cpp \
 
 # List of system source files.
 SYSTEMSOURCES := \

diff --git a/main.cpp b/main.cpp
@@ -1,8 +1,8 @@
-#include "lexer/lexer.hpp"
-#include "parser/rule_parser.hpp"
-#include "rule/rule.hpp"
-#include "rule/rule_interface.hpp"
-#include "variant.hpp"
+#include "wayfire/lexer/lexer.hpp"
+#include "wayfire/parser/rule_parser.hpp"
+#include "wayfire/rule/rule.hpp"
+#include "wayfire/rule/rule_interface.hpp"
+#include "wayfire/variant.hpp"
 #include <algorithm>
 #include <iostream>
 #include <memory>

diff --git a/meson.build b/meson.build
@@ -14,19 +14,19 @@ project(
 add_project_arguments(['-Wno-deprecated-declarations'], language: ['cpp'])
 
 sources = [
-'action/action.cpp',
-'condition/condition.cpp',
-'condition/logic_condition.cpp',
-'condition/test_condition.cpp',
-'lexer/lexer.cpp',
-'lexer/literal.cpp',
-'lexer/symbol.cpp',
-'parser/action_parser.cpp',
-'parser/condition_parser.cpp',
-'parser/rule_parser.cpp',
-'rule/rule.cpp',
-'rule/rule_interface.cpp',
-'variant.cpp',
+'wayfire/action/action.cpp',
+'wayfire/condition/condition.cpp',
+'wayfire/condition/logic_condition.cpp',
+'wayfire/condition/test_condition.cpp',
+'wayfire/lexer/lexer.cpp',
+'wayfire/lexer/literal.cpp',
+'wayfire/lexer/symbol.cpp',
+'wayfire/parser/action_parser.cpp',
+'wayfire/parser/condition_parser.cpp',
+'wayfire/parser/rule_parser.cpp',
+'wayfire/rule/rule.cpp',
+'wayfire/rule/rule_interface.cpp',
+'wayfire/variant.cpp',
 ]
 
 wfutils_inc = include_directories('.')
@@ -54,35 +54,35 @@ wfutils = declare_dependency(link_with: lib_wfutils,
 # -------------------------------------------------------------------------------------------------
 # Install headers
 headers_action = [
-'action/action.hpp',
+'wayfire/action/action.hpp',
 ]
 
 headers_condition = [
-'condition/condition.hpp',
-'condition/logic_condition.hpp',
-'condition/test_condition.hpp',
+'wayfire/condition/condition.hpp',
+'wayfire/condition/logic_condition.hpp',
+'wayfire/condition/test_condition.hpp',
 ]
 
 headers_lexer = [
-'lexer/lexer.hpp',
-'lexer/literal.hpp',
-'lexer/symbol.hpp',
+'wayfire/lexer/lexer.hpp',
+'wayfire/lexer/literal.hpp',
+'wayfire/lexer/symbol.hpp',
 ]
 
 headers_parser = [
-'parser/action_parser.hpp',
-'parser/condition_parser.hpp',
-'parser/rule_parser.hpp',
+'wayfire/parser/action_parser.hpp',
+'wayfire/parser/condition_parser.hpp',
+'wayfire/parser/rule_parser.hpp',
 ]
 
 headers_rule = [
-'rule/rule.hpp',
-'rule/rule_interface.hpp',
+'wayfire/rule/rule.hpp',
+'wayfire/rule/rule_interface.hpp',
 ]
 
 headers_root = [
-'utils.hpp',
-'variant.hpp',
+'wayfire/utils.hpp',
+'wayfire/variant.hpp',
 ]
 
 install_headers(headers_action, subdir: 'wayfire/action')

diff --git a/parser.pro b/parser.pro
@@ -4,36 +4,36 @@ CONFIG -= app_bundle
 CONFIG -= qt
 
 SOURCES += \
-    lexer/lexer.cpp \
-    lexer/literal.cpp \
-    lexer/symbol.cpp \
-    parser/rule_parser.cpp \
-    parser/action_parser.cpp \
-    parser/condition_parser.cpp \
+    wayfire/lexer/lexer.cpp \
+    wayfire/lexer/literal.cpp \
+    wayfire/lexer/symbol.cpp \
+    wayfire/parser/rule_parser.cpp \
+    wayfire/parser/action_parser.cpp \
+    wayfire/parser/condition_parser.cpp \
+    wayfire/action/action.cpp \
+    wayfire/rule/rule.cpp \
+    wayfire/rule/rule_interface.cpp \
+    wayfire/condition/condition.cpp \
+    wayfire/condition/logic_condition.cpp \
+    wayfire/condition/test_condition.cpp \
+    wayfire/variant.cpp \
     main.cpp \
-    action/action.cpp \
-    rule/rule.cpp \
-    rule/rule_interface.cpp \
-    condition/condition.cpp \
-    condition/logic_condition.cpp \
-    condition/test_condition.cpp \
-    variant.cpp
 
 HEADERS += \
-    action/action.hpp \
-    lexer/lexer.hpp \
-    lexer/literal.hpp \
-    lexer/symbol.hpp \
-    parser/rule_parser.hpp \
-    parser/condition_parser.hpp \
-    parser/action_parser.hpp \
-    utils.hpp \
-    condition/condition.hpp \
-    rule/rule.hpp \
-    rule/rule_interface.hpp \
-    condition/logic_condition.hpp \
-    condition/test_condition.hpp \
-    variant.hpp
+    wayfire/action/action.hpp \
+    wayfire/lexer/lexer.hpp \
+    wayfire/lexer/literal.hpp \
+    wayfire/lexer/symbol.hpp \
+    wayfire/parser/rule_parser.hpp \
+    wayfire/parser/condition_parser.hpp \
+    wayfire/parser/action_parser.hpp \
+    wayfire/utils.hpp \
+    wayfire/condition/condition.hpp \
+    wayfire/rule/rule.hpp \
+    wayfire/rule/rule_interface.hpp \
+    wayfire/condition/logic_condition.hpp \
+    wayfire/condition/test_condition.hpp \
+    wayfire/variant.hpp
 
 DISTFILES += \
     meson.build \

diff --git a/action/action.cpp → wayfire/action/action.cpp b/action/action.cpp → wayfire/action/action.cpp
diff --git a/action/action.hpp → wayfire/action/action.hpp b/action/action.hpp → wayfire/action/action.hpp
diff --git a/condition/condition.cpp → wayfire/condition/condition.cpp b/condition/condition.cpp → wayfire/condition/condition.cpp
diff --git a/condition/condition.hpp → wayfire/condition/condition.hpp b/condition/condition.hpp → wayfire/condition/condition.hpp
diff --git a/condition/logic_condition.cpp → wayfire/condition/logic_condition.cpp b/condition/logic_condition.cpp → wayfire/condition/logic_condition.cpp
diff --git a/condition/logic_condition.hpp → wayfire/condition/logic_condition.hpp b/condition/logic_condition.hpp → wayfire/condition/logic_condition.hpp
diff --git a/condition/test_condition.cpp → wayfire/condition/test_condition.cpp b/condition/test_condition.cpp → wayfire/condition/test_condition.cpp
diff --git a/condition/test_condition.hpp → wayfire/condition/test_condition.hpp b/condition/test_condition.hpp → wayfire/condition/test_condition.hpp
diff --git a/lexer/lexer.cpp → wayfire/lexer/lexer.cpp b/lexer/lexer.cpp → wayfire/lexer/lexer.cpp
diff --git a/lexer/lexer.hpp → wayfire/lexer/lexer.hpp b/lexer/lexer.hpp → wayfire/lexer/lexer.hpp
diff --git a/lexer/literal.cpp → wayfire/lexer/literal.cpp b/lexer/literal.cpp → wayfire/lexer/literal.cpp
diff --git a/lexer/literal.hpp → wayfire/lexer/literal.hpp b/lexer/literal.hpp → wayfire/lexer/literal.hpp
diff --git a/lexer/symbol.cpp → wayfire/lexer/symbol.cpp b/lexer/symbol.cpp → wayfire/lexer/symbol.cpp
diff --git a/lexer/symbol.hpp → wayfire/lexer/symbol.hpp b/lexer/symbol.hpp → wayfire/lexer/symbol.hpp
diff --git a/parser/action_parser.cpp → wayfire/parser/action_parser.cpp b/parser/action_parser.cpp → wayfire/parser/action_parser.cpp
diff --git a/parser/action_parser.hpp → wayfire/parser/action_parser.hpp b/parser/action_parser.hpp → wayfire/parser/action_parser.hpp
diff --git a/parser/condition_parser.cpp → wayfire/parser/condition_parser.cpp b/parser/condition_parser.cpp → wayfire/parser/condition_parser.cpp
diff --git a/parser/condition_parser.hpp → wayfire/parser/condition_parser.hpp b/parser/condition_parser.hpp → wayfire/parser/condition_parser.hpp
diff --git a/parser/rule_parser.cpp → wayfire/parser/rule_parser.cpp b/parser/rule_parser.cpp → wayfire/parser/rule_parser.cpp
diff --git a/parser/rule_parser.hpp → wayfire/parser/rule_parser.hpp b/parser/rule_parser.hpp → wayfire/parser/rule_parser.hpp
diff --git a/rule/rule.cpp → wayfire/rule/rule.cpp b/rule/rule.cpp → wayfire/rule/rule.cpp
diff --git a/rule/rule.hpp → wayfire/rule/rule.hpp b/rule/rule.hpp → wayfire/rule/rule.hpp
diff --git a/rule/rule_interface.cpp → wayfire/rule/rule_interface.cpp b/rule/rule_interface.cpp → wayfire/rule/rule_interface.cpp
diff --git a/rule/rule_interface.hpp → wayfire/rule/rule_interface.hpp b/rule/rule_interface.hpp → wayfire/rule/rule_interface.hpp
diff --git a/utils.hpp → wayfire/utils.hpp b/utils.hpp → wayfire/utils.hpp
diff --git a/variant.cpp → wayfire/variant.cpp b/variant.cpp → wayfire/variant.cpp
diff --git a/variant.hpp → wayfire/variant.hpp b/variant.hpp → wayfire/variant.hpp