eranif · eranif · Jun 27, 2024 · Jun 3, 2024 · Jun 3, 2024 · Jun 3, 2024
diff --git a/CMakePlugin/CMakeBuilder.h b/CMakePlugin/CMakeBuilder.h
@@ -1,7 +1,7 @@
 #ifndef CMAKEBUILDER_H
 #define CMAKEBUILDER_H
 
-#include "builder.h" // Base class: Builder
+#include "builder/builder.h" // Base class: Builder
 
 class CMakeBuilder : public Builder
 {

diff --git a/ContinuousBuild/continuousbuild.cpp b/ContinuousBuild/continuousbuild.cpp
@@ -26,7 +26,7 @@
 #include "continuousbuild.h"
 
 #include "build_settings_config.h"
-#include "builder.h"
+#include "builder/builder.h"
 #include "buildmanager.h"
 #include "cl_command_event.h"
 #include "compile_request.h"

diff --git a/EOSWiki/EOSProjectWizard.cpp b/EOSWiki/EOSProjectWizard.cpp
@@ -1,10 +1,12 @@
 #include "EOSProjectWizard.h"
-#include <wx/filename.h>
-#include "CompilerLocatorEosCDT.h"
+
+#include "CompilerLocator/CompilerLocatorEosCDT.h"
 #include "build_settings_config.h"
 #include "compiler.h"
 #include "globals.h"
 
+#include <wx/filename.h>
+
 EOSProjectWizard::EOSProjectWizard(wxWindow* parent)
     : EOSProjectWizardBase(parent)
 {

diff --git a/LanguageServer/detectors/LSPClangdDetector.cpp b/LanguageServer/detectors/LSPClangdDetector.cpp
@@ -1,6 +1,6 @@
 #include "LSPClangdDetector.hpp"
 
-#include "CompilerLocatorCLANG.h"
+#include "CompilerLocator/CompilerLocatorCLANG.h"
 #include "MSYS2.hpp"
 #include "Platform.hpp"
 #include "asyncprocess.h"

diff --git a/LiteEditor/app.cpp b/LiteEditor/app.cpp
@@ -26,7 +26,7 @@
 #include "app.h"
 
 #include "ColoursAndFontsManager.h"
-#include "CompilerLocatorCygwin.h"
+#include "CompilerLocator/CompilerLocatorCygwin.h"
 #include "SideBar.hpp"
 #include "SocketAPI/clSocketClient.h"
 #include "autoversion.h"

diff --git a/LiteEditor/frame.cpp b/LiteEditor/frame.cpp
@@ -46,8 +46,6 @@
 #include "bookmark_manager.h"
 #include "build_custom_targets_menu_manager.h"
 #include "build_settings_config.h"
-#include "builder.h"
-#include "buildmanager.h"
 #include "buildtabsettingsdata.h"
 #include "clAboutDialog.h"
 #include "clBootstrapWizard.h"

diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp
@@ -30,7 +30,7 @@
 #include "DebuggerCallstackView.h"
 #include "NewProjectDialog.h"
 #include "SideBar.hpp"
-#include "WSImporter.h"
+#include "WorkspaceImporter/WSImporter.h"
 #include "app.h"
 #include "asyncprocess.h"
 #include "attachdbgprocdlg.h"

diff --git a/LiteEditor/ps_general_page.cpp b/LiteEditor/ps_general_page.cpp
@@ -26,7 +26,7 @@
 #include "ps_general_page.h"
 
 #include "build_settings_config.h"
-#include "builder.h"
+#include "builder/builder.h"
 #include "buildmanager.h"
 #include "dirsaver.h"
 #include "globals.h"

diff --git a/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt
@@ -87,7 +87,14 @@ if(NOT MINGW AND WXC_APP)
     message("-- libplugin.so is using RPATH set to ${WXC_LIBS_DIR}")
 endif()
 
-file(GLOB SRCS "*.cpp" "LSP/*.cpp" "ThemeImporters/*.cpp" "wxTerminalCtrl/*.cpp")
+file(GLOB SRCS
+    "*.cpp"
+    "CompilerLocator/*.cpp"
+    "LSP/*.cpp"
+    "ThemeImporters/*.cpp"
+    "WorkspaceImporter/*.cpp"
+    "builder/*.cpp"
+    "wxTerminalCtrl/*.cpp")
 
 # Define the output
 add_library(plugin SHARED ${SRCS})

diff --git a/Plugin/CompilerLocatorCLANG.cpp → .../CompilerLocator/CompilerLocatorCLANG.cpp b/Plugin/CompilerLocatorCLANG.cpp → .../CompilerLocator/CompilerLocatorCLANG.cpp
diff --git a/Plugin/CompilerLocatorCLANG.h → ...in/CompilerLocator/CompilerLocatorCLANG.h b/Plugin/CompilerLocatorCLANG.h → ...in/CompilerLocator/CompilerLocatorCLANG.h
diff --git a/Plugin/CompilerLocatorCrossGCC.cpp → ...mpilerLocator/CompilerLocatorCrossGCC.cpp b/Plugin/CompilerLocatorCrossGCC.cpp → ...mpilerLocator/CompilerLocatorCrossGCC.cpp
diff --git a/Plugin/CompilerLocatorCrossGCC.h → ...CompilerLocator/CompilerLocatorCrossGCC.h b/Plugin/CompilerLocatorCrossGCC.h → ...CompilerLocator/CompilerLocatorCrossGCC.h
diff --git a/Plugin/CompilerLocatorCygwin.cpp → ...CompilerLocator/CompilerLocatorCygwin.cpp b/Plugin/CompilerLocatorCygwin.cpp → ...CompilerLocator/CompilerLocatorCygwin.cpp
diff --git a/Plugin/CompilerLocatorCygwin.h → ...n/CompilerLocator/CompilerLocatorCygwin.h b/Plugin/CompilerLocatorCygwin.h → ...n/CompilerLocator/CompilerLocatorCygwin.h
diff --git a/Plugin/CompilerLocatorEosCDT.cpp → ...CompilerLocator/CompilerLocatorEosCDT.cpp b/Plugin/CompilerLocatorEosCDT.cpp → ...CompilerLocator/CompilerLocatorEosCDT.cpp
diff --git a/Plugin/CompilerLocatorEosCDT.h → ...n/CompilerLocator/CompilerLocatorEosCDT.h b/Plugin/CompilerLocatorEosCDT.h → ...n/CompilerLocator/CompilerLocatorEosCDT.h
diff --git a/Plugin/CompilerLocatorGCC.cpp → ...in/CompilerLocator/CompilerLocatorGCC.cpp b/Plugin/CompilerLocatorGCC.cpp → ...in/CompilerLocator/CompilerLocatorGCC.cpp
diff --git a/Plugin/CompilerLocatorGCC.h → Plugin/CompilerLocator/CompilerLocatorGCC.h b/Plugin/CompilerLocatorGCC.h → Plugin/CompilerLocator/CompilerLocatorGCC.h
diff --git a/Plugin/CompilerLocatorMSVC.cpp → ...n/CompilerLocator/CompilerLocatorMSVC.cpp b/Plugin/CompilerLocatorMSVC.cpp → ...n/CompilerLocator/CompilerLocatorMSVC.cpp
diff --git a/Plugin/CompilerLocatorMSVC.h → Plugin/CompilerLocator/CompilerLocatorMSVC.h b/Plugin/CompilerLocatorMSVC.h → Plugin/CompilerLocator/CompilerLocatorMSVC.h
diff --git a/Plugin/CompilerLocatorMSYS2.cpp → .../CompilerLocator/CompilerLocatorMSYS2.cpp b/Plugin/CompilerLocatorMSYS2.cpp → .../CompilerLocator/CompilerLocatorMSYS2.cpp
diff --git a/Plugin/CompilerLocatorMSYS2.hpp → .../CompilerLocator/CompilerLocatorMSYS2.hpp b/Plugin/CompilerLocatorMSYS2.hpp → .../CompilerLocator/CompilerLocatorMSYS2.hpp
diff --git a/Plugin/CompilerLocatorMSYS2Clang.cpp → ...ilerLocator/CompilerLocatorMSYS2Clang.cpp b/Plugin/CompilerLocatorMSYS2Clang.cpp → ...ilerLocator/CompilerLocatorMSYS2Clang.cpp
diff --git a/Plugin/CompilerLocatorMSYS2Clang.hpp → ...ilerLocator/CompilerLocatorMSYS2Clang.hpp b/Plugin/CompilerLocatorMSYS2Clang.hpp → ...ilerLocator/CompilerLocatorMSYS2Clang.hpp
diff --git a/Plugin/CompilerLocatorRustc.cpp → .../CompilerLocator/CompilerLocatorRustc.cpp b/Plugin/CompilerLocatorRustc.cpp → .../CompilerLocator/CompilerLocatorRustc.cpp
diff --git a/Plugin/CompilerLocatorRustc.hpp → .../CompilerLocator/CompilerLocatorRustc.hpp b/Plugin/CompilerLocatorRustc.hpp → .../CompilerLocator/CompilerLocatorRustc.hpp
diff --git a/Plugin/CompilersDetectorManager.cpp b/Plugin/CompilersDetectorManager.cpp
@@ -25,15 +25,15 @@
 
 #include "CompilersDetectorManager.h"
 
-#include "CompilerLocatorCLANG.h"
-#include "CompilerLocatorCrossGCC.h"
-#include "CompilerLocatorCygwin.h"
-#include "CompilerLocatorEosCDT.h"
-#include "CompilerLocatorGCC.h"
-#include "CompilerLocatorMSVC.h"
-#include "CompilerLocatorMSYS2.hpp"
-#include "CompilerLocatorMSYS2Clang.hpp"
-#include "CompilerLocatorRustc.hpp"
+#include "CompilerLocator/CompilerLocatorCLANG.h"
+#include "CompilerLocator/CompilerLocatorCrossGCC.h"
+#include "CompilerLocator/CompilerLocatorCygwin.h"
+#include "CompilerLocator/CompilerLocatorEosCDT.h"
+#include "CompilerLocator/CompilerLocatorGCC.h"
+#include "CompilerLocator/CompilerLocatorMSVC.h"
+#include "CompilerLocator/CompilerLocatorMSYS2.hpp"
+#include "CompilerLocator/CompilerLocatorMSYS2Clang.hpp"
+#include "CompilerLocator/CompilerLocatorRustc.hpp"
 #include "GCCMetadata.hpp"
 #include "JSON.h"
 #include "build_settings_config.h"

diff --git a/Plugin/BorlandCppBuilderImporter.cpp → ...aceImporter/BorlandCppBuilderImporter.cpp b/Plugin/BorlandCppBuilderImporter.cpp → ...aceImporter/BorlandCppBuilderImporter.cpp
diff --git a/Plugin/BorlandCppBuilderImporter.h → ...spaceImporter/BorlandCppBuilderImporter.h b/Plugin/BorlandCppBuilderImporter.h → ...spaceImporter/BorlandCppBuilderImporter.h
diff --git a/Plugin/CodeBlocksImporter.cpp → .../WorkspaceImporter/CodeBlocksImporter.cpp b/Plugin/CodeBlocksImporter.cpp → .../WorkspaceImporter/CodeBlocksImporter.cpp
diff --git a/Plugin/CodeBlocksImporter.h → ...in/WorkspaceImporter/CodeBlocksImporter.h b/Plugin/CodeBlocksImporter.h → ...in/WorkspaceImporter/CodeBlocksImporter.h
diff --git a/Plugin/DevCppImporter.cpp → Plugin/WorkspaceImporter/DevCppImporter.cpp b/Plugin/DevCppImporter.cpp → Plugin/WorkspaceImporter/DevCppImporter.cpp
diff --git a/Plugin/DevCppImporter.h → Plugin/WorkspaceImporter/DevCppImporter.h b/Plugin/DevCppImporter.h → Plugin/WorkspaceImporter/DevCppImporter.h
diff --git a/Plugin/GenericImporter.h → Plugin/WorkspaceImporter/GenericImporter.h b/Plugin/GenericImporter.h → Plugin/WorkspaceImporter/GenericImporter.h
diff --git a/Plugin/VisualCppImporter.cpp → ...n/WorkspaceImporter/VisualCppImporter.cpp b/Plugin/VisualCppImporter.cpp → ...n/WorkspaceImporter/VisualCppImporter.cpp
diff --git a/Plugin/VisualCppImporter.h → Plugin/WorkspaceImporter/VisualCppImporter.h b/Plugin/VisualCppImporter.h → Plugin/WorkspaceImporter/VisualCppImporter.h
diff --git a/Plugin/WSImporter.cpp → Plugin/WorkspaceImporter/WSImporter.cpp b/Plugin/WSImporter.cpp → Plugin/WorkspaceImporter/WSImporter.cpp
diff --git a/Plugin/WSImporter.h → Plugin/WorkspaceImporter/WSImporter.h b/Plugin/WSImporter.h → Plugin/WorkspaceImporter/WSImporter.h
diff --git a/Plugin/build_config.h b/Plugin/build_config.h
@@ -27,7 +27,7 @@
 
 #include "asyncprocess.h"
 #include "build_config_common.h"
-#include "builder.h"
+#include "builder/builder.h"
 #include "codelite_exports.h"
 #include "compiler.h"
 #include "configuration_object.h"

diff --git a/Plugin/build_settings_config.h b/Plugin/build_settings_config.h
@@ -27,7 +27,7 @@
 
 #include "JSON.h"
 #include "build_system.h"
-#include "builder.h"
+#include "builder/builder.h"
 #include "cl_config.h"
 #include "codelite_exports.h"
 #include "compiler.h"

diff --git a/Plugin/BuilderGnuMakeMSYS.cpp → Plugin/builder/BuilderGnuMakeMSYS.cpp b/Plugin/BuilderGnuMakeMSYS.cpp → Plugin/builder/BuilderGnuMakeMSYS.cpp
diff --git a/Plugin/BuilderGnuMakeMSYS.hpp → Plugin/builder/BuilderGnuMakeMSYS.hpp b/Plugin/BuilderGnuMakeMSYS.hpp → Plugin/builder/BuilderGnuMakeMSYS.hpp
diff --git a/Plugin/builder.cpp → Plugin/builder/builder.cpp b/Plugin/builder.cpp → Plugin/builder/builder.cpp
diff --git a/Plugin/builder.h → Plugin/builder/builder.h b/Plugin/builder.h → Plugin/builder/builder.h
diff --git a/Plugin/builder_NMake.cpp → Plugin/builder/builder_NMake.cpp b/Plugin/builder_NMake.cpp → Plugin/builder/builder_NMake.cpp
diff --git a/Plugin/builder_NMake.h → Plugin/builder/builder_NMake.h b/Plugin/builder_NMake.h → Plugin/builder/builder_NMake.h
diff --git a/Plugin/builder_gnumake.cpp → Plugin/builder/builder_gnumake.cpp b/Plugin/builder_gnumake.cpp → Plugin/builder/builder_gnumake.cpp
diff --git a/Plugin/builder_gnumake.h → Plugin/builder/builder_gnumake.h b/Plugin/builder_gnumake.h → Plugin/builder/builder_gnumake.h
diff --git a/Plugin/builder_gnumake_default.cpp → Plugin/builder/builder_gnumake_default.cpp b/Plugin/builder_gnumake_default.cpp → Plugin/builder/builder_gnumake_default.cpp
diff --git a/Plugin/builder_gnumake_default.h → Plugin/builder/builder_gnumake_default.h b/Plugin/builder_gnumake_default.h → Plugin/builder/builder_gnumake_default.h
diff --git a/Plugin/builder_gnumake_onestep.cpp → Plugin/builder/builder_gnumake_onestep.cpp b/Plugin/builder_gnumake_onestep.cpp → Plugin/builder/builder_gnumake_onestep.cpp
diff --git a/Plugin/builder_gnumake_onestep.h → Plugin/builder/builder_gnumake_onestep.h b/Plugin/builder_gnumake_onestep.h → Plugin/builder/builder_gnumake_onestep.h
diff --git a/Plugin/buildmanager.cpp b/Plugin/buildmanager.cpp
@@ -24,12 +24,12 @@
 //////////////////////////////////////////////////////////////////////////////
 #include "buildmanager.h"
 
-#include "BuilderGnuMakeMSYS.hpp"
-#include "builder.h"
-#include "builder_NMake.h"
-#include "builder_gnumake.h"
-#include "builder_gnumake_default.h"
-#include "builder_gnumake_onestep.h"
+#include "builder/BuilderGnuMakeMSYS.hpp"
+#include "builder/builder.h"
+#include "builder/builder_NMake.h"
+#include "builder/builder_gnumake.h"
+#include "builder/builder_gnumake_default.h"
+#include "builder/builder_gnumake_onestep.h"
 
 BuildManager::BuildManager()
 {

diff --git a/Plugin/buildmanager.h b/Plugin/buildmanager.h
@@ -25,7 +25,7 @@
 #ifndef BUILDMANAGER_H
 #define BUILDMANAGER_H
 
-#include "builder.h"
+#include "builder/builder.h"
 #include "codelite_exports.h"
 #include "singleton.h"
 #include "wx/string.h"

diff --git a/Plugin/wxTerminalCtrl/clBuiltinTerminalPane.cpp b/Plugin/wxTerminalCtrl/clBuiltinTerminalPane.cpp
@@ -1,7 +1,7 @@
 #include "clBuiltinTerminalPane.hpp"
 
 #include "ColoursAndFontsManager.h"
-#include "CompilerLocatorMSVC.h"
+#include "CompilerLocator/CompilerLocatorMSVC.h"
 #include "FontUtils.hpp"
 #include "bitmap_loader.h"
 #include "clFileName.hpp"

diff --git a/Rust/RustPlugin.cpp b/Rust/RustPlugin.cpp
@@ -26,7 +26,7 @@
 #include "RustPlugin.hpp"
 
 #include "CargoToml.hpp"
-#include "CompilerLocatorRustc.hpp"
+#include "CompilerLocator/CompilerLocatorRustc.hpp"
 #include "NewFileSystemWorkspaceDialog.h"
 #include "Platform.hpp"
 #include "RustWorkspace.hpp"

diff --git a/codelite_make/cl_make_generator_app.cpp b/codelite_make/cl_make_generator_app.cpp
@@ -1,13 +1,14 @@
 #include "cl_make_generator_app.h"
 
+#include "build_settings_config.h"
+#include "builder/builder_gnumake.h"
+#include "builder/builder_gnumake_default.h"
+#include "configuration_mapping.h"
+#include "globals.h"
+#include "macromanager.h"
+#include "workspace.h"
+
 #include <algorithm>
-#include <build_settings_config.h>
-#include <builder_gnumake.h>
-#include <builder_gnumake_default.h>
-#include <configuration_mapping.h>
-#include <globals.h>
-#include <macromanager.h>
-#include <workspace.h>
 #include <wx/crt.h>
 #include <wx/filename.h>