From 73b542a4dbbe74d678fa35e8810d20fbf0906aa3 Mon Sep 17 00:00:00 2001 From: WarmUpTill <19472752+WarmUpTill@users.noreply.github.com> Date: Fri, 6 Jun 2025 20:10:15 +0200 Subject: [PATCH] Move scripting support to seperate project --- CMakeLists.txt | 11 -------- plugins/CMakeLists.txt | 1 + plugins/scripting/CMakeLists.txt | 28 +++++++++++++++++++ .../scripting}/macro-action-script.cpp | 1 - .../scripting}/macro-action-script.hpp | 0 .../scripting}/macro-condition-script.cpp | 0 .../scripting}/macro-condition-script.hpp | 0 .../scripting}/macro-script-handler.cpp | 0 .../scripting}/macro-script-handler.hpp | 0 .../scripting}/macro-segment-script.cpp | 0 .../scripting}/macro-segment-script.hpp | 0 .../scripting}/utils/properties-view.cpp | 0 .../scripting}/utils/properties-view.hpp | 0 .../scripting}/utils/properties-view.moc.hpp | 0 14 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 plugins/scripting/CMakeLists.txt rename {lib/macro => plugins/scripting}/macro-action-script.cpp (98%) rename {lib/macro => plugins/scripting}/macro-action-script.hpp (100%) rename {lib/macro => plugins/scripting}/macro-condition-script.cpp (100%) rename {lib/macro => plugins/scripting}/macro-condition-script.hpp (100%) rename {lib/macro => plugins/scripting}/macro-script-handler.cpp (100%) rename {lib/macro => plugins/scripting}/macro-script-handler.hpp (100%) rename {lib/macro => plugins/scripting}/macro-segment-script.cpp (100%) rename {lib/macro => plugins/scripting}/macro-segment-script.hpp (100%) rename {lib => plugins/scripting}/utils/properties-view.cpp (100%) rename {lib => plugins/scripting}/utils/properties-view.hpp (100%) rename {lib => plugins/scripting}/utils/properties-view.moc.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7e90481b..de4001db 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,8 +103,6 @@ target_sources( lib/macro/macro-action-macro.hpp lib/macro/macro-action-queue.cpp lib/macro/macro-action-queue.hpp - lib/macro/macro-action-script.cpp - lib/macro/macro-action-script.hpp lib/macro/macro-action-variable.cpp lib/macro/macro-action-variable.hpp lib/macro/macro-action.cpp @@ -117,8 +115,6 @@ target_sources( lib/macro/macro-condition-macro.hpp lib/macro/macro-condition-queue.cpp lib/macro/macro-condition-queue.hpp - lib/macro/macro-condition-script.cpp - lib/macro/macro-condition-script.hpp lib/macro/macro-condition-tempvar.cpp lib/macro/macro-condition-tempvar.hpp lib/macro/macro-condition-variable.cpp @@ -139,14 +135,10 @@ target_sources( lib/macro/macro-ref.hpp lib/macro/macro-run-button.cpp lib/macro/macro-run-button.hpp - lib/macro/macro-script-handler.cpp - lib/macro/macro-script-handler.hpp lib/macro/macro-segment-copy-paste.cpp lib/macro/macro-segment-copy-paste.hpp lib/macro/macro-segment-list.cpp lib/macro/macro-segment-list.hpp - lib/macro/macro-segment-script.cpp - lib/macro/macro-segment-script.hpp lib/macro/macro-segment-selection.cpp lib/macro/macro-segment-selection.hpp lib/macro/macro-segment.cpp @@ -223,9 +215,6 @@ target_sources( lib/utils/plugin-state-helpers.hpp lib/utils/priority-helper.cpp lib/utils/priority-helper.hpp - lib/utils/properties-view.cpp - lib/utils/properties-view.hpp - lib/utils/properties-view.moc.hpp lib/utils/regex-config.cpp lib/utils/regex-config.hpp lib/utils/resizing-text-edit.cpp diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt index 2f6a38f9..9670718f 100644 --- a/plugins/CMakeLists.txt +++ b/plugins/CMakeLists.txt @@ -32,6 +32,7 @@ add_plugin(http) add_plugin(midi) add_plugin(mqtt) add_plugin(openvr) +add_plugin(scripting) add_plugin(stream-deck) add_plugin(twitch) add_plugin(usb) diff --git a/plugins/scripting/CMakeLists.txt b/plugins/scripting/CMakeLists.txt new file mode 100644 index 00000000..4f0d8ef5 --- /dev/null +++ b/plugins/scripting/CMakeLists.txt @@ -0,0 +1,28 @@ +cmake_minimum_required(VERSION 3.14) +project(advanced-scene-switcher-scripting) + +# --- End of section --- + +add_library(${PROJECT_NAME} MODULE) + +target_sources( + ${PROJECT_NAME} + PRIVATE macro-action-script.cpp + macro-action-script.hpp + macro-condition-script.cpp + macro-condition-script.hpp + macro-script-handler.cpp + macro-script-handler.hpp + macro-segment-script.cpp + macro-segment-script.hpp) + +target_sources( + ${PROJECT_NAME} PRIVATE utils/properties-view.cpp utils/properties-view.hpp + utils/properties-view.moc.hpp) + +target_include_directories(${PROJECT_NAME} + PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/utils") + +setup_advss_plugin(${PROJECT_NAME}) +set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") +install_advss_plugin(${PROJECT_NAME}) diff --git a/lib/macro/macro-action-script.cpp b/plugins/scripting/macro-action-script.cpp similarity index 98% rename from lib/macro/macro-action-script.cpp rename to plugins/scripting/macro-action-script.cpp index 8ec122d4..9659fa70 100644 --- a/lib/macro/macro-action-script.cpp +++ b/plugins/scripting/macro-action-script.cpp @@ -1,7 +1,6 @@ #include "macro-action-script.hpp" #include "layout-helpers.hpp" #include "macro-helpers.hpp" -#include "properties-view.hpp" #include "sync-helpers.hpp" namespace advss { diff --git a/lib/macro/macro-action-script.hpp b/plugins/scripting/macro-action-script.hpp similarity index 100% rename from lib/macro/macro-action-script.hpp rename to plugins/scripting/macro-action-script.hpp diff --git a/lib/macro/macro-condition-script.cpp b/plugins/scripting/macro-condition-script.cpp similarity index 100% rename from lib/macro/macro-condition-script.cpp rename to plugins/scripting/macro-condition-script.cpp diff --git a/lib/macro/macro-condition-script.hpp b/plugins/scripting/macro-condition-script.hpp similarity index 100% rename from lib/macro/macro-condition-script.hpp rename to plugins/scripting/macro-condition-script.hpp diff --git a/lib/macro/macro-script-handler.cpp b/plugins/scripting/macro-script-handler.cpp similarity index 100% rename from lib/macro/macro-script-handler.cpp rename to plugins/scripting/macro-script-handler.cpp diff --git a/lib/macro/macro-script-handler.hpp b/plugins/scripting/macro-script-handler.hpp similarity index 100% rename from lib/macro/macro-script-handler.hpp rename to plugins/scripting/macro-script-handler.hpp diff --git a/lib/macro/macro-segment-script.cpp b/plugins/scripting/macro-segment-script.cpp similarity index 100% rename from lib/macro/macro-segment-script.cpp rename to plugins/scripting/macro-segment-script.cpp diff --git a/lib/macro/macro-segment-script.hpp b/plugins/scripting/macro-segment-script.hpp similarity index 100% rename from lib/macro/macro-segment-script.hpp rename to plugins/scripting/macro-segment-script.hpp diff --git a/lib/utils/properties-view.cpp b/plugins/scripting/utils/properties-view.cpp similarity index 100% rename from lib/utils/properties-view.cpp rename to plugins/scripting/utils/properties-view.cpp diff --git a/lib/utils/properties-view.hpp b/plugins/scripting/utils/properties-view.hpp similarity index 100% rename from lib/utils/properties-view.hpp rename to plugins/scripting/utils/properties-view.hpp diff --git a/lib/utils/properties-view.moc.hpp b/plugins/scripting/utils/properties-view.moc.hpp similarity index 100% rename from lib/utils/properties-view.moc.hpp rename to plugins/scripting/utils/properties-view.moc.hpp