Merge pull request #93 from PipeRift/feature/custom-main-functions

Added main functions, runtime libraries & pipe update

Author: muit

.github/workflows/build.yml

@@ -76,12 +76,12 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ runner.temp }}/llvm
-          key: llvm-14.0-${{ matrix.os-name }}
+          key: llvm-15.0-${{ matrix.os-name }}
       - name: Install LLVM
         if: ${{ matrix.compiler == 'clang' }}
         uses: KyleMayes/install-llvm-action@v1
         with:
-          version: "14.0"
+          version: "15.0"
           directory: ${{ runner.temp }}/llvm
           cached: ${{ steps.cache-llvm.outputs.cache-hit }}
 

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "Extern/taskflow"]
 	path = Extern/taskflow
 	url = https://github.com/taskflow/taskflow.git
+[submodule "Extern/mir"]
+	path = Extern/mir
+	url = https://github.com/vnmakarov/mir.git

.vscode/settings.json

@@ -231,5 +231,6 @@
             "--backend",
             "LLVM"
         ]
-    }
+    },
+    "dotnet.defaultSolution": "disable"
 }

Apps/CLI/Src/CLIModule.cpp

@@ -1,11 +1,15 @@
 // Copyright 2015-2023 Piperift - All rights reserved
 
+#include <Pipe/Memory/NewDelete.h>
+//  Override as first include
+
 #include <AST/Utils/ModuleUtils.h>
 #include <Compiler/Compiler.h>
 #include <Compiler/Utils/BackendUtils.h>
 #include <FrameworkModule.h>
 #include <GraphViewModule.h>
 #include <LLVMBackendModule.h>
+#include <MIRBackendModule.h>
 #include <Pipe/Core/Profiler.h>
 #include <Pipe/Files/Paths.h>
 #include <Pipe/Pipe.h>
