Added bakasable config to module

ago%!(EXTRA string=1 year) · 9895eb5b98
parent eaf695c45d
commit 9895eb5b98
31 changed files with 108 additions and 238 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +0,0 @@
-[submodule "vendor/spdlog"]
-	path = vendor/spdlog
-	url = https://github.com/gabime/spdlog
-[submodule "vendor/bakatools"]
-	path = vendor/bakatools
-	url = https://github.com/anulax1225/bakatools
--- a/bakanet/premake5.lua
+++ b/bakanet/premake5.lua
@ -1,82 +0,0 @@
-project "bakanet"
-	kind "StaticLib"
-    language "C++"
-    cppdialect "C++20"
-    systemversion "latest"
-    staticruntime "on"
-
-    targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}")
-    objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}")
-
-    defines
-    {
-        "BKMOD_ALL"
-    }
-
-    includedirs 
-    {
-        "%{IncludeDirs.spdlog}",
-        "%{IncludeDirs.bakanet}",
-        "%{IncludeDirs.bakatools}"
-    }
-
-    files 
-    {
-        "%{prj.location}/src/bakanet/**.h",
-        "%{prj.location}/src/bakanet/**.cpp",
-        "%{prj.location}/src/baknetpch.h",
-    }
-
-    links 
-    {
-        "bakatools"
-    }
-
-    filter "system:windows"
-		buildoptions "/MDd"
-        defines
-        {
-            "BK_PLATFORM_WINDOWS"
-        }
-
-        files
-        {
-            "%{prj.location}/src/platform/windows/**.h",
-            "%{prj.location}/src/platform/windows/**.cpp",
-        }
-
-        links
-        {
-            "WS2_32.lib"
-        }
-    
-    filter "system:linux"
-        defines
-        {
-            "BK_PLATFORM_LINUX"
-        }
-
-        files
-        {
-            "%{prj.location}/src/platform/linux/**.h",
-            "%{prj.location}/src/platform/linux/**.cpp",
-        }
-    
-    filter "configurations:Debug"
-        defines 
-        { 
-            "BK_DEBUG",
-            "DEBUG"
-        }
-        runtime "Debug"
-        symbols "on"
-
-
-    filter "configurations:Release"
-        defines 
-        { 
-            "BK_RELEASE",
-            "NDEBUG"
-        }
-        runtime "Release"
-        optimize "on"
--- a/23
+++ b/23
@ -1,23 +0,0 @@
-
-
-handle_error() {
-    echo "An error occurred on line $1"
-    exit 1
-}
-trap 'handle_error $LINENO' ERR
-
-if [ "-clear" == "$1" ]; then
-    rm -rf bin bin-int
-fi
-
-if [ "-clear" == "$2" ]; then
-    rm -rf bin bin-int
-fi
-
-clear 
-premake5 gmake2
-make
-
-if [ "-exec" == "$1" ]; then
-    ./bin/linux-x86_64-Debug/server/server
-fi
--- a/config.json
+++ b/config.json
@ -0,0 +1,12 @@
+{
+    "name": "Bakanet",
+    "owner": "Anulax",
+    "git": "https://github.com/anulax1225/bakanet",
+    "packages": 
+    [
+        {
+            "author": "anulax1225",
+            "name": "bakatools"
+        }
+    ]
+}
--- a/5
+++ b/5
@ -0,0 +1,5 @@
+IncludeDirs["bakanet"] = "%{wks.location}/vendor/bakanet/src/"
+
+group "Bakanet"
+    include "vendor/bakanet"
+group ""
--- a/9
+++ b/9
@ -0,0 +1,9 @@
+includedirs 
+{
+    "%{IncludeDirs.bakanet}"
+}
+
+links
+{
+    "bakanet"
+}
--- a/premake5.lua
+++ b/premake5.lua
@ -1,27 +1,82 @@
-workspace "BakaraNet"
-   	architecture "x64"
-    configurations { "Debug", "Release" }
-    startproject "server"
-    flags
-	{
-		"MultiProcessorCompile"
-	}
-
-outputdir = "%{cfg.system}-%{cfg.architecture}-%{cfg.buildcfg}"
-
-IncludeDirs = {}
-IncludeDirs["bakanet"] = "%{wks.location}/bakanet/src/"
-IncludeDirs["bakatools"] = "%{wks.location}/vendor/bakatools/src/"
-IncludeDirs["spdlog"] = "%{wks.location}/vendor/spdlog/include"
-
-group "BakaModules"
-	include "vendor/bakatools"
-group ""
-
-group "NetCore"
-	include "bakanet"
-group ""
-
-group "Sandbox"
-	include "sandbox"
-group ""
+project "bakanet"
+	kind "StaticLib"
+    language "C++"
+    cppdialect "C++20"
+    systemversion "latest"
+    staticruntime "on"
+
+    targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}")
+    objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}")
+
+    defines
+    {
+        "BKMOD_ALL"
+    }
+
+    includedirs 
+    {
+        "%{IncludeDirs.spdlog}",
+        "%{IncludeDirs.bakanet}",
+        "%{IncludeDirs.bakatools}"
+    }
+
+    files 
+    {
+        "%{prj.location}/src/bakanet/**.h",
+        "%{prj.location}/src/bakanet/**.cpp",
+        "%{prj.location}/src/baknetpch.h",
+    }
+
+    links 
+    {
+        "bakatools"
+    }
+
+    filter "system:windows"
+		buildoptions "/MDd"
+        defines
+        {
+            "BK_PLATFORM_WINDOWS"
+        }
+
+        files
+        {
+            "%{prj.location}/src/platform/windows/**.h",
+            "%{prj.location}/src/platform/windows/**.cpp",
+        }
+
+        links
+        {
+            "WS2_32.lib"
+        }
+    
+    filter "system:linux"
+        defines
+        {
+            "BK_PLATFORM_LINUX"
+        }
+
+        files
+        {
+            "%{prj.location}/src/platform/linux/**.h",
+            "%{prj.location}/src/platform/linux/**.cpp",
+        }
+    
+    filter "configurations:Debug"
+        defines 
+        { 
+            "BK_DEBUG",
+            "DEBUG"
+        }
+        runtime "Debug"
+        symbols "on"
+
+
+    filter "configurations:Release"
+        defines 
+        { 
+            "BK_RELEASE",
+            "NDEBUG"
+        }
+        runtime "Release"
+        optimize "on"
--- a/sandbox/premake5.lua
+++ b/sandbox/premake5.lua
@ -1,66 +0,0 @@
-project "server"
-    location "./server"
-    kind "ConsoleApp"
-    language "C++"
-    cppdialect "C++20"
-    systemversion "latest"
-
-    targetdir("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}")
-    objdir("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}")
-
-    defines
-    {
-        "BKMOD_ALL"
-    }
-    
-    includedirs 
-    {
-        "%{IncludeDirs.spdlog}",
-        "%{IncludeDirs.bakanet}",
-        "%{IncludeDirs.bakatools}"
-    }
-
-    files 
-    {
-        "%{prj.location}/**.h",
-        "%{prj.location}/**.cpp",
-    }
-
-    links
-    {
-        "bakanet",
-        "bakatools"
-    }
-
-    filter "system:linux"
-        defines
-        {
-            "BK_PLATFORM_LINUX"
-        }
-
-    filter "system:windows"
-        buildoptions "/MDd"
-        defines
-        {
-            "BK_PLATFORM_WINDOWS"
-        }
-
-    filter "configurations:Debug"
-        defines 
-        { 
-            "BK_DEBUG",
-            "DEBUG"
-        }
-        runtime "Debug"
-        symbols "on"
-
-    filter "configurations:Release"
-        defines 
-        { 
-            "BK_RELEASE",
-            "NDEBUG"
-        }
-        runtime "Release"
-        optimize "on"
-
-
--- a/sandbox/server/main.cpp
+++ b/sandbox/server/main.cpp
@ -1,32 +0,0 @@
-#include <bakatools.h>
-#include <bakanet.h>
-
-#define PORT 8080
-
-using namespace Bk::Net;
-
-int main() 
-{
-    Bk::Log::init("Bakanet");
-    IpAddress ip;
-    HttpServer server(ip, PORT);
-    server.get("/", [](HttpRequest& req)
-    {
-        BK_INFO("URL /");
-        HttpReponse res(HTTP_RES_200, req.version);
-        res.body = "<p>Coucou de /</p>";
-        return res;
-    });
-    server.post("/home/", [](HttpRequest& req)
-    {
-        HttpReponse res(HTTP_RES_200, "HTTP/1.1");
-        res.body = "Success";
-        BK_INFO("\n{0}\n{1}", req.body, res.to_string());
-        return res;
-    });
-    server.start();
-    return 0;
-}
-
-
-
--- a/bakanet/src/bakanet.h
+++ b/bakanet/src/bakanet.h
--- a/bakanet/src/bakanet/core/dns_lookup.h
+++ b/bakanet/src/bakanet/core/dns_lookup.h
--- a/bakanet/src/bakanet/core/ip_address.h
+++ b/bakanet/src/bakanet/core/ip_address.h
--- a/bakanet/src/bakanet/core/ip_protocol.h
+++ b/bakanet/src/bakanet/core/ip_protocol.h
--- a/bakanet/src/bakanet/core/ip_version.h
+++ b/bakanet/src/bakanet/core/ip_version.h
--- a/bakanet/src/bakanet/core/socket.h
+++ b/bakanet/src/bakanet/core/socket.h
--- a/bakanet/src/bakanet/core/socket_options.h
+++ b/bakanet/src/bakanet/core/socket_options.h
--- a/bakanet/src/bakanet/http/packet.cpp
+++ b/bakanet/src/bakanet/http/packet.cpp
--- a/bakanet/src/bakanet/http/packet.h
+++ b/bakanet/src/bakanet/http/packet.h
--- a/bakanet/src/bakanet/http/server.cpp
+++ b/bakanet/src/bakanet/http/server.cpp
--- a/bakanet/src/bakanet/http/server.h
+++ b/bakanet/src/bakanet/http/server.h
--- a/bakanet/src/bakanetpch.h
+++ b/bakanet/src/bakanetpch.h
--- a/bakanet/src/platform/linux/linux_dns_lookup.cpp
+++ b/bakanet/src/platform/linux/linux_dns_lookup.cpp
--- a/bakanet/src/platform/linux/linux_ip_address.cpp
+++ b/bakanet/src/platform/linux/linux_ip_address.cpp
--- a/bakanet/src/platform/linux/linux_socket.cpp
+++ b/bakanet/src/platform/linux/linux_socket.cpp
--- a/bakanet/src/platform/linux/linux_socket.h
+++ b/bakanet/src/platform/linux/linux_socket.h
--- a/bakanet/src/platform/windows/windows_dns_lookup.cpp
+++ b/bakanet/src/platform/windows/windows_dns_lookup.cpp
--- a/bakanet/src/platform/windows/windows_ip_adress.cpp
+++ b/bakanet/src/platform/windows/windows_ip_adress.cpp
--- a/bakanet/src/platform/windows/windows_socket.cpp
+++ b/bakanet/src/platform/windows/windows_socket.cpp
--- a/bakanet/src/platform/windows/windows_socket.h
+++ b/bakanet/src/platform/windows/windows_socket.h
--- a/vendor/bakatools
+++ b/vendor/bakatools
@ -1 +0,0 @@
-Subproject commit 40d24e39a7a7b39a056418d78162103036e6534a
--- a/vendor/spdlog
+++ b/vendor/spdlog
@ -1 +0,0 @@
-Subproject commit 23587b0d9aebad231d7ba4f16873d70edd2b9dee
				`@ -1 +0,0 @@`
				`Subproject commit 40d24e39a7a7b39a056418d78162103036e6534a`
				`@ -1 +0,0 @@`
				`Subproject commit 23587b0d9aebad231d7ba4f16873d70edd2b9dee`