Merge branch 'feature/custom-main-functions'

Author: muit

.gitmodules

@@ -5,7 +5,7 @@
 	path = Extern/imgui
 	url = https://github.com/ocornut/imgui.git
 [submodule "Libs/Pipe"]
-	path = Libs/Pipe
+	path = Extern/Pipe
 	url = https://github.com/PipeRift/pipe.git
 [submodule "Extern/glfw"]
 	path = Extern/glfw

Apps/CLI/CMakeLists.txt

@@ -8,7 +8,7 @@ target_sources(RiftCLIExe PRIVATE ${CLI_SOURCE_FILES})
 
 target_link_libraries(RiftCLIExe PUBLIC
     CLI11
-    Rift
+    RiftAST
     RiftCompilerModules
 )
 

Apps/CLI/Src/main.cpp

@@ -4,9 +4,9 @@
 //  Override as first include
 
 #include <AST/Utils/ModuleUtils.h>
+#include <ASTModule.h>
 #include <Compiler/Compiler.h>
 #include <Compiler/Utils/BackendUtils.h>
-#include <FrameworkModule.h>
 #include <GraphViewModule.h>
 #include <LLVMBackendModule.h>
 #include <MIRBackendModule.h>
@@ -19,6 +19,7 @@
 #include <CLI/CLI.hpp>
 
 
+
 using namespace rift;
 
 
@@ -65,7 +66,7 @@ namespace rift
 int main(int argc, char** argv)
 {
 	p::Initialize("Saved/Logs");
-	EnableModule<FrameworkModule>();
+	EnableModule<ASTModule>();
 	EnableModule<LLVMBackendModule>();
 	EnableModule<MIRBackendModule>();
 	EnableModule<GraphViewModule>();

Apps/Editor/Src/main.cpp

@@ -3,8 +3,8 @@
 #include <Pipe/Memory/NewDelete.h>
 //  Override as first include
 
+#include <ASTModule.h>
 #include <Editor.h>
-#include <FrameworkModule.h>
 #include <GraphViewModule.h>
 #include <LLVMBackendModule.h>
 #include <MIRBackendModule.h>
@@ -13,6 +13,7 @@
 #include <iostream>
 
 
+
 using namespace rift;
 
 
@@ -23,7 +24,7 @@ using namespace rift;
 int RunEditor(StringView projectPath)
 {
 	p::Initialize("Saved/Logs");
-	EnableModule<FrameworkModule>();
+	EnableModule<ASTModule>();
 	EnableModule<LLVMBackendModule>();
 	EnableModule<MIRBackendModule>();
 	EnableModule<GraphViewModule>();

CMakeLists.txt

@@ -31,7 +31,7 @@ option(RIFT_BUILD_TESTS "Build Rift and Core tests" ${RIFT_IS_PROJECT})
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(CMake/DownloadProject.cmake)
-include(Libs/Pipe/CMake/Util.cmake)
+include(Extern/Pipe/CMake/Util.cmake)
 include(CMake/Util.cmake)
 include(CMake/SetIcon.cmake)
 include(CMake/CheckClangTools.cmake)
@@ -56,7 +56,7 @@ if(CLANG_FORMAT_EXE)
     # Additional targets to perform clang-format/clang-tidy
     file(GLOB_RECURSE ALL_SOURCE_FILES CONFIGURE_DEPENDS
         Apps/**/*.cpp Apps/**/*.h
-        Libs/Framework/**/*.cpp Libs/Framework/**/*.h
+        Libs/AST/**/*.cpp Libs/AST/**/*.h
         Libs/UI/**/*.cpp Libs/UI/**/*.h
         Libs/Pipe/Include/**/*.cpp Libs/Pipe/Include/**/*.h
         Libs/Pipe/Src/**/*.cpp Libs/Pipe/Src/**/*.h
@@ -71,7 +71,7 @@ endif()
 if(CLANG_TIDY_EXE)
     file(GLOB_RECURSE ALL_SOURCE_FILES CONFIGURE_DEPENDS
         Apps/**/*.cpp
-        Libs/Framework/**/*.cpp
+        Libs/AST/**/*.cpp
         Libs/UI/**/*.cpp
         Libs/Pipe/Include/**/*.cpp
         Libs/Pipe/Src/**/*.cpp

Extern/CMakeLists.txt

@@ -4,6 +4,11 @@ include(FetchContent)
 set(BUILD_SHARED_LIBS OFF)
 
 # Submodule libraries
+
+set(PIPE_BUILD_TESTS ${RIFT_BUILD_TESTS} CACHE BOOL "Build Pipe tests")
+add_subdirectory(Pipe)
+
+
 set(CLI11_BUILD_TESTS OFF CACHE BOOL "Build CLI11 tests")
 set(CMAKE_POLICY_DEFAULT_CMP0054 NEW)
 add_subdirectory(CLI11)

Libs/Pipe Extern/PipeLibs/Pipe renamed to Extern/Pipe

@@ -0,0 +1,16 @@
+# Copyright 2015-2023 Piperift - All rights reserved
+
+add_library(RiftAST STATIC)
+target_include_directories(RiftAST PUBLIC Include)
+
+file(GLOB_RECURSE AST_SOURCE_FILES CONFIGURE_DEPENDS Src/*.cpp Src/*.h)
+target_sources(RiftAST PRIVATE ${AST_SOURCE_FILES})
+
+target_link_libraries(RiftAST PUBLIC
+    Pipe
+    Taskflow
+    RiftBindingNative
+)
+
+rift_module(RiftAST)
+set_target_properties (RiftAST PROPERTIES FOLDER Rift)