From 6ea4b65123f22acabb89715b24775d6f893947f5 Mon Sep 17 00:00:00 2001 From: nxtumUbun Date: Thu, 25 Jun 2026 01:06:54 -0700 Subject: [PATCH 1/8] extensions into extras --- Source/CMakeLists.txt | 2 +- Source/Thunder/PluginServer.cpp | 2 +- Source/Thunder/bridge.vcxproj | 8 ++++---- Source/ThunderPlugin/comprocess.vcxproj | 8 ++++---- Source/com/com.vcxproj | 8 ++++---- Source/common/common.vcxproj | 8 ++++---- Source/{extensions => extras}/CMakeLists.txt | 0 Source/{extensions => extras}/hibernate/CMakeLists.txt | 0 .../hibernate/checkpointlib/CheckpointLib.c | 0 .../hibernate/checkpointserver/CheckpointServer.c | 0 Source/{extensions => extras}/hibernate/common/Log.h | 0 Source/{extensions => extras}/hibernate/hibernate.h | 0 Source/{extensions => extras}/localtracer/CMakeLists.txt | 0 .../localtracer/example/CMakeLists.txt | 0 .../{extensions => extras}/localtracer/example/main.cpp | 0 .../localtracer/include/localtracer/localtracer.h | 0 .../privilegedrequest/CMakeLists.txt | 0 .../privilegedrequest/example/CMakeLists.txt | 0 .../privilegedrequest/example/main.cpp | 0 .../include/privilegedrequest/PrivilegedRequest.h | 0 .../processcontainers/CMakeLists.txt | 0 .../processcontainers/ContainerAdministrator.cpp | 0 .../processcontainers/ContainerAdministrator.h | 0 .../processcontainers/ContainerProducer.h | 0 .../processcontainers/IProcessContainers.h | 0 .../{extensions => extras}/processcontainers/Messaging.h | 0 .../{extensions => extras}/processcontainers/Module.cpp | 0 Source/{extensions => extras}/processcontainers/Module.h | 0 .../processcontainers/common/BaseContainerIterator.h | 0 .../processcontainers/common/BaseRefCount.h | 0 .../processcontainers/common/CGroupContainerInfo.h | 0 .../implementations/AWCImplementation/AWC.cpp | 0 .../implementations/AWCImplementation/AWC.h | 0 .../AWCImplementation/AWCContainerAdministrator.cpp | 0 .../AWCImplementation/AWCContainerAdministrator.h | 0 .../AWCImplementation/AWCContainerBase.cpp | 0 .../implementations/AWCImplementation/AWCContainerBase.h | 0 .../AWCImplementation/AWCImplementation.cpp | 0 .../implementations/AWCImplementation/AWCImplementation.h | 0 .../AWCImplementation/AWCProxyContainer.cpp | 0 .../implementations/AWCImplementation/AWCProxyContainer.h | 0 .../implementations/AWCImplementation/CMakeLists.txt | 0 .../implementations/AWCImplementation/dbus/Client.cpp | 0 .../implementations/AWCImplementation/dbus/Client.h | 0 .../implementations/AWCImplementation/dbus/api.xml | 0 .../implementations/CRunImplementation/CMakeLists.txt | 0 .../CRunImplementation/CRunImplementation.cpp | 0 .../CRunImplementation/CRunImplementation.h | 0 .../implementations/DobbyImplementation/CMakeLists.txt | 0 .../DobbyImplementation/DobbyImplementation.cpp | 0 .../DobbyImplementation/DobbyImplementation.h | 0 .../implementations/LXCImplementation/CMakeLists.txt | 0 .../LXCImplementation/LXCImplementation.cpp | 0 .../implementations/LXCImplementation/LXCImplementation.h | 0 .../implementations/RunCImplementation/CMakeLists.txt | 0 .../RunCImplementation/RunCImplementation.cpp | 0 .../RunCImplementation/RunCImplementation.h | 0 .../processcontainers/processcontainers.h | 0 .../warningreporting/CMakeLists.txt | 0 .../warningreporting/IWarningReportingMedia.h | 0 Source/{extensions => extras}/warningreporting/Module.cpp | 0 Source/{extensions => extras}/warningreporting/Module.h | 0 .../warningreporting/WarningReportingUnit.cpp | 0 .../warningreporting/WarningReportingUnit.h | 0 .../warningreporting/warningreporting.h | 0 .../warningreporting/warningreporting.vcxproj | 0 .../warningreporting/warningreporting.vcxproj.filters | 0 Source/plugins/plugins.vcxproj | 8 ++++---- Source/plugins/proxystubs.vcxproj | 8 ++++---- 69 files changed, 26 insertions(+), 26 deletions(-) rename Source/{extensions => extras}/CMakeLists.txt (100%) rename Source/{extensions => extras}/hibernate/CMakeLists.txt (100%) rename Source/{extensions => extras}/hibernate/checkpointlib/CheckpointLib.c (100%) rename Source/{extensions => extras}/hibernate/checkpointserver/CheckpointServer.c (100%) rename Source/{extensions => extras}/hibernate/common/Log.h (100%) rename Source/{extensions => extras}/hibernate/hibernate.h (100%) rename Source/{extensions => extras}/localtracer/CMakeLists.txt (100%) rename Source/{extensions => extras}/localtracer/example/CMakeLists.txt (100%) rename Source/{extensions => extras}/localtracer/example/main.cpp (100%) rename Source/{extensions => extras}/localtracer/include/localtracer/localtracer.h (100%) rename Source/{extensions => extras}/privilegedrequest/CMakeLists.txt (100%) rename Source/{extensions => extras}/privilegedrequest/example/CMakeLists.txt (100%) rename Source/{extensions => extras}/privilegedrequest/example/main.cpp (100%) rename Source/{extensions => extras}/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h (100%) rename Source/{extensions => extras}/processcontainers/CMakeLists.txt (100%) rename Source/{extensions => extras}/processcontainers/ContainerAdministrator.cpp (100%) rename Source/{extensions => extras}/processcontainers/ContainerAdministrator.h (100%) rename Source/{extensions => extras}/processcontainers/ContainerProducer.h (100%) rename Source/{extensions => extras}/processcontainers/IProcessContainers.h (100%) rename Source/{extensions => extras}/processcontainers/Messaging.h (100%) rename Source/{extensions => extras}/processcontainers/Module.cpp (100%) rename Source/{extensions => extras}/processcontainers/Module.h (100%) rename Source/{extensions => extras}/processcontainers/common/BaseContainerIterator.h (100%) rename Source/{extensions => extras}/processcontainers/common/BaseRefCount.h (100%) rename Source/{extensions => extras}/processcontainers/common/CGroupContainerInfo.h (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/AWC.cpp (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/AWC.h (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/AWCContainerBase.h (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/AWCImplementation.h (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/CMakeLists.txt (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/dbus/Client.cpp (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/dbus/Client.h (100%) rename Source/{extensions => extras}/processcontainers/implementations/AWCImplementation/dbus/api.xml (100%) rename Source/{extensions => extras}/processcontainers/implementations/CRunImplementation/CMakeLists.txt (100%) rename Source/{extensions => extras}/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp (100%) rename Source/{extensions => extras}/processcontainers/implementations/CRunImplementation/CRunImplementation.h (100%) rename Source/{extensions => extras}/processcontainers/implementations/DobbyImplementation/CMakeLists.txt (100%) rename Source/{extensions => extras}/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp (100%) rename Source/{extensions => extras}/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h (100%) rename Source/{extensions => extras}/processcontainers/implementations/LXCImplementation/CMakeLists.txt (100%) rename Source/{extensions => extras}/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp (100%) rename Source/{extensions => extras}/processcontainers/implementations/LXCImplementation/LXCImplementation.h (100%) rename Source/{extensions => extras}/processcontainers/implementations/RunCImplementation/CMakeLists.txt (100%) rename Source/{extensions => extras}/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp (100%) rename Source/{extensions => extras}/processcontainers/implementations/RunCImplementation/RunCImplementation.h (100%) rename Source/{extensions => extras}/processcontainers/processcontainers.h (100%) rename Source/{extensions => extras}/warningreporting/CMakeLists.txt (100%) rename Source/{extensions => extras}/warningreporting/IWarningReportingMedia.h (100%) rename Source/{extensions => extras}/warningreporting/Module.cpp (100%) rename Source/{extensions => extras}/warningreporting/Module.h (100%) rename Source/{extensions => extras}/warningreporting/WarningReportingUnit.cpp (100%) rename Source/{extensions => extras}/warningreporting/WarningReportingUnit.h (100%) rename Source/{extensions => extras}/warningreporting/warningreporting.h (100%) rename Source/{extensions => extras}/warningreporting/warningreporting.vcxproj (100%) rename Source/{extensions => extras}/warningreporting/warningreporting.vcxproj.filters (100%) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 3141e7f7a8..3044715b4e 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -78,7 +78,7 @@ if(MESSAGING) add_subdirectory(messaging) endif() -add_subdirectory(extensions) +add_subdirectory(extras) if(COM) add_subdirectory(com) diff --git a/Source/Thunder/PluginServer.cpp b/Source/Thunder/PluginServer.cpp index fba963eaf1..9535e86938 100644 --- a/Source/Thunder/PluginServer.cpp +++ b/Source/Thunder/PluginServer.cpp @@ -29,7 +29,7 @@ #endif #ifdef HIBERNATE_SUPPORT_ENABLED -#include "../extensions/hibernate/hibernate.h" +#include "../extras/hibernate/hibernate.h" #endif namespace Thunder { diff --git a/Source/Thunder/bridge.vcxproj b/Source/Thunder/bridge.vcxproj index 10f4936a9f..7d2ed3142a 100755 --- a/Source/Thunder/bridge.vcxproj +++ b/Source/Thunder/bridge.vcxproj @@ -122,7 +122,7 @@ APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -146,7 +146,7 @@ APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -168,7 +168,7 @@ APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -192,7 +192,7 @@ APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true diff --git a/Source/ThunderPlugin/comprocess.vcxproj b/Source/ThunderPlugin/comprocess.vcxproj index 6f902cfb59..104d88ab35 100755 --- a/Source/ThunderPlugin/comprocess.vcxproj +++ b/Source/ThunderPlugin/comprocess.vcxproj @@ -110,7 +110,7 @@ __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -131,7 +131,7 @@ __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -150,7 +150,7 @@ __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -171,7 +171,7 @@ __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true diff --git a/Source/com/com.vcxproj b/Source/com/com.vcxproj index 5def64775d..2eb58b983e 100644 --- a/Source/com/com.vcxproj +++ b/Source/com/com.vcxproj @@ -126,7 +126,7 @@ true __CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extras true @@ -149,7 +149,7 @@ true __CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extras true @@ -170,7 +170,7 @@ true __CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extras true @@ -193,7 +193,7 @@ true __CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extras true diff --git a/Source/common/common.vcxproj b/Source/common/common.vcxproj index fc332cf25a..c0153a86f7 100644 --- a/Source/common/common.vcxproj +++ b/Source/common/common.vcxproj @@ -130,7 +130,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -151,7 +151,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -170,7 +170,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -191,7 +191,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true diff --git a/Source/extensions/CMakeLists.txt b/Source/extras/CMakeLists.txt similarity index 100% rename from Source/extensions/CMakeLists.txt rename to Source/extras/CMakeLists.txt diff --git a/Source/extensions/hibernate/CMakeLists.txt b/Source/extras/hibernate/CMakeLists.txt similarity index 100% rename from Source/extensions/hibernate/CMakeLists.txt rename to Source/extras/hibernate/CMakeLists.txt diff --git a/Source/extensions/hibernate/checkpointlib/CheckpointLib.c b/Source/extras/hibernate/checkpointlib/CheckpointLib.c similarity index 100% rename from Source/extensions/hibernate/checkpointlib/CheckpointLib.c rename to Source/extras/hibernate/checkpointlib/CheckpointLib.c diff --git a/Source/extensions/hibernate/checkpointserver/CheckpointServer.c b/Source/extras/hibernate/checkpointserver/CheckpointServer.c similarity index 100% rename from Source/extensions/hibernate/checkpointserver/CheckpointServer.c rename to Source/extras/hibernate/checkpointserver/CheckpointServer.c diff --git a/Source/extensions/hibernate/common/Log.h b/Source/extras/hibernate/common/Log.h similarity index 100% rename from Source/extensions/hibernate/common/Log.h rename to Source/extras/hibernate/common/Log.h diff --git a/Source/extensions/hibernate/hibernate.h b/Source/extras/hibernate/hibernate.h similarity index 100% rename from Source/extensions/hibernate/hibernate.h rename to Source/extras/hibernate/hibernate.h diff --git a/Source/extensions/localtracer/CMakeLists.txt b/Source/extras/localtracer/CMakeLists.txt similarity index 100% rename from Source/extensions/localtracer/CMakeLists.txt rename to Source/extras/localtracer/CMakeLists.txt diff --git a/Source/extensions/localtracer/example/CMakeLists.txt b/Source/extras/localtracer/example/CMakeLists.txt similarity index 100% rename from Source/extensions/localtracer/example/CMakeLists.txt rename to Source/extras/localtracer/example/CMakeLists.txt diff --git a/Source/extensions/localtracer/example/main.cpp b/Source/extras/localtracer/example/main.cpp similarity index 100% rename from Source/extensions/localtracer/example/main.cpp rename to Source/extras/localtracer/example/main.cpp diff --git a/Source/extensions/localtracer/include/localtracer/localtracer.h b/Source/extras/localtracer/include/localtracer/localtracer.h similarity index 100% rename from Source/extensions/localtracer/include/localtracer/localtracer.h rename to Source/extras/localtracer/include/localtracer/localtracer.h diff --git a/Source/extensions/privilegedrequest/CMakeLists.txt b/Source/extras/privilegedrequest/CMakeLists.txt similarity index 100% rename from Source/extensions/privilegedrequest/CMakeLists.txt rename to Source/extras/privilegedrequest/CMakeLists.txt diff --git a/Source/extensions/privilegedrequest/example/CMakeLists.txt b/Source/extras/privilegedrequest/example/CMakeLists.txt similarity index 100% rename from Source/extensions/privilegedrequest/example/CMakeLists.txt rename to Source/extras/privilegedrequest/example/CMakeLists.txt diff --git a/Source/extensions/privilegedrequest/example/main.cpp b/Source/extras/privilegedrequest/example/main.cpp similarity index 100% rename from Source/extensions/privilegedrequest/example/main.cpp rename to Source/extras/privilegedrequest/example/main.cpp diff --git a/Source/extensions/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h b/Source/extras/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h similarity index 100% rename from Source/extensions/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h rename to Source/extras/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h diff --git a/Source/extensions/processcontainers/CMakeLists.txt b/Source/extras/processcontainers/CMakeLists.txt similarity index 100% rename from Source/extensions/processcontainers/CMakeLists.txt rename to Source/extras/processcontainers/CMakeLists.txt diff --git a/Source/extensions/processcontainers/ContainerAdministrator.cpp b/Source/extras/processcontainers/ContainerAdministrator.cpp similarity index 100% rename from Source/extensions/processcontainers/ContainerAdministrator.cpp rename to Source/extras/processcontainers/ContainerAdministrator.cpp diff --git a/Source/extensions/processcontainers/ContainerAdministrator.h b/Source/extras/processcontainers/ContainerAdministrator.h similarity index 100% rename from Source/extensions/processcontainers/ContainerAdministrator.h rename to Source/extras/processcontainers/ContainerAdministrator.h diff --git a/Source/extensions/processcontainers/ContainerProducer.h b/Source/extras/processcontainers/ContainerProducer.h similarity index 100% rename from Source/extensions/processcontainers/ContainerProducer.h rename to Source/extras/processcontainers/ContainerProducer.h diff --git a/Source/extensions/processcontainers/IProcessContainers.h b/Source/extras/processcontainers/IProcessContainers.h similarity index 100% rename from Source/extensions/processcontainers/IProcessContainers.h rename to Source/extras/processcontainers/IProcessContainers.h diff --git a/Source/extensions/processcontainers/Messaging.h b/Source/extras/processcontainers/Messaging.h similarity index 100% rename from Source/extensions/processcontainers/Messaging.h rename to Source/extras/processcontainers/Messaging.h diff --git a/Source/extensions/processcontainers/Module.cpp b/Source/extras/processcontainers/Module.cpp similarity index 100% rename from Source/extensions/processcontainers/Module.cpp rename to Source/extras/processcontainers/Module.cpp diff --git a/Source/extensions/processcontainers/Module.h b/Source/extras/processcontainers/Module.h similarity index 100% rename from Source/extensions/processcontainers/Module.h rename to Source/extras/processcontainers/Module.h diff --git a/Source/extensions/processcontainers/common/BaseContainerIterator.h b/Source/extras/processcontainers/common/BaseContainerIterator.h similarity index 100% rename from Source/extensions/processcontainers/common/BaseContainerIterator.h rename to Source/extras/processcontainers/common/BaseContainerIterator.h diff --git a/Source/extensions/processcontainers/common/BaseRefCount.h b/Source/extras/processcontainers/common/BaseRefCount.h similarity index 100% rename from Source/extensions/processcontainers/common/BaseRefCount.h rename to Source/extras/processcontainers/common/BaseRefCount.h diff --git a/Source/extensions/processcontainers/common/CGroupContainerInfo.h b/Source/extras/processcontainers/common/CGroupContainerInfo.h similarity index 100% rename from Source/extensions/processcontainers/common/CGroupContainerInfo.h rename to Source/extras/processcontainers/common/CGroupContainerInfo.h diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWC.cpp b/Source/extras/processcontainers/implementations/AWCImplementation/AWC.cpp similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWC.cpp rename to Source/extras/processcontainers/implementations/AWCImplementation/AWC.cpp diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWC.h b/Source/extras/processcontainers/implementations/AWCImplementation/AWC.h similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWC.h rename to Source/extras/processcontainers/implementations/AWCImplementation/AWC.h diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp b/Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp rename to Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h b/Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h rename to Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp b/Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp rename to Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerBase.h b/Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerBase.h similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCContainerBase.h rename to Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerBase.h diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp b/Source/extras/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp rename to Source/extras/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCImplementation.h b/Source/extras/processcontainers/implementations/AWCImplementation/AWCImplementation.h similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCImplementation.h rename to Source/extras/processcontainers/implementations/AWCImplementation/AWCImplementation.h diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp b/Source/extras/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp rename to Source/extras/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h b/Source/extras/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h rename to Source/extras/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/CMakeLists.txt b/Source/extras/processcontainers/implementations/AWCImplementation/CMakeLists.txt similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/CMakeLists.txt rename to Source/extras/processcontainers/implementations/AWCImplementation/CMakeLists.txt diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/dbus/Client.cpp b/Source/extras/processcontainers/implementations/AWCImplementation/dbus/Client.cpp similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/dbus/Client.cpp rename to Source/extras/processcontainers/implementations/AWCImplementation/dbus/Client.cpp diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/dbus/Client.h b/Source/extras/processcontainers/implementations/AWCImplementation/dbus/Client.h similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/dbus/Client.h rename to Source/extras/processcontainers/implementations/AWCImplementation/dbus/Client.h diff --git a/Source/extensions/processcontainers/implementations/AWCImplementation/dbus/api.xml b/Source/extras/processcontainers/implementations/AWCImplementation/dbus/api.xml similarity index 100% rename from Source/extensions/processcontainers/implementations/AWCImplementation/dbus/api.xml rename to Source/extras/processcontainers/implementations/AWCImplementation/dbus/api.xml diff --git a/Source/extensions/processcontainers/implementations/CRunImplementation/CMakeLists.txt b/Source/extras/processcontainers/implementations/CRunImplementation/CMakeLists.txt similarity index 100% rename from Source/extensions/processcontainers/implementations/CRunImplementation/CMakeLists.txt rename to Source/extras/processcontainers/implementations/CRunImplementation/CMakeLists.txt diff --git a/Source/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp b/Source/extras/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp similarity index 100% rename from Source/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp rename to Source/extras/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp diff --git a/Source/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.h b/Source/extras/processcontainers/implementations/CRunImplementation/CRunImplementation.h similarity index 100% rename from Source/extensions/processcontainers/implementations/CRunImplementation/CRunImplementation.h rename to Source/extras/processcontainers/implementations/CRunImplementation/CRunImplementation.h diff --git a/Source/extensions/processcontainers/implementations/DobbyImplementation/CMakeLists.txt b/Source/extras/processcontainers/implementations/DobbyImplementation/CMakeLists.txt similarity index 100% rename from Source/extensions/processcontainers/implementations/DobbyImplementation/CMakeLists.txt rename to Source/extras/processcontainers/implementations/DobbyImplementation/CMakeLists.txt diff --git a/Source/extensions/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp b/Source/extras/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp similarity index 100% rename from Source/extensions/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp rename to Source/extras/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp diff --git a/Source/extensions/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h b/Source/extras/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h similarity index 100% rename from Source/extensions/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h rename to Source/extras/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h diff --git a/Source/extensions/processcontainers/implementations/LXCImplementation/CMakeLists.txt b/Source/extras/processcontainers/implementations/LXCImplementation/CMakeLists.txt similarity index 100% rename from Source/extensions/processcontainers/implementations/LXCImplementation/CMakeLists.txt rename to Source/extras/processcontainers/implementations/LXCImplementation/CMakeLists.txt diff --git a/Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp b/Source/extras/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp similarity index 100% rename from Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp rename to Source/extras/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp diff --git a/Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.h b/Source/extras/processcontainers/implementations/LXCImplementation/LXCImplementation.h similarity index 100% rename from Source/extensions/processcontainers/implementations/LXCImplementation/LXCImplementation.h rename to Source/extras/processcontainers/implementations/LXCImplementation/LXCImplementation.h diff --git a/Source/extensions/processcontainers/implementations/RunCImplementation/CMakeLists.txt b/Source/extras/processcontainers/implementations/RunCImplementation/CMakeLists.txt similarity index 100% rename from Source/extensions/processcontainers/implementations/RunCImplementation/CMakeLists.txt rename to Source/extras/processcontainers/implementations/RunCImplementation/CMakeLists.txt diff --git a/Source/extensions/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp b/Source/extras/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp similarity index 100% rename from Source/extensions/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp rename to Source/extras/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp diff --git a/Source/extensions/processcontainers/implementations/RunCImplementation/RunCImplementation.h b/Source/extras/processcontainers/implementations/RunCImplementation/RunCImplementation.h similarity index 100% rename from Source/extensions/processcontainers/implementations/RunCImplementation/RunCImplementation.h rename to Source/extras/processcontainers/implementations/RunCImplementation/RunCImplementation.h diff --git a/Source/extensions/processcontainers/processcontainers.h b/Source/extras/processcontainers/processcontainers.h similarity index 100% rename from Source/extensions/processcontainers/processcontainers.h rename to Source/extras/processcontainers/processcontainers.h diff --git a/Source/extensions/warningreporting/CMakeLists.txt b/Source/extras/warningreporting/CMakeLists.txt similarity index 100% rename from Source/extensions/warningreporting/CMakeLists.txt rename to Source/extras/warningreporting/CMakeLists.txt diff --git a/Source/extensions/warningreporting/IWarningReportingMedia.h b/Source/extras/warningreporting/IWarningReportingMedia.h similarity index 100% rename from Source/extensions/warningreporting/IWarningReportingMedia.h rename to Source/extras/warningreporting/IWarningReportingMedia.h diff --git a/Source/extensions/warningreporting/Module.cpp b/Source/extras/warningreporting/Module.cpp similarity index 100% rename from Source/extensions/warningreporting/Module.cpp rename to Source/extras/warningreporting/Module.cpp diff --git a/Source/extensions/warningreporting/Module.h b/Source/extras/warningreporting/Module.h similarity index 100% rename from Source/extensions/warningreporting/Module.h rename to Source/extras/warningreporting/Module.h diff --git a/Source/extensions/warningreporting/WarningReportingUnit.cpp b/Source/extras/warningreporting/WarningReportingUnit.cpp similarity index 100% rename from Source/extensions/warningreporting/WarningReportingUnit.cpp rename to Source/extras/warningreporting/WarningReportingUnit.cpp diff --git a/Source/extensions/warningreporting/WarningReportingUnit.h b/Source/extras/warningreporting/WarningReportingUnit.h similarity index 100% rename from Source/extensions/warningreporting/WarningReportingUnit.h rename to Source/extras/warningreporting/WarningReportingUnit.h diff --git a/Source/extensions/warningreporting/warningreporting.h b/Source/extras/warningreporting/warningreporting.h similarity index 100% rename from Source/extensions/warningreporting/warningreporting.h rename to Source/extras/warningreporting/warningreporting.h diff --git a/Source/extensions/warningreporting/warningreporting.vcxproj b/Source/extras/warningreporting/warningreporting.vcxproj similarity index 100% rename from Source/extensions/warningreporting/warningreporting.vcxproj rename to Source/extras/warningreporting/warningreporting.vcxproj diff --git a/Source/extensions/warningreporting/warningreporting.vcxproj.filters b/Source/extras/warningreporting/warningreporting.vcxproj.filters similarity index 100% rename from Source/extensions/warningreporting/warningreporting.vcxproj.filters rename to Source/extras/warningreporting/warningreporting.vcxproj.filters diff --git a/Source/plugins/plugins.vcxproj b/Source/plugins/plugins.vcxproj index 55a74c5044..b7bc7dbd61 100755 --- a/Source/plugins/plugins.vcxproj +++ b/Source/plugins/plugins.vcxproj @@ -157,7 +157,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -198,7 +198,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -237,7 +237,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true @@ -278,7 +278,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true diff --git a/Source/plugins/proxystubs.vcxproj b/Source/plugins/proxystubs.vcxproj index 73347c856c..4b578efa12 100644 --- a/Source/plugins/proxystubs.vcxproj +++ b/Source/plugins/proxystubs.vcxproj @@ -116,7 +116,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true /wd4996 %(AdditionalOptions) @@ -142,7 +142,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true /wd4996 %(AdditionalOptions) @@ -166,7 +166,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true /wd4996 %(AdditionalOptions) @@ -192,7 +192,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extensions + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras true /wd4996 %(AdditionalOptions) From 9ebd7ce966df30cc6024ba47427dfa5cea74849b Mon Sep 17 00:00:00 2001 From: nxtumUbun Date: Thu, 25 Jun 2026 01:49:19 -0700 Subject: [PATCH 2/8] warningreporting --- Source/extras/warningreporting/warningreporting.vcxproj | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Source/extras/warningreporting/warningreporting.vcxproj b/Source/extras/warningreporting/warningreporting.vcxproj index 2bfd1a4f91..84aaad72cf 100644 --- a/Source/extras/warningreporting/warningreporting.vcxproj +++ b/Source/extras/warningreporting/warningreporting.vcxproj @@ -122,6 +122,7 @@ true true $(OutDir) + core.lib;messaging.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).pdb @@ -140,6 +141,7 @@ Windows true $(OutDir) + core.lib;messaging.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).pdb @@ -158,6 +160,7 @@ Windows true $(OutDir) + core.lib;messaging.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).pdb @@ -180,10 +183,11 @@ true true $(OutDir) + core.lib;messaging.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).pdb - \ No newline at end of file + From 70eb18968eb09e4d016ea744bcc32f8823294bec Mon Sep 17 00:00:00 2001 From: nxtumUbun Date: Thu, 25 Jun 2026 02:19:31 -0700 Subject: [PATCH 3/8] test explicit... --- .../extras/warningreporting/warningreporting.vcxproj | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Source/extras/warningreporting/warningreporting.vcxproj b/Source/extras/warningreporting/warningreporting.vcxproj index 84aaad72cf..75a4758e18 100644 --- a/Source/extras/warningreporting/warningreporting.vcxproj +++ b/Source/extras/warningreporting/warningreporting.vcxproj @@ -31,6 +31,16 @@ + + + {0936A7B8-E995-452D-8062-CA9311854018} + true + + + {68388CCB-365D-443A-A435-2F1940790836} + true + + 15.0 {414DC2D4-2C59-4D15-A169-A34460E5CE48} From f60c4381e2c1a1bdde1729493d05cb688ddb548b Mon Sep 17 00:00:00 2001 From: nxtumwindows Date: Thu, 25 Jun 2026 11:42:13 +0200 Subject: [PATCH 4/8] not working warning reporting --- .../warningreporting/warningreporting.vcxproj | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/Source/extras/warningreporting/warningreporting.vcxproj b/Source/extras/warningreporting/warningreporting.vcxproj index 75a4758e18..96554246ee 100644 --- a/Source/extras/warningreporting/warningreporting.vcxproj +++ b/Source/extras/warningreporting/warningreporting.vcxproj @@ -31,16 +31,6 @@ - - - {0936A7B8-E995-452D-8062-CA9311854018} - true - - - {68388CCB-365D-443A-A435-2F1940790836} - true - - 15.0 {414DC2D4-2C59-4D15-A169-A34460E5CE48} @@ -132,7 +122,6 @@ true true $(OutDir) - core.lib;messaging.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).pdb @@ -151,7 +140,6 @@ Windows true $(OutDir) - core.lib;messaging.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).pdb @@ -170,7 +158,6 @@ Windows true $(OutDir) - core.lib;messaging.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).pdb @@ -193,7 +180,6 @@ true true $(OutDir) - core.lib;messaging.lib;%(AdditionalDependencies) $(IntDir)$(TargetName).pdb From 69fe342b8998ea8a3efc142a72824b76902f9143 Mon Sep 17 00:00:00 2001 From: nxtumUbun Date: Wed, 1 Jul 2026 01:41:21 -0700 Subject: [PATCH 5/8] addons --- NOTICE | 2 +- Source/CMakeLists.txt | 2 +- Source/Thunder/PluginServer.cpp | 2 +- Source/Thunder/bridge.vcxproj | 8 ++++---- Source/ThunderPlugin/comprocess.vcxproj | 8 ++++---- Source/{extras => addons}/CMakeLists.txt | 0 Source/{extras => addons}/hibernate/CMakeLists.txt | 0 .../hibernate/checkpointlib/CheckpointLib.c | 0 .../hibernate/checkpointserver/CheckpointServer.c | 0 Source/{extras => addons}/hibernate/common/Log.h | 0 Source/{extras => addons}/hibernate/hibernate.h | 0 Source/{extras => addons}/localtracer/CMakeLists.txt | 0 .../{extras => addons}/localtracer/example/CMakeLists.txt | 0 Source/{extras => addons}/localtracer/example/main.cpp | 0 .../localtracer/include/localtracer/localtracer.h | 0 .../{extras => addons}/privilegedrequest/CMakeLists.txt | 0 .../privilegedrequest/example/CMakeLists.txt | 0 .../{extras => addons}/privilegedrequest/example/main.cpp | 0 .../include/privilegedrequest/PrivilegedRequest.h | 0 .../{extras => addons}/processcontainers/CMakeLists.txt | 0 .../processcontainers/ContainerAdministrator.cpp | 0 .../processcontainers/ContainerAdministrator.h | 0 .../processcontainers/ContainerProducer.h | 0 .../processcontainers/IProcessContainers.h | 0 Source/{extras => addons}/processcontainers/Messaging.h | 0 Source/{extras => addons}/processcontainers/Module.cpp | 0 Source/{extras => addons}/processcontainers/Module.h | 0 .../processcontainers/common/BaseContainerIterator.h | 0 .../processcontainers/common/BaseRefCount.h | 0 .../processcontainers/common/CGroupContainerInfo.h | 0 .../implementations/AWCImplementation/AWC.cpp | 0 .../implementations/AWCImplementation/AWC.h | 0 .../AWCImplementation/AWCContainerAdministrator.cpp | 0 .../AWCImplementation/AWCContainerAdministrator.h | 0 .../AWCImplementation/AWCContainerBase.cpp | 0 .../implementations/AWCImplementation/AWCContainerBase.h | 0 .../AWCImplementation/AWCImplementation.cpp | 0 .../implementations/AWCImplementation/AWCImplementation.h | 0 .../AWCImplementation/AWCProxyContainer.cpp | 0 .../implementations/AWCImplementation/AWCProxyContainer.h | 0 .../implementations/AWCImplementation/CMakeLists.txt | 0 .../implementations/AWCImplementation/dbus/Client.cpp | 0 .../implementations/AWCImplementation/dbus/Client.h | 0 .../implementations/AWCImplementation/dbus/api.xml | 0 .../implementations/CRunImplementation/CMakeLists.txt | 0 .../CRunImplementation/CRunImplementation.cpp | 0 .../CRunImplementation/CRunImplementation.h | 0 .../implementations/DobbyImplementation/CMakeLists.txt | 0 .../DobbyImplementation/DobbyImplementation.cpp | 0 .../DobbyImplementation/DobbyImplementation.h | 0 .../implementations/LXCImplementation/CMakeLists.txt | 0 .../LXCImplementation/LXCImplementation.cpp | 0 .../implementations/LXCImplementation/LXCImplementation.h | 0 .../implementations/RunCImplementation/CMakeLists.txt | 0 .../RunCImplementation/RunCImplementation.cpp | 0 .../RunCImplementation/RunCImplementation.h | 0 .../processcontainers/processcontainers.h | 0 Source/{extras => addons}/warningreporting/CMakeLists.txt | 0 .../warningreporting/IWarningReportingMedia.h | 0 Source/{extras => addons}/warningreporting/Module.cpp | 0 Source/{extras => addons}/warningreporting/Module.h | 0 .../warningreporting/WarningReportingUnit.cpp | 0 .../warningreporting/WarningReportingUnit.h | 0 .../warningreporting/warningreporting.h | 0 .../warningreporting/warningreporting.vcxproj | 0 .../warningreporting/warningreporting.vcxproj.filters | 0 Source/com/com.vcxproj | 8 ++++---- Source/common/common.vcxproj | 8 ++++---- Source/plugins/plugins.vcxproj | 8 ++++---- Source/plugins/proxystubs.vcxproj | 8 ++++---- 70 files changed, 27 insertions(+), 27 deletions(-) rename Source/{extras => addons}/CMakeLists.txt (100%) rename Source/{extras => addons}/hibernate/CMakeLists.txt (100%) rename Source/{extras => addons}/hibernate/checkpointlib/CheckpointLib.c (100%) rename Source/{extras => addons}/hibernate/checkpointserver/CheckpointServer.c (100%) rename Source/{extras => addons}/hibernate/common/Log.h (100%) rename Source/{extras => addons}/hibernate/hibernate.h (100%) rename Source/{extras => addons}/localtracer/CMakeLists.txt (100%) rename Source/{extras => addons}/localtracer/example/CMakeLists.txt (100%) rename Source/{extras => addons}/localtracer/example/main.cpp (100%) rename Source/{extras => addons}/localtracer/include/localtracer/localtracer.h (100%) rename Source/{extras => addons}/privilegedrequest/CMakeLists.txt (100%) rename Source/{extras => addons}/privilegedrequest/example/CMakeLists.txt (100%) rename Source/{extras => addons}/privilegedrequest/example/main.cpp (100%) rename Source/{extras => addons}/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h (100%) rename Source/{extras => addons}/processcontainers/CMakeLists.txt (100%) rename Source/{extras => addons}/processcontainers/ContainerAdministrator.cpp (100%) rename Source/{extras => addons}/processcontainers/ContainerAdministrator.h (100%) rename Source/{extras => addons}/processcontainers/ContainerProducer.h (100%) rename Source/{extras => addons}/processcontainers/IProcessContainers.h (100%) rename Source/{extras => addons}/processcontainers/Messaging.h (100%) rename Source/{extras => addons}/processcontainers/Module.cpp (100%) rename Source/{extras => addons}/processcontainers/Module.h (100%) rename Source/{extras => addons}/processcontainers/common/BaseContainerIterator.h (100%) rename Source/{extras => addons}/processcontainers/common/BaseRefCount.h (100%) rename Source/{extras => addons}/processcontainers/common/CGroupContainerInfo.h (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/AWC.cpp (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/AWC.h (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/AWCContainerBase.h (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/AWCImplementation.h (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/CMakeLists.txt (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/dbus/Client.cpp (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/dbus/Client.h (100%) rename Source/{extras => addons}/processcontainers/implementations/AWCImplementation/dbus/api.xml (100%) rename Source/{extras => addons}/processcontainers/implementations/CRunImplementation/CMakeLists.txt (100%) rename Source/{extras => addons}/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp (100%) rename Source/{extras => addons}/processcontainers/implementations/CRunImplementation/CRunImplementation.h (100%) rename Source/{extras => addons}/processcontainers/implementations/DobbyImplementation/CMakeLists.txt (100%) rename Source/{extras => addons}/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp (100%) rename Source/{extras => addons}/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h (100%) rename Source/{extras => addons}/processcontainers/implementations/LXCImplementation/CMakeLists.txt (100%) rename Source/{extras => addons}/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp (100%) rename Source/{extras => addons}/processcontainers/implementations/LXCImplementation/LXCImplementation.h (100%) rename Source/{extras => addons}/processcontainers/implementations/RunCImplementation/CMakeLists.txt (100%) rename Source/{extras => addons}/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp (100%) rename Source/{extras => addons}/processcontainers/implementations/RunCImplementation/RunCImplementation.h (100%) rename Source/{extras => addons}/processcontainers/processcontainers.h (100%) rename Source/{extras => addons}/warningreporting/CMakeLists.txt (100%) rename Source/{extras => addons}/warningreporting/IWarningReportingMedia.h (100%) rename Source/{extras => addons}/warningreporting/Module.cpp (100%) rename Source/{extras => addons}/warningreporting/Module.h (100%) rename Source/{extras => addons}/warningreporting/WarningReportingUnit.cpp (100%) rename Source/{extras => addons}/warningreporting/WarningReportingUnit.h (100%) rename Source/{extras => addons}/warningreporting/warningreporting.h (100%) rename Source/{extras => addons}/warningreporting/warningreporting.vcxproj (100%) rename Source/{extras => addons}/warningreporting/warningreporting.vcxproj.filters (100%) diff --git a/NOTICE b/NOTICE index 6751f24679..5872d13dea 100644 --- a/NOTICE +++ b/NOTICE @@ -7,7 +7,7 @@ listed below. Your use of this material within the component is also subject to conditions of these licenses. The LICENSE file contains the text of all the licenses which apply within this component. -Files under the implementations directory are: +Files under the implementations directory (and other changes as indicated) are: Copyright Liberty Global B.V. Licensed under the Apache License, Version 2.0 unless otherwise noted. diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 3044715b4e..8a4fc3ade8 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -78,7 +78,7 @@ if(MESSAGING) add_subdirectory(messaging) endif() -add_subdirectory(extras) +add_subdirectory(addons) if(COM) add_subdirectory(com) diff --git a/Source/Thunder/PluginServer.cpp b/Source/Thunder/PluginServer.cpp index 9535e86938..b87ca88d17 100644 --- a/Source/Thunder/PluginServer.cpp +++ b/Source/Thunder/PluginServer.cpp @@ -29,7 +29,7 @@ #endif #ifdef HIBERNATE_SUPPORT_ENABLED -#include "../extras/hibernate/hibernate.h" +#include "../addons/hibernate/hibernate.h" #endif namespace Thunder { diff --git a/Source/Thunder/bridge.vcxproj b/Source/Thunder/bridge.vcxproj index 7d2ed3142a..f9a01c0b4d 100755 --- a/Source/Thunder/bridge.vcxproj +++ b/Source/Thunder/bridge.vcxproj @@ -122,7 +122,7 @@ APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -146,7 +146,7 @@ APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -168,7 +168,7 @@ APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -192,7 +192,7 @@ APPLICATION_NAME=Thunder;__CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;THREADPOOL_COUNT=4;HOSTING_COMPROCESS=comprocess.exe;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + $(FrameworkPath)plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true diff --git a/Source/ThunderPlugin/comprocess.vcxproj b/Source/ThunderPlugin/comprocess.vcxproj index 104d88ab35..cf92520bbb 100755 --- a/Source/ThunderPlugin/comprocess.vcxproj +++ b/Source/ThunderPlugin/comprocess.vcxproj @@ -110,7 +110,7 @@ __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -131,7 +131,7 @@ __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -150,7 +150,7 @@ __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -171,7 +171,7 @@ __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_WINDOWS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + $(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true diff --git a/Source/extras/CMakeLists.txt b/Source/addons/CMakeLists.txt similarity index 100% rename from Source/extras/CMakeLists.txt rename to Source/addons/CMakeLists.txt diff --git a/Source/extras/hibernate/CMakeLists.txt b/Source/addons/hibernate/CMakeLists.txt similarity index 100% rename from Source/extras/hibernate/CMakeLists.txt rename to Source/addons/hibernate/CMakeLists.txt diff --git a/Source/extras/hibernate/checkpointlib/CheckpointLib.c b/Source/addons/hibernate/checkpointlib/CheckpointLib.c similarity index 100% rename from Source/extras/hibernate/checkpointlib/CheckpointLib.c rename to Source/addons/hibernate/checkpointlib/CheckpointLib.c diff --git a/Source/extras/hibernate/checkpointserver/CheckpointServer.c b/Source/addons/hibernate/checkpointserver/CheckpointServer.c similarity index 100% rename from Source/extras/hibernate/checkpointserver/CheckpointServer.c rename to Source/addons/hibernate/checkpointserver/CheckpointServer.c diff --git a/Source/extras/hibernate/common/Log.h b/Source/addons/hibernate/common/Log.h similarity index 100% rename from Source/extras/hibernate/common/Log.h rename to Source/addons/hibernate/common/Log.h diff --git a/Source/extras/hibernate/hibernate.h b/Source/addons/hibernate/hibernate.h similarity index 100% rename from Source/extras/hibernate/hibernate.h rename to Source/addons/hibernate/hibernate.h diff --git a/Source/extras/localtracer/CMakeLists.txt b/Source/addons/localtracer/CMakeLists.txt similarity index 100% rename from Source/extras/localtracer/CMakeLists.txt rename to Source/addons/localtracer/CMakeLists.txt diff --git a/Source/extras/localtracer/example/CMakeLists.txt b/Source/addons/localtracer/example/CMakeLists.txt similarity index 100% rename from Source/extras/localtracer/example/CMakeLists.txt rename to Source/addons/localtracer/example/CMakeLists.txt diff --git a/Source/extras/localtracer/example/main.cpp b/Source/addons/localtracer/example/main.cpp similarity index 100% rename from Source/extras/localtracer/example/main.cpp rename to Source/addons/localtracer/example/main.cpp diff --git a/Source/extras/localtracer/include/localtracer/localtracer.h b/Source/addons/localtracer/include/localtracer/localtracer.h similarity index 100% rename from Source/extras/localtracer/include/localtracer/localtracer.h rename to Source/addons/localtracer/include/localtracer/localtracer.h diff --git a/Source/extras/privilegedrequest/CMakeLists.txt b/Source/addons/privilegedrequest/CMakeLists.txt similarity index 100% rename from Source/extras/privilegedrequest/CMakeLists.txt rename to Source/addons/privilegedrequest/CMakeLists.txt diff --git a/Source/extras/privilegedrequest/example/CMakeLists.txt b/Source/addons/privilegedrequest/example/CMakeLists.txt similarity index 100% rename from Source/extras/privilegedrequest/example/CMakeLists.txt rename to Source/addons/privilegedrequest/example/CMakeLists.txt diff --git a/Source/extras/privilegedrequest/example/main.cpp b/Source/addons/privilegedrequest/example/main.cpp similarity index 100% rename from Source/extras/privilegedrequest/example/main.cpp rename to Source/addons/privilegedrequest/example/main.cpp diff --git a/Source/extras/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h b/Source/addons/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h similarity index 100% rename from Source/extras/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h rename to Source/addons/privilegedrequest/include/privilegedrequest/PrivilegedRequest.h diff --git a/Source/extras/processcontainers/CMakeLists.txt b/Source/addons/processcontainers/CMakeLists.txt similarity index 100% rename from Source/extras/processcontainers/CMakeLists.txt rename to Source/addons/processcontainers/CMakeLists.txt diff --git a/Source/extras/processcontainers/ContainerAdministrator.cpp b/Source/addons/processcontainers/ContainerAdministrator.cpp similarity index 100% rename from Source/extras/processcontainers/ContainerAdministrator.cpp rename to Source/addons/processcontainers/ContainerAdministrator.cpp diff --git a/Source/extras/processcontainers/ContainerAdministrator.h b/Source/addons/processcontainers/ContainerAdministrator.h similarity index 100% rename from Source/extras/processcontainers/ContainerAdministrator.h rename to Source/addons/processcontainers/ContainerAdministrator.h diff --git a/Source/extras/processcontainers/ContainerProducer.h b/Source/addons/processcontainers/ContainerProducer.h similarity index 100% rename from Source/extras/processcontainers/ContainerProducer.h rename to Source/addons/processcontainers/ContainerProducer.h diff --git a/Source/extras/processcontainers/IProcessContainers.h b/Source/addons/processcontainers/IProcessContainers.h similarity index 100% rename from Source/extras/processcontainers/IProcessContainers.h rename to Source/addons/processcontainers/IProcessContainers.h diff --git a/Source/extras/processcontainers/Messaging.h b/Source/addons/processcontainers/Messaging.h similarity index 100% rename from Source/extras/processcontainers/Messaging.h rename to Source/addons/processcontainers/Messaging.h diff --git a/Source/extras/processcontainers/Module.cpp b/Source/addons/processcontainers/Module.cpp similarity index 100% rename from Source/extras/processcontainers/Module.cpp rename to Source/addons/processcontainers/Module.cpp diff --git a/Source/extras/processcontainers/Module.h b/Source/addons/processcontainers/Module.h similarity index 100% rename from Source/extras/processcontainers/Module.h rename to Source/addons/processcontainers/Module.h diff --git a/Source/extras/processcontainers/common/BaseContainerIterator.h b/Source/addons/processcontainers/common/BaseContainerIterator.h similarity index 100% rename from Source/extras/processcontainers/common/BaseContainerIterator.h rename to Source/addons/processcontainers/common/BaseContainerIterator.h diff --git a/Source/extras/processcontainers/common/BaseRefCount.h b/Source/addons/processcontainers/common/BaseRefCount.h similarity index 100% rename from Source/extras/processcontainers/common/BaseRefCount.h rename to Source/addons/processcontainers/common/BaseRefCount.h diff --git a/Source/extras/processcontainers/common/CGroupContainerInfo.h b/Source/addons/processcontainers/common/CGroupContainerInfo.h similarity index 100% rename from Source/extras/processcontainers/common/CGroupContainerInfo.h rename to Source/addons/processcontainers/common/CGroupContainerInfo.h diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/AWC.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/AWC.cpp similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/AWC.cpp rename to Source/addons/processcontainers/implementations/AWCImplementation/AWC.cpp diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/AWC.h b/Source/addons/processcontainers/implementations/AWCImplementation/AWC.h similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/AWC.h rename to Source/addons/processcontainers/implementations/AWCImplementation/AWC.h diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.cpp diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h b/Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerAdministrator.h diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerBase.cpp diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerBase.h b/Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerBase.h similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/AWCContainerBase.h rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCContainerBase.h diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCImplementation.cpp diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/AWCImplementation.h b/Source/addons/processcontainers/implementations/AWCImplementation/AWCImplementation.h similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/AWCImplementation.h rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCImplementation.h diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCProxyContainer.cpp diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h b/Source/addons/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h rename to Source/addons/processcontainers/implementations/AWCImplementation/AWCProxyContainer.h diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/CMakeLists.txt b/Source/addons/processcontainers/implementations/AWCImplementation/CMakeLists.txt similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/CMakeLists.txt rename to Source/addons/processcontainers/implementations/AWCImplementation/CMakeLists.txt diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/dbus/Client.cpp b/Source/addons/processcontainers/implementations/AWCImplementation/dbus/Client.cpp similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/dbus/Client.cpp rename to Source/addons/processcontainers/implementations/AWCImplementation/dbus/Client.cpp diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/dbus/Client.h b/Source/addons/processcontainers/implementations/AWCImplementation/dbus/Client.h similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/dbus/Client.h rename to Source/addons/processcontainers/implementations/AWCImplementation/dbus/Client.h diff --git a/Source/extras/processcontainers/implementations/AWCImplementation/dbus/api.xml b/Source/addons/processcontainers/implementations/AWCImplementation/dbus/api.xml similarity index 100% rename from Source/extras/processcontainers/implementations/AWCImplementation/dbus/api.xml rename to Source/addons/processcontainers/implementations/AWCImplementation/dbus/api.xml diff --git a/Source/extras/processcontainers/implementations/CRunImplementation/CMakeLists.txt b/Source/addons/processcontainers/implementations/CRunImplementation/CMakeLists.txt similarity index 100% rename from Source/extras/processcontainers/implementations/CRunImplementation/CMakeLists.txt rename to Source/addons/processcontainers/implementations/CRunImplementation/CMakeLists.txt diff --git a/Source/extras/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp b/Source/addons/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp similarity index 100% rename from Source/extras/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp rename to Source/addons/processcontainers/implementations/CRunImplementation/CRunImplementation.cpp diff --git a/Source/extras/processcontainers/implementations/CRunImplementation/CRunImplementation.h b/Source/addons/processcontainers/implementations/CRunImplementation/CRunImplementation.h similarity index 100% rename from Source/extras/processcontainers/implementations/CRunImplementation/CRunImplementation.h rename to Source/addons/processcontainers/implementations/CRunImplementation/CRunImplementation.h diff --git a/Source/extras/processcontainers/implementations/DobbyImplementation/CMakeLists.txt b/Source/addons/processcontainers/implementations/DobbyImplementation/CMakeLists.txt similarity index 100% rename from Source/extras/processcontainers/implementations/DobbyImplementation/CMakeLists.txt rename to Source/addons/processcontainers/implementations/DobbyImplementation/CMakeLists.txt diff --git a/Source/extras/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp b/Source/addons/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp similarity index 100% rename from Source/extras/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp rename to Source/addons/processcontainers/implementations/DobbyImplementation/DobbyImplementation.cpp diff --git a/Source/extras/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h b/Source/addons/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h similarity index 100% rename from Source/extras/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h rename to Source/addons/processcontainers/implementations/DobbyImplementation/DobbyImplementation.h diff --git a/Source/extras/processcontainers/implementations/LXCImplementation/CMakeLists.txt b/Source/addons/processcontainers/implementations/LXCImplementation/CMakeLists.txt similarity index 100% rename from Source/extras/processcontainers/implementations/LXCImplementation/CMakeLists.txt rename to Source/addons/processcontainers/implementations/LXCImplementation/CMakeLists.txt diff --git a/Source/extras/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp b/Source/addons/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp similarity index 100% rename from Source/extras/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp rename to Source/addons/processcontainers/implementations/LXCImplementation/LXCImplementation.cpp diff --git a/Source/extras/processcontainers/implementations/LXCImplementation/LXCImplementation.h b/Source/addons/processcontainers/implementations/LXCImplementation/LXCImplementation.h similarity index 100% rename from Source/extras/processcontainers/implementations/LXCImplementation/LXCImplementation.h rename to Source/addons/processcontainers/implementations/LXCImplementation/LXCImplementation.h diff --git a/Source/extras/processcontainers/implementations/RunCImplementation/CMakeLists.txt b/Source/addons/processcontainers/implementations/RunCImplementation/CMakeLists.txt similarity index 100% rename from Source/extras/processcontainers/implementations/RunCImplementation/CMakeLists.txt rename to Source/addons/processcontainers/implementations/RunCImplementation/CMakeLists.txt diff --git a/Source/extras/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp b/Source/addons/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp similarity index 100% rename from Source/extras/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp rename to Source/addons/processcontainers/implementations/RunCImplementation/RunCImplementation.cpp diff --git a/Source/extras/processcontainers/implementations/RunCImplementation/RunCImplementation.h b/Source/addons/processcontainers/implementations/RunCImplementation/RunCImplementation.h similarity index 100% rename from Source/extras/processcontainers/implementations/RunCImplementation/RunCImplementation.h rename to Source/addons/processcontainers/implementations/RunCImplementation/RunCImplementation.h diff --git a/Source/extras/processcontainers/processcontainers.h b/Source/addons/processcontainers/processcontainers.h similarity index 100% rename from Source/extras/processcontainers/processcontainers.h rename to Source/addons/processcontainers/processcontainers.h diff --git a/Source/extras/warningreporting/CMakeLists.txt b/Source/addons/warningreporting/CMakeLists.txt similarity index 100% rename from Source/extras/warningreporting/CMakeLists.txt rename to Source/addons/warningreporting/CMakeLists.txt diff --git a/Source/extras/warningreporting/IWarningReportingMedia.h b/Source/addons/warningreporting/IWarningReportingMedia.h similarity index 100% rename from Source/extras/warningreporting/IWarningReportingMedia.h rename to Source/addons/warningreporting/IWarningReportingMedia.h diff --git a/Source/extras/warningreporting/Module.cpp b/Source/addons/warningreporting/Module.cpp similarity index 100% rename from Source/extras/warningreporting/Module.cpp rename to Source/addons/warningreporting/Module.cpp diff --git a/Source/extras/warningreporting/Module.h b/Source/addons/warningreporting/Module.h similarity index 100% rename from Source/extras/warningreporting/Module.h rename to Source/addons/warningreporting/Module.h diff --git a/Source/extras/warningreporting/WarningReportingUnit.cpp b/Source/addons/warningreporting/WarningReportingUnit.cpp similarity index 100% rename from Source/extras/warningreporting/WarningReportingUnit.cpp rename to Source/addons/warningreporting/WarningReportingUnit.cpp diff --git a/Source/extras/warningreporting/WarningReportingUnit.h b/Source/addons/warningreporting/WarningReportingUnit.h similarity index 100% rename from Source/extras/warningreporting/WarningReportingUnit.h rename to Source/addons/warningreporting/WarningReportingUnit.h diff --git a/Source/extras/warningreporting/warningreporting.h b/Source/addons/warningreporting/warningreporting.h similarity index 100% rename from Source/extras/warningreporting/warningreporting.h rename to Source/addons/warningreporting/warningreporting.h diff --git a/Source/extras/warningreporting/warningreporting.vcxproj b/Source/addons/warningreporting/warningreporting.vcxproj similarity index 100% rename from Source/extras/warningreporting/warningreporting.vcxproj rename to Source/addons/warningreporting/warningreporting.vcxproj diff --git a/Source/extras/warningreporting/warningreporting.vcxproj.filters b/Source/addons/warningreporting/warningreporting.vcxproj.filters similarity index 100% rename from Source/extras/warningreporting/warningreporting.vcxproj.filters rename to Source/addons/warningreporting/warningreporting.vcxproj.filters diff --git a/Source/com/com.vcxproj b/Source/com/com.vcxproj index 2eb58b983e..a99e18c441 100644 --- a/Source/com/com.vcxproj +++ b/Source/com/com.vcxproj @@ -126,7 +126,7 @@ true __CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons true @@ -149,7 +149,7 @@ true __CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons true @@ -170,7 +170,7 @@ true __CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons true @@ -193,7 +193,7 @@ true __CORE_MESSAGING__;COM_EXPORTS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(FrameworkPath)addons true diff --git a/Source/common/common.vcxproj b/Source/common/common.vcxproj index c0153a86f7..7b371047a4 100644 --- a/Source/common/common.vcxproj +++ b/Source/common/common.vcxproj @@ -130,7 +130,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -151,7 +151,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -170,7 +170,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -191,7 +191,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;COMMON_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;..\plugins;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true diff --git a/Source/plugins/plugins.vcxproj b/Source/plugins/plugins.vcxproj index b7bc7dbd61..b9e7d5ced0 100755 --- a/Source/plugins/plugins.vcxproj +++ b/Source/plugins/plugins.vcxproj @@ -157,7 +157,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -198,7 +198,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -237,7 +237,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true @@ -278,7 +278,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true diff --git a/Source/plugins/proxystubs.vcxproj b/Source/plugins/proxystubs.vcxproj index 4b578efa12..e0c79b197b 100644 --- a/Source/plugins/proxystubs.vcxproj +++ b/Source/plugins/proxystubs.vcxproj @@ -116,7 +116,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true /wd4996 %(AdditionalOptions) @@ -142,7 +142,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true /wd4996 %(AdditionalOptions) @@ -166,7 +166,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;_DEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true /wd4996 %(AdditionalOptions) @@ -192,7 +192,7 @@ true __CORE_MESSAGING__;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;PLUGINS_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true - .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)extras + .;$(FrameworkPath);$(WindowsPath);$(WindowsPath)zlib;$(FrameworkPath)addons true /wd4996 %(AdditionalOptions) From 6a8ef5547a213d9ad0d052c2d469053dfb4844fd Mon Sep 17 00:00:00 2001 From: nxtumUbun Date: Thu, 2 Jul 2026 01:35:09 -0700 Subject: [PATCH 6/8] change hardcoded extensions paths --- Source/Thunder/GenericConfig.cmake | 2 +- Source/Thunder/PluginServer.cpp | 2 +- Source/Thunder/PluginServer.h | 2 +- docs/plugin/messaging.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Thunder/GenericConfig.cmake b/Source/Thunder/GenericConfig.cmake index 16d00588bc..0de813c61c 100644 --- a/Source/Thunder/GenericConfig.cmake +++ b/Source/Thunder/GenericConfig.cmake @@ -26,7 +26,7 @@ set(HARD_KILL_CHECK_WAIT_TIME 4 CACHE STRING "Hard kill check waiting time") set(PERSISTENT_PATH "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/${NAMESPACE}" CACHE PATH "Persistent path") set(DATA_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/${NAMESPACE}" CACHE PATH "Data path") set(SYSTEM_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/plugins" CACHE PATH "System path") -set(EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/extensions" CACHE PATH "Extension path") +set(EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/addons" CACHE PATH "Extension path") set(WEBSERVER_PATH "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/www/html" CACHE PATH "Root path for the HTTP server") set(WEBSERVER_PORT 8080 CACHE STRING "Port for the HTTP server") set(PROXYSTUB_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/proxystubs" CACHE PATH "Proxy stub path") diff --git a/Source/Thunder/PluginServer.cpp b/Source/Thunder/PluginServer.cpp index b87ca88d17..0ffa1e14d0 100644 --- a/Source/Thunder/PluginServer.cpp +++ b/Source/Thunder/PluginServer.cpp @@ -72,7 +72,7 @@ namespace PluginHost { #else /* static */ const TCHAR* Server::ConfigFile = _T("/etc/" EXPAND_AND_QUOTE(NAMESPACE) "/config.json"); #endif - /* static */ const TCHAR* Server::ExtensionsConfigDirectory = _T("extensions/"); + /* static */ const TCHAR* Server::ExtensionsConfigDirectory = _T("addons/"); /* static */ const TCHAR* Server::PluginConfigDirectory = _T("plugins/"); /* static */ const TCHAR* Server::PluginOverrideDirectory = _T(EXPAND_AND_QUOTE(NAMESPACE) "/services/"); /* static */ const TCHAR* Server::CommunicatorConnector = _T("COMMUNICATOR_CONNECTOR"); diff --git a/Source/Thunder/PluginServer.h b/Source/Thunder/PluginServer.h index f470e763ac..f2a3e0acbf 100644 --- a/Source/Thunder/PluginServer.h +++ b/Source/Thunder/PluginServer.h @@ -1785,7 +1785,7 @@ namespace PluginHost { const string normalized(Core::File::Normalize(locator)); const string rootPath(Core::Directory::Normalize(PluginHost::Service::Configuration().SystemRootPath)); searchPaths.push_back(Core::Directory::Normalize(rootPath + ExtensionPath()) + normalized); - searchPaths.push_back(Core::Directory::Normalize(rootPath + Administrator().Configuration().AppPath() + _T("Extensions/")) + normalized); + searchPaths.push_back(Core::Directory::Normalize(rootPath + Administrator().Configuration().AppPath() + _T("Addons/")) + normalized); RPC::IStringIterator* paths = Service::GetLibrarySearchPaths(locator); diff --git a/docs/plugin/messaging.md b/docs/plugin/messaging.md index 29bae82a0f..0a2a39acd9 100644 --- a/docs/plugin/messaging.md +++ b/docs/plugin/messaging.md @@ -173,7 +173,7 @@ Below is an example of the messaging section in the config: Warning Reporting enables various runtime checks for potentially erroneous conditions and can be enabled on a per-category basis. These are typically time-based - i.e. a warning will be reported if something exceeded an allowable time. Each category can also have its own configuration to tune the thresholds for triggering the warning. !!! warning - Warning Reporting is only available if Thunder is compiled with the `WARNING_REPORTING` option, which can be found [here](https://github.com/rdkcentral/Thunder/blob/76e08e2e5eafa12272b9080d2680091824124d9c/Source/extensions/CMakeLists.txt#L26), and is disabled by default. Note that it should not be enabled in Production, since it not only leads to a higher CPU and memory usage, but also it does not add any value to have it turned on in Production. + Warning Reporting is only available if Thunder is compiled with the `WARNING_REPORTING` option, which can be found [here](../../Source/addons/CMakeLists.txt), and is disabled by default. Note that it should not be enabled in Production, since it not only leads to a higher CPU and memory usage, but also it does not add any value to have it turned on in Production. ### Runtime From d02f32a8870bb7ab71cba56c0bf0c5b2465ac92e Mon Sep 17 00:00:00 2001 From: nxtumUbun Date: Thu, 2 Jul 2026 02:10:11 -0700 Subject: [PATCH 7/8] adjust new tests --- .github/workflows/Build Thunder on Windows.yml | 2 +- Tests/unit/core/CMakeLists.txt | 2 +- Tests/unit/core/test_extensions.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Build Thunder on Windows.yml b/.github/workflows/Build Thunder on Windows.yml index 070a31998a..894efe04c4 100644 --- a/.github/workflows/Build Thunder on Windows.yml +++ b/.github/workflows/Build Thunder on Windows.yml @@ -22,7 +22,7 @@ env: bridge: Thunder\Source\Thunder\bridge.vcxproj comProcess: Thunder\Source\ThunderPlugin\comprocess.vcxproj solution: Thunder.sln - warningReporting: Thunder\Source\extensions\warningreporting\warningreporting.vcxproj + warningReporting: Thunder\Source\addons\warningreporting\warningreporting.vcxproj jobs: Thunder: diff --git a/Tests/unit/core/CMakeLists.txt b/Tests/unit/core/CMakeLists.txt index bc83eddcd9..33044ca438 100644 --- a/Tests/unit/core/CMakeLists.txt +++ b/Tests/unit/core/CMakeLists.txt @@ -98,7 +98,7 @@ add_executable(${TEST_RUNNER_NAME} test_jwt.cpp ) -target_include_directories(${TEST_RUNNER_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/extensions) +target_include_directories(${TEST_RUNNER_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/addons) target_include_directories(${TEST_RUNNER_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/Source/Thunder) #[[ diff --git a/Tests/unit/core/test_extensions.cpp b/Tests/unit/core/test_extensions.cpp index 02c8cb0b02..16573c1bac 100644 --- a/Tests/unit/core/test_extensions.cpp +++ b/Tests/unit/core/test_extensions.cpp @@ -33,14 +33,14 @@ #include // Pull in the process-container helper headers (header-only, no backend needed) -// Note: CMakeLists adds Source/extensions to the include path so that +// Note: CMakeLists adds Source/addons to the include path so that // BaseContainerIterator.h's #include "processcontainers/IProcessContainers.h" resolves. #include #include #include // Hibernate C API header (for error constant validation) -#include +#include // If the proxy was not compiled into the library (WARNING_REPORTING=OFF), // pull in the implementation so the linker can find it. From 629f418b36a09de4dcf00ea4b9d5b7812e20e1ed Mon Sep 17 00:00:00 2001 From: nxtumUbun Date: Mon, 6 Jul 2026 03:02:17 -0700 Subject: [PATCH 8/8] revert some wrong ones --- Source/Thunder/GenericConfig.cmake | 2 +- Source/Thunder/PluginServer.cpp | 2 +- Source/Thunder/PluginServer.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Thunder/GenericConfig.cmake b/Source/Thunder/GenericConfig.cmake index 0de813c61c..16d00588bc 100644 --- a/Source/Thunder/GenericConfig.cmake +++ b/Source/Thunder/GenericConfig.cmake @@ -26,7 +26,7 @@ set(HARD_KILL_CHECK_WAIT_TIME 4 CACHE STRING "Hard kill check waiting time") set(PERSISTENT_PATH "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/${NAMESPACE}" CACHE PATH "Persistent path") set(DATA_PATH "${CMAKE_INSTALL_FULL_DATAROOTDIR}/${NAMESPACE}" CACHE PATH "Data path") set(SYSTEM_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/plugins" CACHE PATH "System path") -set(EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/addons" CACHE PATH "Extension path") +set(EXTENSION_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/extensions" CACHE PATH "Extension path") set(WEBSERVER_PATH "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/www/html" CACHE PATH "Root path for the HTTP server") set(WEBSERVER_PORT 8080 CACHE STRING "Port for the HTTP server") set(PROXYSTUB_PATH "${CMAKE_INSTALL_FULL_LIBDIR}/${NAMESPACE_LIB}/proxystubs" CACHE PATH "Proxy stub path") diff --git a/Source/Thunder/PluginServer.cpp b/Source/Thunder/PluginServer.cpp index 0ffa1e14d0..b87ca88d17 100644 --- a/Source/Thunder/PluginServer.cpp +++ b/Source/Thunder/PluginServer.cpp @@ -72,7 +72,7 @@ namespace PluginHost { #else /* static */ const TCHAR* Server::ConfigFile = _T("/etc/" EXPAND_AND_QUOTE(NAMESPACE) "/config.json"); #endif - /* static */ const TCHAR* Server::ExtensionsConfigDirectory = _T("addons/"); + /* static */ const TCHAR* Server::ExtensionsConfigDirectory = _T("extensions/"); /* static */ const TCHAR* Server::PluginConfigDirectory = _T("plugins/"); /* static */ const TCHAR* Server::PluginOverrideDirectory = _T(EXPAND_AND_QUOTE(NAMESPACE) "/services/"); /* static */ const TCHAR* Server::CommunicatorConnector = _T("COMMUNICATOR_CONNECTOR"); diff --git a/Source/Thunder/PluginServer.h b/Source/Thunder/PluginServer.h index 68d6e04af4..b1c02d79ca 100644 --- a/Source/Thunder/PluginServer.h +++ b/Source/Thunder/PluginServer.h @@ -1785,7 +1785,7 @@ namespace PluginHost { const string normalized(Core::File::Normalize(locator)); const string rootPath(Core::Directory::Normalize(PluginHost::Service::Configuration().SystemRootPath)); searchPaths.push_back(Core::Directory::Normalize(rootPath + ExtensionPath()) + normalized); - searchPaths.push_back(Core::Directory::Normalize(rootPath + Administrator().Configuration().AppPath() + _T("Addons/")) + normalized); + searchPaths.push_back(Core::Directory::Normalize(rootPath + Administrator().Configuration().AppPath() + _T("Extensions/")) + normalized); RPC::IStringIterator* paths = Service::GetLibrarySearchPaths(locator);