Cleanup

- Removed the 3rdparty dir; the only shared library is the googletest
  library, which is now under the test folder.
- Fixed Qt build for Qt 6.
- Repl is now a standard mode.
- Removed the extensions folder

Some simple things to make less pieces and a more transparent bulid
process.

Author: cmaughan

CMakeLists.txt

@@ -7,7 +7,6 @@ option(BUILD_QT "Make Qt Library" OFF)
 option(BUILD_IMGUI "Make Imgui Library" OFF)
 option(BUILD_DEMOS "Make the demo app" ON)
 option(BUILD_TESTS "Make the tests" ON)
-option(BUILD_EXTENSIONS "Make the extension library (required for demo)" OFF)
 option(ZEP_FEATURE_CPP_FILE_SYSTEM "Default File system enabled" ON)
 
 # Global Settings
@@ -23,7 +22,7 @@ set(gtest_force_shared_crt ON CACHE BOOL "Always use msvcrt.dll" FORCE)
 set(CMAKE_DEBUG_POSTFIX "-debug")
 set(CMAKE_RELWITHDEBINFO_POSTFIX "-reldbg")
 
-if (BUILD_DEMOS OR BUILD_EXTENSIONS)
+if (BUILD_DEMOS)
 if (WIN32)
 set(VCPKG_TARGET_TRIPLET x64-windows-static-md)
 endif()
@@ -42,15 +41,10 @@ if (ZEP_FEATURE_CPP_FILE_SYSTEM)
 add_definitions(-DZEP_FEATURE_CPP_FILE_SYSTEM)
 endif()
 
-if (BUILD_DEMOS)
-SET(BUILD_EXTENSIONS ON)
-endif()
-
 # config_app.h checks
 # This makes a config_shared.h file which can be included for system settings
 #  Must be after setting up the platforms
 set (ZEP_ROOT ${CMAKE_CURRENT_LIST_DIR})
-set (M3RDPARTY_DIR ${CMAKE_CURRENT_LIST_DIR}/m3rdparty)
 
 configure_file(${ZEP_ROOT}/cmake/config_app.h.cmake ${CMAKE_BINARY_DIR}/config_app.h)
 
@@ -60,13 +54,12 @@ include(GNUInstallDirs)
 include(cmake/all.cmake)
 
 # Functions for file copying
-include(m3rdparty/cmake/copy_files.cmake)
+include(cmake/copy_files.cmake)
 
 enable_testing()
 
 # The main library
 add_subdirectory(src)
-add_subdirectory(extensions)
 add_subdirectory(tests)
 add_subdirectory(demos)
 

README.md

@@ -94,7 +94,7 @@ Tab windows are like workspaces, each containing a set of windows arranged in sp
 display layer to draw the text.  This makes it simple to draw the editor using different rendering code.  Adding Qt took just an hour to do.
 
 ### Vim & Standard Modes
-Mode plugins provide the editing facility - currently that is Vim & Standard and extension modes for the Repl and the Search panels.
+Mode plugins provide the editing facility - currently that is Vim & Standard and modes for the Repl and the Search panels.
 The Vim mode has most of the usual word motions, visual mode, etc.  The standard mode has the usual shift, select, cut/copy/paste, etc.
 See [Vim Mode](https://github.com/Rezonality/zep/wiki/Vim-Mode), or the top of the mode_vim.cpp file for a list of supported operations in Vim
 

m3rdparty/cmake/copy_files.cmake renamed to cmake/copy_files.cmake

@@ -7,14 +7,8 @@ set(IDENTIFIER "com.zep")
 
 list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_CURRENT_LIST_DIR}/cmake)
 
-include(${M3RDPARTY_DIR}/list.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/demo_common.cmake)
 
-#if (WIN32)
-#set(VCPKG_TARGET_TRIPLET x64-windows-static-md)
-#endif()
-#set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
-
 add_subdirectory(demo_imgui)
 add_subdirectory(demo_qt)
 

demos/CMakeLists.txt

