From 36b8889a6235377ef9e8ef92b63f67844f27b407 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Thu, 16 Feb 2023 22:58:20 -0300 Subject: [PATCH] move knowledge base into the library --- src/lib/meson.build | 4 ++++ src/{ => lib}/models/action.cpp | 0 src/{ => lib}/models/action.h | 0 src/{ => lib}/models/entity.cpp | 0 src/{ => lib}/models/entity.h | 0 src/{ => lib}/models/error.h | 0 src/{ => lib}/models/fact.cpp | 0 src/{ => lib}/models/fact.h | 0 src/{ => lib}/models/meson.build | 0 src/{ => lib}/models/rule.cpp | 0 src/{ => lib}/models/rule.h | 0 src/{ => lib}/models/suggest_action.cpp | 0 src/{ => lib}/models/suggest_action.h | 0 src/{ => lib}/models/verb.cpp | 0 src/{ => lib}/models/verb.h | 0 src/meson.build | 3 --- 16 files changed, 4 insertions(+), 3 deletions(-) rename src/{ => lib}/models/action.cpp (100%) rename src/{ => lib}/models/action.h (100%) rename src/{ => lib}/models/entity.cpp (100%) rename src/{ => lib}/models/entity.h (100%) rename src/{ => lib}/models/error.h (100%) rename src/{ => lib}/models/fact.cpp (100%) rename src/{ => lib}/models/fact.h (100%) rename src/{ => lib}/models/meson.build (100%) rename src/{ => lib}/models/rule.cpp (100%) rename src/{ => lib}/models/rule.h (100%) rename src/{ => lib}/models/suggest_action.cpp (100%) rename src/{ => lib}/models/suggest_action.h (100%) rename src/{ => lib}/models/verb.cpp (100%) rename src/{ => lib}/models/verb.h (100%) diff --git a/src/lib/meson.build b/src/lib/meson.build index 95e1948..a81ecb3 100644 --- a/src/lib/meson.build +++ b/src/lib/meson.build @@ -6,10 +6,14 @@ configure_file(input : 'version.h.in', configuration : conf_data ) +subdir('models') + obelisk_lib_sources = files( 'obelisk.cpp' ) +obelisk_lib_sources += obelisk_model_sources + sqlite3 = dependency('sqlite3') incdirs = include_directories(['.', 'include']) diff --git a/src/models/action.cpp b/src/lib/models/action.cpp similarity index 100% rename from src/models/action.cpp rename to src/lib/models/action.cpp diff --git a/src/models/action.h b/src/lib/models/action.h similarity index 100% rename from src/models/action.h rename to src/lib/models/action.h diff --git a/src/models/entity.cpp b/src/lib/models/entity.cpp similarity index 100% rename from src/models/entity.cpp rename to src/lib/models/entity.cpp diff --git a/src/models/entity.h b/src/lib/models/entity.h similarity index 100% rename from src/models/entity.h rename to src/lib/models/entity.h diff --git a/src/models/error.h b/src/lib/models/error.h similarity index 100% rename from src/models/error.h rename to src/lib/models/error.h diff --git a/src/models/fact.cpp b/src/lib/models/fact.cpp similarity index 100% rename from src/models/fact.cpp rename to src/lib/models/fact.cpp diff --git a/src/models/fact.h b/src/lib/models/fact.h similarity index 100% rename from src/models/fact.h rename to src/lib/models/fact.h diff --git a/src/models/meson.build b/src/lib/models/meson.build similarity index 100% rename from src/models/meson.build rename to src/lib/models/meson.build diff --git a/src/models/rule.cpp b/src/lib/models/rule.cpp similarity index 100% rename from src/models/rule.cpp rename to src/lib/models/rule.cpp diff --git a/src/models/rule.h b/src/lib/models/rule.h similarity index 100% rename from src/models/rule.h rename to src/lib/models/rule.h diff --git a/src/models/suggest_action.cpp b/src/lib/models/suggest_action.cpp similarity index 100% rename from src/models/suggest_action.cpp rename to src/lib/models/suggest_action.cpp diff --git a/src/models/suggest_action.h b/src/lib/models/suggest_action.h similarity index 100% rename from src/models/suggest_action.h rename to src/lib/models/suggest_action.h diff --git a/src/models/verb.cpp b/src/lib/models/verb.cpp similarity index 100% rename from src/models/verb.cpp rename to src/lib/models/verb.cpp diff --git a/src/models/verb.h b/src/lib/models/verb.h similarity index 100% rename from src/models/verb.h rename to src/lib/models/verb.h diff --git a/src/meson.build b/src/meson.build index e6090d7..a97b4ea 100644 --- a/src/meson.build +++ b/src/meson.build @@ -12,9 +12,6 @@ sqlite3 = dependency('sqlite3') subdir('ast') obelisk_sources += obelisk_ast_sources -subdir('models') -obelisk_sources += obelisk_model_sources - r = run_command('llvm-config', '--cppflags', check : true) cpp_args = ' ' + r.stdout().replace('\n', ' ').replace('-I', '-isystem')