@@ -20,8 +24,7 @@ using namespace rift;
 
 namespace rift
 {
-	void AddBackendOption(
-	    CLI::App& app, const TArray<TOwnPtr<compiler::Backend>>& backends, String& selected)
+	void AddBackendOption(CLI::App& app, const TArray<TOwnPtr<Backend>>& backends, String& selected)
 	{
 		String desc = "Backend to build with. Available: ";
 		if (!backends.IsEmpty())
@@ -45,10 +48,9 @@ namespace rift
 		app.add_option("-b,--backend", selected, stdDesc, true);
 	}
 
-	TPtr<compiler::Backend> FindBackendByName(
-	    const TArray<TOwnPtr<compiler::Backend>>& backends, Tag name)
+	TPtr<Backend> FindBackendByName(const TArray<TOwnPtr<Backend>>& backends, Tag name)
 	{
-		TOwnPtr<compiler::Backend>* backend = backends.Find([name](const auto& backend) {
+		TOwnPtr<Backend>* backend = backends.Find([name](const auto& backend) {
 			return backend->GetName() == name;
 		});
 		if (backend)
@@ -65,6 +67,7 @@ int main(int argc, char** argv)
 	p::Initialize("Saved/Logs");
 	EnableModule<FrameworkModule>();
 	EnableModule<LLVMBackendModule>();
+	EnableModule<MIRBackendModule>();
 	EnableModule<GraphViewModule>();
 
 	CLI::App app{"Rift compiler"};
@@ -73,12 +76,12 @@ int main(int argc, char** argv)
 
 
 	String selectedBackendStr;
-	auto availableBackends = compiler::CreateBackends();
+	auto availableBackends = CreateBackends();
 	AddBackendOption(app, availableBackends, selectedBackendStr);
 
 	CLI11_PARSE(app, argc, argv);
 
-	TPtr<compiler::Backend> backend = FindBackendByName(availableBackends, Tag(selectedBackendStr));
+	TPtr<Backend> backend = FindBackendByName(availableBackends, Tag(selectedBackendStr));
 
 	ZoneScopedNC("CLI Execution", 0x459bd1);
 
@@ -87,12 +90,12 @@ int main(int argc, char** argv)
 
 	if (!AST::HasProject(ast))
 	{
-		Log::Error("Couldn't open project '{}'", p::ToString(path));
+		p::Error("Couldn't open project '{}'", p::ToString(path));
 		return 1;
 	}
 
-	compiler::Config config;
-	compiler::Build(ast, config, backend);
+	CompilerConfig config;
+	Build(ast, config, backend);
 
 	while (true)
 	{

Apps/CLI/Src/main.cpp

@@ -1,9 +1,13 @@
 // Copyright 2015-2023 Piperift - All rights reserved
 
+#include <Pipe/Memory/NewDelete.h>
+//  Override as first include
+
 #include <Editor.h>
 #include <FrameworkModule.h>
 #include <GraphViewModule.h>
 #include <LLVMBackendModule.h>
+#include <MIRBackendModule.h>
 #include <Pipe/Pipe.h>
 
 #include <iostream>
@@ -21,6 +25,7 @@ int RunEditor(StringView projectPath)
 	p::Initialize("Saved/Logs");
 	EnableModule<FrameworkModule>();
 	EnableModule<LLVMBackendModule>();
+	EnableModule<MIRBackendModule>();
 	EnableModule<GraphViewModule>();
 
 	const int result = Editor::Editor::Get().Run(projectPath);

Apps/Editor/Src/EditorExeModule.cpp

@@ -11,6 +11,7 @@ function(rift_compiler_module target)
     rift_module(${target})
 
     target_include_directories(${target} PUBLIC Compiler/Include)
+    target_include_directories(${target} PRIVATE Compiler/Src)
     file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS Compiler/Src/*.cpp Compiler/Src/*.h)
     target_sources(${target} PRIVATE ${SOURCE_FILES})
     set(RIFT_COMPILER_MODULES ${RIFT_COMPILER_MODULES} ${target} PARENT_SCOPE)
@@ -21,17 +22,21 @@ function(rift_editor_module target)
     rift_module(${target})
 
     target_include_directories(${target} PUBLIC Editor/Include)
+    target_include_directories(${target} PRIVATE Editor/Src)
     file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS Editor/Src/*.cpp Editor/Src/*.h)
     target_sources(${target} PRIVATE ${SOURCE_FILES})
     target_link_libraries(RiftEditorModules INTERFACE ${target})
 endfunction(rift_editor_module)
 
 function(rift_runtime_module module)
+    set(RIFT_BINARY_DIR ${CMAKE_BINARY_DIR}/Bin/${CMAKE_CFG_INTDIR})
+
     set(target RiftRuntime${module})
     add_library(${target} STATIC)
     rift_module(${target})
 
     target_include_directories(${target} PUBLIC ${module}/Include)
+    target_include_directories(${target} PRIVATE ${module}/Src)
     file(GLOB_RECURSE SOURCE_FILES CONFIGURE_DEPENDS ${module}/Src/*.cpp ${module}/Src/*.h)
     target_sources(${target} PRIVATE ${SOURCE_FILES})
     target_link_libraries(RiftRuntimeModules INTERFACE ${target})
@@ -48,18 +53,19 @@ function(rift_runtime_module module)
 
 
     add_custom_command(TARGET ${target} POST_BUILD COMMAND
-        ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}/Bin/Runtimes/${module}"
+        ${CMAKE_COMMAND} -E remove_directory "${RIFT_BINARY_DIR}/Runtimes/${module}"
     )
     add_custom_command(TARGET ${target} POST_BUILD COMMAND
-        ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/${module}" "${CMAKE_BINARY_DIR}/Bin/Runtimes/${module}"
+        ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/${module}" "${RIFT_BINARY_DIR}/Runtimes/${module}"
     )
     add_custom_command(TARGET ${target} POST_BUILD COMMAND
-        ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}/Bin/Runtimes/${module}/Src"
+        ${CMAKE_COMMAND} -E remove_directory "${RIFT_BINARY_DIR}/Runtimes/${module}/Src"
     )
 endfunction(rift_runtime_module)
 
 function(rift_enable_module_resources target)
+    set(RIFT_BINARY_DIR ${CMAKE_BINARY_DIR}/Bin/${CMAKE_CFG_INTDIR})
     add_custom_command(TARGET ${target} POST_BUILD COMMAND
-        ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/Resources" "${CMAKE_BINARY_DIR}/Bin/Resources"
+        ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/Resources" "${RIFT_BINARY_DIR}/Resources"
     )
 endfunction(rift_enable_module_resources)

Apps/Editor/Src/main.cpp

@@ -1,7 +1,7 @@
 # Copyright 2015-2023 Piperift - All rights reserved
 
 # CMake version
-cmake_minimum_required (VERSION 3.21)
+cmake_minimum_required (VERSION 3.26)
 MESSAGE(STATUS "CMAKE_ROOT: " ${CMAKE_ROOT})
 
 set(CMAKE_VERBOSE_MAKEFILE OFF)

CMake/Util.cmake

@@ -1,7 +1,6 @@
 {
-    "name": "none",
-    "target": "Static",
-    "type": "CBinding",
-    "dependencies": [],
-    "libraryFiles": []
+    "CModule": {
+        "target": "Static",
+        "dependencies": []
+    }
 }