@@ -65,8 +65,7 @@ target_include_directories(${DEMO_NAME}
     ${ZEP_ROOT}/demos/demo_imgui/janet
     ${FREETYPE_INCLUDE_DIRS}
     ${SDL2_ROOT_DIR}
-    ${CMAKE_BINARY_DIR}
-    ${M3RDPARTY_DIR})
+    ${CMAKE_BINARY_DIR})
 
 if (NOT WIN32)
     target_include_directories(${DEMO_NAME}
@@ -77,7 +76,6 @@ endif()
 target_link_libraries (${DEMO_NAME}
     PRIVATE
     Zep
-    ZepExtensions
     $<TARGET_NAME_IF_EXISTS:SDL2::SDL2main>
     $<IF:$<TARGET_EXISTS:SDL2::SDL2>,SDL2::SDL2,SDL2::SDL2-static>
     imgui::imgui

demos/demo_imgui/CMakeLists.txt

@@ -35,12 +35,10 @@
 #include "zep/imgui/editor_imgui.h"
 #include "zep/mode_standard.h"
 #include "zep/mode_vim.h"
+#include "zep/mode_repl.h"
 #include "zep/tab_window.h"
 #include "zep/theme.h"
 #include "zep/window.h"
-
-#include "repl/mode_repl.h"
-
 #include "zep/regress.h"
 
 #include <tinyfiledialogs/tinyfiledialogs.h>

demos/demo_imgui/main.cpp

@@ -57,19 +57,17 @@ target_include_directories(${DEMO_NAME}
         ${Qt6Gui_INCLUDE_DIRS}
         ${Qt6Core_INCLUDE_DIRS}
         ${CMAKE_BINARY_DIR}
-        ${M3RDPARTY_DIR}
         ${ZEP_ROOT}/include)
 
 target_link_libraries(${DEMO_NAME} PRIVATE
     Qt6::Core
     Qt6::Gui
     Qt6::Widgets
     Zep
-    ZepExtensions
     ${PLATFORM_LINKLIBS})
 
 target_compile_options(${DEMO_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/W3>) # Workaround Qt + MSVC 19 compile issue in release build.
-add_dependencies(${DEMO_NAME} Zep ZepExtensions)
+add_dependencies(${DEMO_NAME} Zep)
 
 if(WIN32)
 message(STATUS "Copying required Qt libraries and binaries to output directory....")

demos/demo_qt/CMakeLists.txt

@@ -1,4 +1,3 @@
-#include <orca/time_provider.h>
 #define _MATH_DEFINES_DEFINED
 
 #include <QCommandLineParser>
@@ -16,18 +15,15 @@
 #include "zep/theme.h"
 #include "zep/window.h"
 
-#include "orca/mode_orca.h"
-
 // Repl example
 #include "config_app.h"
 #include "mainwindow.h"
-#include "repl/mode_repl.h"
+#include "zep/mode_repl.h"
 #include "zep/qt/zepwidget_qt.h"
 
 #include "demo_common.h"
 
 using namespace Zep;
-using namespace MUtils;
 
 const std::string shader = R"R(
 #version 330 core
@@ -66,7 +62,6 @@ MainWindow::MainWindow()
     auto* pWidget = new ZepWidget_Qt(this, qApp->applicationDirPath().toStdString(), DemoFontPtSize);
 
     // Register our extensions
-    ZepMode_Orca::Register(pWidget->GetEditor());
     ZepRegressExCommand::Register(pWidget->GetEditor());
     ZepReplExCommand::Register(pWidget->GetEditor(), this);
 
@@ -138,13 +133,10 @@ MainWindow::MainWindow()
 
     setMenuBar(menu);
     setCentralWidget(pWidget);
-
-    TimeProvider::Instance().StartThread();
 }
 
 MainWindow::~MainWindow()
 {
-    TimeProvider::Instance().EndThread();
 }
 
 std::string MainWindow::ReplParse(const std::string& str)

demos/demo_qt/mainwindow.cpp

@@ -3,8 +3,7 @@
 #include <QMainWindow>
 #include <memory>
 
-#include <orca/mode_orca.h>
-#include <repl/mode_repl.h>
+#include <zep/mode_repl.h>
 
 QT_FORWARD_DECLARE_CLASS(QDockWidget)
 QT_FORWARD_DECLARE_CLASS(QMenu)

demos/demo_qt/mainwindow.h

@@ -241,15 +241,15 @@ class ZepWidget_Qt : public QWidget, public IZepComponent
     {
         if (m_spEditor)
         {
-            m_spEditor->OnMouseDown(toNVec2f(ev->localPos()), GetMouseButton(ev));
+            m_spEditor->OnMouseDown(toNVec2f(ev->position()), GetMouseButton(ev));
         }
     }
     virtual void mouseReleaseEvent(QMouseEvent* ev) override
     {
         (void)ev;
         if (m_spEditor)
         {
-            m_spEditor->OnMouseUp(toNVec2f(ev->localPos()), GetMouseButton(ev));
+            m_spEditor->OnMouseUp(toNVec2f(ev->position()), GetMouseButton(ev));
         }
     }
 
@@ -262,7 +262,7 @@ class ZepWidget_Qt : public QWidget, public IZepComponent
     {
         if (m_spEditor)
         {
-            m_spEditor->OnMouseMove(toNVec2f(ev->localPos()));
+            m_spEditor->OnMouseMove(toNVec2f(ev->position()));
         }
     }