From 2fa9a615e62c019d1bcec4d2399b8f33fb03a70d Mon Sep 17 00:00:00 2001 From: Jarod42 Date: Mon, 3 Jun 2024 09:06:55 +0200 Subject: [PATCH 1/3] Create directory Plugin/WorkspaceImporter and move associated code inside it. --- LiteEditor/manager.cpp | 2 +- Plugin/CMakeLists.txt | 7 ++++++- .../{ => WorkspaceImporter}/BorlandCppBuilderImporter.cpp | 0 Plugin/{ => WorkspaceImporter}/BorlandCppBuilderImporter.h | 0 Plugin/{ => WorkspaceImporter}/CodeBlocksImporter.cpp | 0 Plugin/{ => WorkspaceImporter}/CodeBlocksImporter.h | 0 Plugin/{ => WorkspaceImporter}/DevCppImporter.cpp | 0 Plugin/{ => WorkspaceImporter}/DevCppImporter.h | 0 Plugin/{ => WorkspaceImporter}/GenericImporter.h | 0 Plugin/{ => WorkspaceImporter}/VisualCppImporter.cpp | 0 Plugin/{ => WorkspaceImporter}/VisualCppImporter.h | 0 Plugin/{ => WorkspaceImporter}/WSImporter.cpp | 0 Plugin/{ => WorkspaceImporter}/WSImporter.h | 0 13 files changed, 7 insertions(+), 2 deletions(-) rename Plugin/{ => WorkspaceImporter}/BorlandCppBuilderImporter.cpp (100%) rename Plugin/{ => WorkspaceImporter}/BorlandCppBuilderImporter.h (100%) rename Plugin/{ => WorkspaceImporter}/CodeBlocksImporter.cpp (100%) rename Plugin/{ => WorkspaceImporter}/CodeBlocksImporter.h (100%) rename Plugin/{ => WorkspaceImporter}/DevCppImporter.cpp (100%) rename Plugin/{ => WorkspaceImporter}/DevCppImporter.h (100%) rename Plugin/{ => WorkspaceImporter}/GenericImporter.h (100%) rename Plugin/{ => WorkspaceImporter}/VisualCppImporter.cpp (100%) rename Plugin/{ => WorkspaceImporter}/VisualCppImporter.h (100%) rename Plugin/{ => WorkspaceImporter}/WSImporter.cpp (100%) rename Plugin/{ => WorkspaceImporter}/WSImporter.h (100%) diff --git a/LiteEditor/manager.cpp b/LiteEditor/manager.cpp index 611ca829bd..c919fd87c9 100644 --- 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/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt index c538db6f5d..5b24bd3490 100644 --- a/Plugin/CMakeLists.txt +++ b/Plugin/CMakeLists.txt @@ -87,7 +87,12 @@ 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" + "LSP/*.cpp" + "ThemeImporters/*.cpp" + "WorkspaceImporter/*.cpp" + "wxTerminalCtrl/*.cpp") # Define the output add_library(plugin SHARED ${SRCS}) diff --git a/Plugin/BorlandCppBuilderImporter.cpp b/Plugin/WorkspaceImporter/BorlandCppBuilderImporter.cpp similarity index 100% rename from Plugin/BorlandCppBuilderImporter.cpp rename to Plugin/WorkspaceImporter/BorlandCppBuilderImporter.cpp diff --git a/Plugin/BorlandCppBuilderImporter.h b/Plugin/WorkspaceImporter/BorlandCppBuilderImporter.h similarity index 100% rename from Plugin/BorlandCppBuilderImporter.h rename to Plugin/WorkspaceImporter/BorlandCppBuilderImporter.h diff --git a/Plugin/CodeBlocksImporter.cpp b/Plugin/WorkspaceImporter/CodeBlocksImporter.cpp similarity index 100% rename from Plugin/CodeBlocksImporter.cpp rename to Plugin/WorkspaceImporter/CodeBlocksImporter.cpp diff --git a/Plugin/CodeBlocksImporter.h b/Plugin/WorkspaceImporter/CodeBlocksImporter.h similarity index 100% rename from Plugin/CodeBlocksImporter.h rename to Plugin/WorkspaceImporter/CodeBlocksImporter.h diff --git a/Plugin/DevCppImporter.cpp b/Plugin/WorkspaceImporter/DevCppImporter.cpp similarity index 100% rename from Plugin/DevCppImporter.cpp rename to Plugin/WorkspaceImporter/DevCppImporter.cpp diff --git a/Plugin/DevCppImporter.h b/Plugin/WorkspaceImporter/DevCppImporter.h similarity index 100% rename from Plugin/DevCppImporter.h rename to Plugin/WorkspaceImporter/DevCppImporter.h diff --git a/Plugin/GenericImporter.h b/Plugin/WorkspaceImporter/GenericImporter.h similarity index 100% rename from Plugin/GenericImporter.h rename to Plugin/WorkspaceImporter/GenericImporter.h diff --git a/Plugin/VisualCppImporter.cpp b/Plugin/WorkspaceImporter/VisualCppImporter.cpp similarity index 100% rename from Plugin/VisualCppImporter.cpp rename to Plugin/WorkspaceImporter/VisualCppImporter.cpp diff --git a/Plugin/VisualCppImporter.h b/Plugin/WorkspaceImporter/VisualCppImporter.h similarity index 100% rename from Plugin/VisualCppImporter.h rename to Plugin/WorkspaceImporter/VisualCppImporter.h diff --git a/Plugin/WSImporter.cpp b/Plugin/WorkspaceImporter/WSImporter.cpp similarity index 100% rename from Plugin/WSImporter.cpp rename to Plugin/WorkspaceImporter/WSImporter.cpp diff --git a/Plugin/WSImporter.h b/Plugin/WorkspaceImporter/WSImporter.h similarity index 100% rename from Plugin/WSImporter.h rename to Plugin/WorkspaceImporter/WSImporter.h From fcf04c869ca8352345bd70e95930ed0448619489 Mon Sep 17 00:00:00 2001 From: Jarod42 Date: Mon, 3 Jun 2024 09:31:09 +0200 Subject: [PATCH 2/3] Create directory Plugin/CompilerLocator and move associated code inside it. --- EOSWiki/EOSProjectWizard.cpp | 6 ++++-- LanguageServer/detectors/LSPClangdDetector.cpp | 2 +- LiteEditor/app.cpp | 2 +- Plugin/CMakeLists.txt | 1 + .../CompilerLocatorCLANG.cpp | 0 .../CompilerLocatorCLANG.h | 0 .../CompilerLocatorCrossGCC.cpp | 0 .../CompilerLocatorCrossGCC.h | 0 .../CompilerLocatorCygwin.cpp | 0 .../CompilerLocatorCygwin.h | 0 .../CompilerLocatorEosCDT.cpp | 0 .../CompilerLocatorEosCDT.h | 0 .../CompilerLocatorGCC.cpp | 0 .../{ => CompilerLocator}/CompilerLocatorGCC.h | 0 .../CompilerLocatorMSVC.cpp | 0 .../CompilerLocatorMSVC.h | 0 .../CompilerLocatorMSYS2.cpp | 0 .../CompilerLocatorMSYS2.hpp | 0 .../CompilerLocatorMSYS2Clang.cpp | 0 .../CompilerLocatorMSYS2Clang.hpp | 0 .../CompilerLocatorRustc.cpp | 0 .../CompilerLocatorRustc.hpp | 0 Plugin/CompilersDetectorManager.cpp | 18 +++++++++--------- .../wxTerminalCtrl/clBuiltinTerminalPane.cpp | 2 +- Rust/RustPlugin.cpp | 2 +- 25 files changed, 18 insertions(+), 15 deletions(-) rename Plugin/{ => CompilerLocator}/CompilerLocatorCLANG.cpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorCLANG.h (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorCrossGCC.cpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorCrossGCC.h (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorCygwin.cpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorCygwin.h (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorEosCDT.cpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorEosCDT.h (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorGCC.cpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorGCC.h (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorMSVC.cpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorMSVC.h (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorMSYS2.cpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorMSYS2.hpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorMSYS2Clang.cpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorMSYS2Clang.hpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorRustc.cpp (100%) rename Plugin/{ => CompilerLocator}/CompilerLocatorRustc.hpp (100%) diff --git a/EOSWiki/EOSProjectWizard.cpp b/EOSWiki/EOSProjectWizard.cpp index 0e5fe3b476..c996fedc88 100644 --- a/EOSWiki/EOSProjectWizard.cpp +++ b/EOSWiki/EOSProjectWizard.cpp @@ -1,10 +1,12 @@ #include "EOSProjectWizard.h" -#include -#include "CompilerLocatorEosCDT.h" + +#include "CompilerLocator/CompilerLocatorEosCDT.h" #include "build_settings_config.h" #include "compiler.h" #include "globals.h" +#include + EOSProjectWizard::EOSProjectWizard(wxWindow* parent) : EOSProjectWizardBase(parent) { diff --git a/LanguageServer/detectors/LSPClangdDetector.cpp b/LanguageServer/detectors/LSPClangdDetector.cpp index 5f79da2ea1..a00e8d8aea 100644 --- 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 index b801c89170..96157c7d3b 100644 --- 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/Plugin/CMakeLists.txt b/Plugin/CMakeLists.txt index 5b24bd3490..ce2f621cf8 100644 --- a/Plugin/CMakeLists.txt +++ b/Plugin/CMakeLists.txt @@ -89,6 +89,7 @@ endif() file(GLOB SRCS "*.cpp" + "CompilerLocator/*.cpp" "LSP/*.cpp" "ThemeImporters/*.cpp" "WorkspaceImporter/*.cpp" diff --git a/Plugin/CompilerLocatorCLANG.cpp b/Plugin/CompilerLocator/CompilerLocatorCLANG.cpp similarity index 100% rename from Plugin/CompilerLocatorCLANG.cpp rename to Plugin/CompilerLocator/CompilerLocatorCLANG.cpp diff --git a/Plugin/CompilerLocatorCLANG.h b/Plugin/CompilerLocator/CompilerLocatorCLANG.h similarity index 100% rename from Plugin/CompilerLocatorCLANG.h rename to Plugin/CompilerLocator/CompilerLocatorCLANG.h diff --git a/Plugin/CompilerLocatorCrossGCC.cpp b/Plugin/CompilerLocator/CompilerLocatorCrossGCC.cpp similarity index 100% rename from Plugin/CompilerLocatorCrossGCC.cpp rename to Plugin/CompilerLocator/CompilerLocatorCrossGCC.cpp diff --git a/Plugin/CompilerLocatorCrossGCC.h b/Plugin/CompilerLocator/CompilerLocatorCrossGCC.h similarity index 100% rename from Plugin/CompilerLocatorCrossGCC.h rename to Plugin/CompilerLocator/CompilerLocatorCrossGCC.h diff --git a/Plugin/CompilerLocatorCygwin.cpp b/Plugin/CompilerLocator/CompilerLocatorCygwin.cpp similarity index 100% rename from Plugin/CompilerLocatorCygwin.cpp rename to Plugin/CompilerLocator/CompilerLocatorCygwin.cpp diff --git a/Plugin/CompilerLocatorCygwin.h b/Plugin/CompilerLocator/CompilerLocatorCygwin.h similarity index 100% rename from Plugin/CompilerLocatorCygwin.h rename to Plugin/CompilerLocator/CompilerLocatorCygwin.h diff --git a/Plugin/CompilerLocatorEosCDT.cpp b/Plugin/CompilerLocator/CompilerLocatorEosCDT.cpp similarity index 100% rename from Plugin/CompilerLocatorEosCDT.cpp rename to Plugin/CompilerLocator/CompilerLocatorEosCDT.cpp diff --git a/Plugin/CompilerLocatorEosCDT.h b/Plugin/CompilerLocator/CompilerLocatorEosCDT.h similarity index 100% rename from Plugin/CompilerLocatorEosCDT.h rename to Plugin/CompilerLocator/CompilerLocatorEosCDT.h diff --git a/Plugin/CompilerLocatorGCC.cpp b/Plugin/CompilerLocator/CompilerLocatorGCC.cpp similarity index 100% rename from Plugin/CompilerLocatorGCC.cpp rename to Plugin/CompilerLocator/CompilerLocatorGCC.cpp diff --git a/Plugin/CompilerLocatorGCC.h b/Plugin/CompilerLocator/CompilerLocatorGCC.h similarity index 100% rename from Plugin/CompilerLocatorGCC.h rename to Plugin/CompilerLocator/CompilerLocatorGCC.h diff --git a/Plugin/CompilerLocatorMSVC.cpp b/Plugin/CompilerLocator/CompilerLocatorMSVC.cpp similarity index 100% rename from Plugin/CompilerLocatorMSVC.cpp rename to Plugin/CompilerLocator/CompilerLocatorMSVC.cpp diff --git a/Plugin/CompilerLocatorMSVC.h b/Plugin/CompilerLocator/CompilerLocatorMSVC.h similarity index 100% rename from Plugin/CompilerLocatorMSVC.h rename to Plugin/CompilerLocator/CompilerLocatorMSVC.h diff --git a/Plugin/CompilerLocatorMSYS2.cpp b/Plugin/CompilerLocator/CompilerLocatorMSYS2.cpp similarity index 100% rename from Plugin/CompilerLocatorMSYS2.cpp rename to Plugin/CompilerLocator/CompilerLocatorMSYS2.cpp diff --git a/Plugin/CompilerLocatorMSYS2.hpp b/Plugin/CompilerLocator/CompilerLocatorMSYS2.hpp similarity index 100% rename from Plugin/CompilerLocatorMSYS2.hpp rename to Plugin/CompilerLocator/CompilerLocatorMSYS2.hpp diff --git a/Plugin/CompilerLocatorMSYS2Clang.cpp b/Plugin/CompilerLocator/CompilerLocatorMSYS2Clang.cpp similarity index 100% rename from Plugin/CompilerLocatorMSYS2Clang.cpp rename to Plugin/CompilerLocator/CompilerLocatorMSYS2Clang.cpp diff --git a/Plugin/CompilerLocatorMSYS2Clang.hpp b/Plugin/CompilerLocator/CompilerLocatorMSYS2Clang.hpp similarity index 100% rename from Plugin/CompilerLocatorMSYS2Clang.hpp rename to Plugin/CompilerLocator/CompilerLocatorMSYS2Clang.hpp diff --git a/Plugin/CompilerLocatorRustc.cpp b/Plugin/CompilerLocator/CompilerLocatorRustc.cpp similarity index 100% rename from Plugin/CompilerLocatorRustc.cpp rename to Plugin/CompilerLocator/CompilerLocatorRustc.cpp diff --git a/Plugin/CompilerLocatorRustc.hpp b/Plugin/CompilerLocator/CompilerLocatorRustc.hpp similarity index 100% rename from Plugin/CompilerLocatorRustc.hpp rename to Plugin/CompilerLocator/CompilerLocatorRustc.hpp diff --git a/Plugin/CompilersDetectorManager.cpp b/Plugin/CompilersDetectorManager.cpp index d61f65427b..f1ba294a7c 100644 --- 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/wxTerminalCtrl/clBuiltinTerminalPane.cpp b/Plugin/wxTerminalCtrl/clBuiltinTerminalPane.cpp index 7f9041eeff..1209b472ab 100644 --- 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 index ba4d4465b5..5c76fe453e 100644 --- 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" From 5e346b004f3a2c90612727ed5dff3b591fc42909 Mon Sep 17 00:00:00 2001 From: Jarod42 Date: Mon, 3 Jun 2024 10:18:00 +0200 Subject: [PATCH 3/3] Create directory Plugin/builder and move associated code inside it. --- CMakePlugin/CMakeBuilder.h | 2 +- ContinuousBuild/continuousbuild.cpp | 2 +- LiteEditor/frame.cpp | 2 -- LiteEditor/ps_general_page.cpp | 2 +- Plugin/CMakeLists.txt | 1 + Plugin/build_config.h | 2 +- Plugin/build_settings_config.h | 2 +- Plugin/{ => builder}/BuilderGnuMakeMSYS.cpp | 0 Plugin/{ => builder}/BuilderGnuMakeMSYS.hpp | 0 Plugin/{ => builder}/builder.cpp | 0 Plugin/{ => builder}/builder.h | 0 Plugin/{ => builder}/builder_NMake.cpp | 0 Plugin/{ => builder}/builder_NMake.h | 0 Plugin/{ => builder}/builder_gnumake.cpp | 0 Plugin/{ => builder}/builder_gnumake.h | 0 Plugin/{ => builder}/builder_gnumake_default.cpp | 0 Plugin/{ => builder}/builder_gnumake_default.h | 0 Plugin/{ => builder}/builder_gnumake_onestep.cpp | 0 Plugin/{ => builder}/builder_gnumake_onestep.h | 0 Plugin/buildmanager.cpp | 12 ++++++------ Plugin/buildmanager.h | 2 +- codelite_make/cl_make_generator_app.cpp | 15 ++++++++------- 22 files changed, 21 insertions(+), 21 deletions(-) rename Plugin/{ => builder}/BuilderGnuMakeMSYS.cpp (100%) rename Plugin/{ => builder}/BuilderGnuMakeMSYS.hpp (100%) rename Plugin/{ => builder}/builder.cpp (100%) rename Plugin/{ => builder}/builder.h (100%) rename Plugin/{ => builder}/builder_NMake.cpp (100%) rename Plugin/{ => builder}/builder_NMake.h (100%) rename Plugin/{ => builder}/builder_gnumake.cpp (100%) rename Plugin/{ => builder}/builder_gnumake.h (100%) rename Plugin/{ => builder}/builder_gnumake_default.cpp (100%) rename Plugin/{ => builder}/builder_gnumake_default.h (100%) rename Plugin/{ => builder}/builder_gnumake_onestep.cpp (100%) rename Plugin/{ => builder}/builder_gnumake_onestep.h (100%) diff --git a/CMakePlugin/CMakeBuilder.h b/CMakePlugin/CMakeBuilder.h index 8fcc83490a..e5217f99b3 100644 --- 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 index 8919f1bc15..48bd0a1330 100644 --- 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/LiteEditor/frame.cpp b/LiteEditor/frame.cpp index 5655c1fca2..f49e451976 100644 --- 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/ps_general_page.cpp b/LiteEditor/ps_general_page.cpp index 1e4459a27c..f19704d118 100644 --- 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 index ce2f621cf8..5a8a387233 100644 --- a/Plugin/CMakeLists.txt +++ b/Plugin/CMakeLists.txt @@ -93,6 +93,7 @@ file(GLOB SRCS "LSP/*.cpp" "ThemeImporters/*.cpp" "WorkspaceImporter/*.cpp" + "builder/*.cpp" "wxTerminalCtrl/*.cpp") # Define the output diff --git a/Plugin/build_config.h b/Plugin/build_config.h index be6edd18ec..a76b0a8bee 100644 --- 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 index d9daeb73cb..e0503c41ce 100644 --- 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 b/Plugin/builder/BuilderGnuMakeMSYS.cpp similarity index 100% rename from Plugin/BuilderGnuMakeMSYS.cpp rename to Plugin/builder/BuilderGnuMakeMSYS.cpp diff --git a/Plugin/BuilderGnuMakeMSYS.hpp b/Plugin/builder/BuilderGnuMakeMSYS.hpp similarity index 100% rename from Plugin/BuilderGnuMakeMSYS.hpp rename to Plugin/builder/BuilderGnuMakeMSYS.hpp diff --git a/Plugin/builder.cpp b/Plugin/builder/builder.cpp similarity index 100% rename from Plugin/builder.cpp rename to Plugin/builder/builder.cpp diff --git a/Plugin/builder.h b/Plugin/builder/builder.h similarity index 100% rename from Plugin/builder.h rename to Plugin/builder/builder.h diff --git a/Plugin/builder_NMake.cpp b/Plugin/builder/builder_NMake.cpp similarity index 100% rename from Plugin/builder_NMake.cpp rename to Plugin/builder/builder_NMake.cpp diff --git a/Plugin/builder_NMake.h b/Plugin/builder/builder_NMake.h similarity index 100% rename from Plugin/builder_NMake.h rename to Plugin/builder/builder_NMake.h diff --git a/Plugin/builder_gnumake.cpp b/Plugin/builder/builder_gnumake.cpp similarity index 100% rename from Plugin/builder_gnumake.cpp rename to Plugin/builder/builder_gnumake.cpp diff --git a/Plugin/builder_gnumake.h b/Plugin/builder/builder_gnumake.h similarity index 100% rename from Plugin/builder_gnumake.h rename to Plugin/builder/builder_gnumake.h diff --git a/Plugin/builder_gnumake_default.cpp b/Plugin/builder/builder_gnumake_default.cpp similarity index 100% rename from Plugin/builder_gnumake_default.cpp rename to Plugin/builder/builder_gnumake_default.cpp diff --git a/Plugin/builder_gnumake_default.h b/Plugin/builder/builder_gnumake_default.h similarity index 100% rename from Plugin/builder_gnumake_default.h rename to Plugin/builder/builder_gnumake_default.h diff --git a/Plugin/builder_gnumake_onestep.cpp b/Plugin/builder/builder_gnumake_onestep.cpp similarity index 100% rename from Plugin/builder_gnumake_onestep.cpp rename to Plugin/builder/builder_gnumake_onestep.cpp diff --git a/Plugin/builder_gnumake_onestep.h b/Plugin/builder/builder_gnumake_onestep.h similarity index 100% rename from Plugin/builder_gnumake_onestep.h rename to Plugin/builder/builder_gnumake_onestep.h diff --git a/Plugin/buildmanager.cpp b/Plugin/buildmanager.cpp index 1c8a111489..1bc36ddd6a 100644 --- 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 index 90653f6550..271d36977a 100644 --- 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/codelite_make/cl_make_generator_app.cpp b/codelite_make/cl_make_generator_app.cpp index a2b3c5002f..bebdc80c7b 100644 --- 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 -#include -#include -#include -#include -#include -#include -#include #include #include